[elpa] externals/auctex 86de20d0b2 02/14: Make prettification work reliably
branch: externals/auctex commit 86de20d0b285803ead0f242be5216916bab2abc0 Author: Ikumi Keita Commit: Ikumi Keita Make prettification work reliably Simplify at the same time, assuming to bump required Emacs version to 25.1. * tex.el (TeX--prettify-symbols-compose-p): Define unconditionally. (VirTeX-common-initialization): Always prepare for prettification. --- tex.el | 25 ++--- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/tex.el b/tex.el index ca4b8ad35b..0187459b64 100644 --- a/tex.el +++ b/tex.el @@ -3719,14 +3719,12 @@ The algorithm is as follows: answer TeX-default-mode)) -(when (and (boundp 'tex--prettify-symbols-alist) - (boundp 'prettify-symbols-compose-predicate)) - (defun TeX--prettify-symbols-compose-p (start end match) -(and (tex--prettify-symbols-compose-p start end match) - (not (let ((face (get-text-property end 'face))) -(if (consp face) -(memq 'font-latex-verbatim-face face) - (eq face 'font-latex-verbatim-face))) +(defun TeX--prettify-symbols-compose-p (start end match) + (and (tex--prettify-symbols-compose-p start end match) + (not (let ((face (get-text-property end 'face))) + (if (consp face) + (memq 'font-latex-verbatim-face face) +(eq face 'font-latex-verbatim-face)) (defun VirTeX-common-initialization () "Perform basic initialization." @@ -3786,13 +3784,10 @@ The algorithm is as follows: (TeX-source-correlate-mode 1)) ;; Prettify Symbols mode - (when (fboundp 'TeX--prettify-symbols-compose-p) -(set (make-local-variable 'prettify-symbols-alist) tex--prettify-symbols-alist) -(TeX--if-macro-fboundp add-function -(add-function :override (local 'prettify-symbols-compose-predicate) - #'TeX--prettify-symbols-compose-p) - (set (make-local-variable 'prettify-symbols-compose-predicate) - #'TeX--prettify-symbols-compose-p))) + (require 'tex-mode) + (setq-local prettify-symbols-alist tex--prettify-symbols-alist) + (add-function :override (local 'prettify-symbols-compose-predicate) +#'TeX--prettify-symbols-compose-p) ;; Standard Emacs completion-at-point support (add-hook 'completion-at-point-functions
[elpa] externals/auctex updated (2568505587 -> b91f15b3a3)
tsdh pushed a change to branch externals/auctex.
from 2568505587 Release GNU AUCTeX 13.1.2
new 0b24e363f8 Improve indentation after '\end{macrocode}' in docTeX
mode
new 86de20d0b2 Make prettification work reliably
new 62f8341717 Lift required GNU Emacs version to 25.1
new df8d6fe772 Document how to bump the required Emacs version
new db75369df3 * latex.el (TeX-read-hook): Support 'include/excluded'
hook.
new 12f0b610a1 * style/ltx-base.el: Update style.
new f8d19d5cbb ; * style/ltx-base.el ("ltx-base"): Fix entry for
"@addtoreset".
new 35b71dfe3f Add new style/etoolbox.el
new 5d951fea03 Fix bibtex dialect
new a25652ffe2 Update style/fbox.el to package version 0.06
new aae80c4725 ; Minor Doc fix
new c534b17704 Avoid using variadic setq-local
new 615d6f2052 Merge remote-tracking branch 'origin/master' into
externals/auctex
new b91f15b3a3 Release GNU AUCTeX 13.1.3
Summary of changes:
Makefile.in | 2 +-
admin/release-process.org | 24 +++
auctex.el | 4 +-
auctex.el.in | 4 +-
auctex.info | 44 ++---
bib-cite.el | 28 +--
configure.ac | 4 +-
context.el| 16 +-
doc/changes.texi | 3 +
doc/faq.texi | 2 +-
doc/install.texi | 2 +-
doc/preview-faq.texi | 2 +-
font-latex.el | 30 +--
latex.el | 49 +++--
latex/preview.dtx | 2 +-
plain-tex.el | 8 +-
preview-latex.info| 6 +-
preview.el| 36 ++--
style/biblatex.el | 29 ++-
style/etoolbox.el | 376 ++
style/fbox.el | 37 +++-
style/ltx-base.el | 146 +++
style/polyglossia.el | 2 +-
style/pstricks.el | 4 +-
tests/latex/doctex-indent-in.dtx | 68 +++
tests/latex/doctex-indent-out.dtx | 68 +++
tests/latex/latex-test.el | 21 ++-
tex-fold.el | 12 +-
tex-info.el | 4 +-
tex-site.el | 10 +-
tex-site.el.in| 6 +-
tex.el| 76
toolbar-x.el | 4 +-
33 files changed, 900 insertions(+), 229 deletions(-)
create mode 100644 style/etoolbox.el
create mode 100644 tests/latex/doctex-indent-in.dtx
create mode 100644 tests/latex/doctex-indent-out.dtx
[elpa] externals/auctex db75369df3 05/14: * latex.el (TeX-read-hook): Support 'include/excluded' hook.
branch: externals/auctex
commit db75369df3c15e6f7c2c303a80511f2a6ed3d27a
Author: Arash Esbati
Commit: Arash Esbati
* latex.el (TeX-read-hook): Support 'include/excluded' hook.
---
latex.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/latex.el b/latex.el
index 85c290ec50..ad6908722f 100644
--- a/latex.el
+++ b/latex.el
@@ -3278,7 +3278,7 @@ as values for the key. Use PROMPT as the prompt string."
(cond ((member hook '("env" "para"))
'("after" "before" "begin" "end"))
((string= hook "include")
- '("after" "before" "end"))
+ '("after" "before" "end" "excluded"))
((string= hook "begindocument")
'("before" "end"))
((string= hook "enddocument")
@@ -3337,7 +3337,7 @@ as values for the key. Use PROMPT as the prompt string."
(setq where (funcall place)))
;; include//: is optional and
- ;; is one of (before|after|end)
+ ;; is one of (before|after|end|excluded)
((string= hook "include")
(if (funcall search)
(progn
[elpa] externals/auctex aae80c4725 11/14: ; Minor Doc fix
branch: externals/auctex
commit aae80c4725e712893882cd041a9c8b3f03749e6d
Author: Ikumi Keita
Commit: Ikumi Keita
; Minor Doc fix
* latex/preview.dtx (subsection{Supporting conversions}): Wrap "<" in
math mode so that reversed "!" doesn't appear in PDF output.
* bib-cite.el:
* context.el:
* font-latex.el:
* latex.el:
* plain-tex.el:
* preview.el.in:
* tex-buf.el:
* tex-fold.el:
* tex-info.el:
* tex.el:
* toolbar-x.el:
Fix typos.
Quote symbols in doc strings with `this' style instead of 'this style.
Use \= to guard ASCII APOSTROPHE(U+0027) of code example in doc string
so that it doesn't turn into RIGHT SINGLE QUOTATION MARK(U+2147) in
the output in *Help* buffer.
Use t and nil instead of T and NIL in doc string.
Update copyright year.
* style/pstricks.el ("pstricks"): Fix spacing in comment.
Update copyright year.
---
bib-cite.el | 28 +++-
context.el| 16
font-latex.el | 30 +++---
latex.el | 24
latex/preview.dtx | 2 +-
plain-tex.el | 8
preview.el.in | 36 ++--
style/pstricks.el | 4 ++--
tex-fold.el | 12 ++--
tex-info.el | 4 ++--
tex.el| 26 +-
toolbar-x.el | 4 ++--
12 files changed, 98 insertions(+), 96 deletions(-)
diff --git a/bib-cite.el b/bib-cite.el
index 465f18f973..a6405046f5 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -1,6 +1,6 @@
;; bib-cite.el - Display \cite, \ref or \label / Extract refs from BiBTeX
file. -*- lexical-binding: t; -*-
-;; Copyright (C) 1994-1999, 2001, 2003-2005, 2014-2021 Free Software
Foundation, Inc.
+;; Copyright (C) 1994-1999, 2001, 2003-2005, 2014-2022 Free Software
Foundation, Inc.
;; Author:Peter S. Galbraith
;; Created: 06 July 1994
@@ -629,7 +629,7 @@ BiBTeX 0.99b manual says this should be TEXBIB.
Another version says it should BSTINPUTS. I don't know anymore!
The colon character (:) is the default path separator in unix, but you may
-use semi-colon (;) for DOS or OS/2 if you set bib-dos-or-os2-variable to t."
+use semi-colon (;) for DOS or OS/2 if you set `bib-dos-or-os2-variable' to t."
:type 'string)
(defcustom bib-cite-inputs nil
@@ -650,14 +650,14 @@ directory. You may set this variable to let bib-cite
find these .aux files."
;; Under DOS system-type equals ms-dos
"Whether you use DOS or OS/2 for bib-make-bibliography/bib-display.
-It tells bib-make-bibliography and bib-display to translate
+It tells `bib-make-bibliography' and `bib-display' to translate
the BIBINPUTS environment variable using the \";\" character as
a path separator and to translate DOS' backslash to slash.
e.g. Use a path like \"c:\\emtex\\bibinput;c:\\latex\\bibinput\"
\(You can change the environment variable which is searched by
-setting the elisp variable bib-bibtex-env-variable)"
+setting the elisp variable `bib-bibtex-env-variable')"
:type 'boolean)
(defcustom bib-etags-command "etags -r '/.*\\(eq\\|page\\|[fvF]\\)ref.*/'
-o "
@@ -685,11 +685,11 @@ coexist with some other tags file in your master file
directory."
without the curly bracket.
If you change this variable and you use multi-file documents, make sure you
-also edit the variables bib-etags-command and bib-etags-append-command."
+also edit the variables `bib-etags-command' and `bib-etags-append-command'."
:type 'regexp)
(defcustom bib-substitute-string-in-display t
- "Determines if bib-display will substitute @string definitions.
+ "Determines if `bib-display' will substitute @string definitions.
If t, then the @string text is substituted.
If nil, the text is not substituted but the @string entry is included."
:type 'boolean)
@@ -1133,7 +1133,7 @@ to create a bibtex file containing only the references
used in the document."
Store the TAGS file in the master-directory.
Expect errors if you use this outside of auctex or within a plain
single-file document. Also makes sure that the TAGS buffer is updated.
-See variables bib-etags-command and bib-etags-filename"
+See variables `bib-etags-command' and `bib-etags-filename'."
(interactive)
(require 'etags)
(let* ((the-file-list (bib-document-TeX-files))
@@ -1358,12 +1358,14 @@ If within a single file document:
You can move back with C-xC-x as the mark is set before moving.
You can search for next occurrances of a ref command with C-sC-s.
-If within a multi-file document (in auctex only)
+If within a multi-file document (in AUCTeX only)
You can move back with C-xC-x if within the same buffer. If not, just
select your previous buffer.
- You can search for next occurrances of a ref command with tag commands:
+ You can search for next occurrences of a ref command with tag commands:
C-u M-. Find next alternate definition of last tag specifi
[elpa] externals/auctex 5d951fea03 09/14: Fix bibtex dialect
branch: externals/auctex commit 5d951fea037f77b47cdbd72a44bd812715fd46da Author: Ikumi Keita Commit: Ikumi Keita Fix bibtex dialect * tex.el (TeX-auto-store): Use `(or :bibtex :latex)' instead of `:bibtex' as dialect argument for `TeX-add-style-hook' when saving auto file for BibTeX file. --- tex.el | 19 +-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tex.el b/tex.el index 9188ccd74d..6b80b4e80c 100644 --- a/tex.el +++ b/tex.el @@ -4101,7 +4101,8 @@ If TEX is a directory, generate style files for all files in the directory." LaTeX-verbatim-macros-with-delims-local)) (verb-macros-braces (when (boundp 'LaTeX-verbatim-macros-with-braces-local) LaTeX-verbatim-macros-with-braces-local)) -(dialect TeX-style-hook-dialect)) +(dialect TeX-style-hook-dialect) +(bibtex-p (eq major-mode 'bibtex-mode))) (TeX-unload-style style) (with-current-buffer (generate-new-buffer file) (erase-buffer) @@ -4131,7 +4132,21 @@ If TEX is a directory, generate style files for all files in the directory." (mapc (lambda (el) (TeX-auto-insert el style)) TeX-auto-parser) (insert ")") - (if dialect (insert (concat "\n " (prin1-to-string dialect + (if dialect (insert (concat + "\n " + (prin1-to-string +(if bibtex-p +;; Add :latex since functions such +;; as `LaTeX-add-bibitems' are +;; only meaningful in LaTeX +;; document buffer. +;; FIXME: BibTeX is available to +;; plain TeX through eplain +;; (https://tug.org/eplain/doc/eplain.html#Citations>). +;; It would be nice if AUCTeX +;; supports such usage. +`'(or ,dialect :latex) + dialect) (insert ")\n\n") (write-region (point-min) (point-max) file nil 'silent) (kill-buffer (current-buffer
[elpa] externals/auctex df8d6fe772 04/14: Document how to bump the required Emacs version
branch: externals/auctex
commit df8d6fe7726e79b4748eecbd6d6614a1b4a56279
Author: Arash Esbati
Commit: Arash Esbati
Document how to bump the required Emacs version
* admin/release-process.org (Bumping required Emacs version):
Document the required steps.
---
admin/release-process.org | 24
1 file changed, 24 insertions(+)
diff --git a/admin/release-process.org b/admin/release-process.org
index ea87618ddf..26ff0280d5 100644
--- a/admin/release-process.org
+++ b/admin/release-process.org
@@ -227,3 +227,27 @@ looks for all files without FSF-copyright line which are
not listed in a
special copyright_exceptions file. As result, it spits out a diff between the
actual and expected copyright exceptions. If the diff is empty (or at least
doesn't mention an AUCTeX file), everything is fine.
+
+** Bumping required Emacs version
+
+It happens from time to time that AUCTeX requires a newer Emacs
+version. For this, the following files in the main directory has to
+be adjusted.
+
+- [ ] =auctex.el.in= :: Change the ~;; Package-Requires:~ cookie in
+ the header.
+- [ ] =configure.ac= :: Change the argument of ~EMACS_CHECK_VERSION~
+- [ ] =tex-site.el.in= :: Change the number after ~emacs-major-version~
+- [ ] =tex.el= :: Change the number after ~emacs-major-version~
+
+In the =doc= directory, these files are affected.
+
+- [ ] =doc/changes.texi= :: Add an entry under *News* about the
+ required version.
+- [ ] =doc/faq.texi= :: Adjust the number in this sentence:
+ =@AUCTeX{} was tested with @w{GNU Emacs XX.X}=.
+- [ ] =doc/install.texi= :: Adjust the number in ~@node Prerequisites~:
+ =@item GNU Emacs XX.X or higher=.
+- [ ] =doc/preview-faq.texi= :: Adjust the number in ~@section Requirements~
+ =@previewlatex{} nominally requires @w{GNU Emacs} with a version of
+ at least XX.X.=.
[elpa] externals/auctex 12f0b610a1 06/14: * style/ltx-base.el: Update style.
branch: externals/auctex
commit 12f0b610a1785ee4dd8f70b109a71f7d7112567c
Author: Arash Esbati
Commit: Arash Esbati
* style/ltx-base.el: Update style.
---
style/ltx-base.el | 146 --
1 file changed, 109 insertions(+), 37 deletions(-)
diff --git a/style/ltx-base.el b/style/ltx-base.el
index 20b79b639d..9804c77f21 100644
--- a/style/ltx-base.el
+++ b/style/ltx-base.el
@@ -1,6 +1,6 @@
;;; ltx-base.el --- AUCTeX style for basic LaTeX commands. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2004, 2016, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2004--2022 Free Software Foundation, Inc.
;; Author: Frank Küster
;; Maintainer: auctex-de...@gnu.org
@@ -27,62 +27,134 @@
;; This file adds general support for basic LaTeX commands used for
;; writing LaTeX class files (.cls), style files (.sty) and package
-;; files (.dtx).
+;; files (.dtx). Most of the macros are taken from clsguide.pdf.
;;; Code:
(require 'tex)
+;; Silence the compiler:
+(declare-function font-latex-add-keywords
+ "font-latex"
+ (keywords class))
+
(TeX-add-style-hook
"ltx-base"
(lambda ()
(TeX-add-symbols
-'("DeclareRobustCommand" TeX-arg-define-macro [ "Number of arguments" ] t)
-'("CheckCommand" TeX-arg-define-macro [ "Number of arguments" ] t)
-'("@addtoreset" TeX-arg-counter "Within counter" "counter")
-'("addvspace" "space")
-'("addpenalty" "penalty")
-'("ProvidesClass" "name" [ "release information" ])
-'("ProvidesPackage" "name" [ "release information" ])
-'("ProvidesFile" "filename" [ "release information" ])
-'("NeedsTeXFormat" "format" [ "release" ])
-'("DeclareOption" "option" t)
-;; would be great if DeclareOption RET * RET would give
-;; \DeclareOption*!
+
+;; 4.1 Identification. Other '\Provide*' macros are available in
+;; latex.el
+'("NeedsTeXFormat" "Format" [ "Release date" ])
+
+;; 4.2 Loading files
+;; \RequirePackage is provided in latex.el
+'("RequirePackageWithOptions" "Package" [ "Release information" ])
+
+'("LoadClass" [ "Options" ] "Class" [ "Release information" ])
+'("LoadClassWithOptions""Class" [ "Release information" ])
+
+;; 4.3 Option declaration
+'("DeclareOption" "Option" t)
'("DeclareOption*" t)
+
+;; 4.4 Commands within option code
'("CurrentOption" 0)
-'("PassOptionsToPackage" "option list" "package")
-'("ExecuteOptions" "option list")
-'("ProcessOptions" (TeX-arg-literal "\\relax"))
-"ProcessOptions*"
'("OptionNotUsed" 0)
-;; candidate for opt/mand toggling
-'("RequirePackage" [ "option list" ] "package" [ "release" ])
-'("LoadClass" [ "option list" ] "class" [ "release" ])
+
+;; 4.5 Moving options around
+'("PassOptionsToPackage" "Option(s) list" "Package")
+'("PassOptionsToClass" "Option(s) list" "Class")
+
+;; 4.6 Delaying code
'("AtEndOfPackage" t)
'("AtEndOfClass" t)
'("AtBeginDocument" t)
'("AtEndDocument" t)
-'("IfFileExists" "filename" 2)
-'("InputIfFileExists" "filename" 2)
-'("PackageWarning" "name" t)
-'("PackageWarningNoLine" "name" t)
-'("PackageInfo" "name" t)
-'("PackageError" "name" "short text" t)
-'("ClassWarning" "name" t)
-'("ClassWarningNoLine" "name" t)
-'("ClassInfo" "name" t)
-'("ClassError" "name" "short text" t)
+'("AtBeginDvi" t)
+
+;; 4.7 Option processing
+'("ProcessOptions" (TeX-arg-literal "\\relax"))
+"ProcessOptions*"
+'("ExecuteOptions" "Option list")
+
+;; 4.8 Safe file commands
+'("IfFileExists" "File" 2)
+'("InputIfFileExists" "File" 2)
+
+;; 4.9 Reporting errors, etc
+'("ClassError" "Class name" "Error text" t)
+'("PackageError" "Package name" "Error text" t)
+
+'("ClassWarning" "Class name" t)
+'("PackageWarning" "Package name" t)
+'("ClassWarningNoLine" "Class name" t)
+'("PackageWarningNoLine" "Package name" t)
+
+'("ClassInfo" "Class name" t)
+'("PackageInfo" "Package name" t)
+
'("MessageBreak" 0)
-'("@ifpackageloaded" "package" 2)
-'("@ifpackagelater" "package" "date" 2)
-'("@ifpackagewith" "package" "options" 2)
'("message" "Log Message")
-'("@ifundefined" "Macro Name" 2)
-'("@ifnextchar" (TeX-arg-literal " ") (TeX-arg-free "character") 2 )
-"expandafter"))
+
+;; 4.10 Defining commands
+'("DeclareRobustCommand"
+ TeX-arg-define-macro [ TeX-arg-define-macro-arguments ] t)
+'("DeclareRobustCommand*"
+ TeX-arg-define-macro [ TeX-arg-define-macro-arguments ] t)
+
+'("CheckCommand" TeX-arg-macro [ TeX-arg-define-macro-arguments ] t)
+'("CheckCommand*" TeX-arg-macro [ TeX-arg-define-macro-arguments ] t)
+
+;; 5.1 Layout parameters
+;; \paperheight & \paperwidth are provided in latex.el
+
+;; 5.2 Case changing
+;; \MakeUppercase & \MakeLppercase are provided in latex.el
+
+;; 5.
[elpa] externals/auctex 35b71dfe3f 08/14: Add new style/etoolbox.el
branch: externals/auctex
commit 35b71dfe3f3d7f32165687b67eb7876fbdbe6409
Author: Arash Esbati
Commit: Arash Esbati
Add new style/etoolbox.el
* Makefile.in (STYLESRC): Add new style.
* style/etoolbox.el: New file.
* style/biblatex.el ("biblatex"):
* style/polyglossia.el ("polyglossia"): Don't run the style hook
for 'etoolbox' since it adds a lot a macros to the completion list
which are usually not needed for regular LaTeX editing.
---
Makefile.in | 2 +-
style/biblatex.el| 29 ++--
style/etoolbox.el| 376 +++
style/polyglossia.el | 2 +-
4 files changed, 392 insertions(+), 17 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 9ee6db0c59..c1b29c1733 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -179,7 +179,7 @@ STYLESRC = style/prosper.el \
style/cuted.el style/floatpag.el style/flushend.el \
style/midfloat.el style/stabular.el style/stfloats.el \
style/rotating.el style/sidecap.el style/l3doc.el \
- style/ifthen.el
+ style/ifthen.elstyle/etoolbox.el
STYLEELC = $(STYLESRC:.el=.elc)
diff --git a/style/biblatex.el b/style/biblatex.el
index 3e86b71825..43115becc6 100644
--- a/style/biblatex.el
+++ b/style/biblatex.el
@@ -266,7 +266,6 @@ for citation keys."
"biblatex" "backend=bibtexu")
(TeX-run-style-hooks
-"etoolbox"
"keyval"
"kvoptions"
"logreq"
@@ -330,7 +329,7 @@ for citation keys."
;; Dynamic Entry Sets
'("defbibentryset" "Set"
(TeX-arg-eval mapconcat #'identity (TeX-completing-read-multiple
- "Keys: " (LaTeX-bibitem-list)) ","))
+ "Keys: " (LaTeX-bibitem-list)) ","))
;;; Citation Commands
'("cite" (TeX-arg-conditional TeX-arg-cite-note-p
(["Prenote"] ["Postnote"]) ()) TeX-arg-cite)
@@ -522,22 +521,22 @@ for citation keys."
(car cmd)
'(TeX-arg-conditional TeX-arg-cite-note-p
([LaTeX-arg-biblatex-natbib-notes])
- nil)
+nil)
#'TeX-arg-cite
cmds))
- ;; Fontification for compat macros does not go into `font-latex.el':
- (when (and (featurep 'font-latex)
-(eq TeX-install-font-lock 'font-latex-setup))
- (font-latex-add-keywords '(("citet""*[[{")
- ("Citet""*[[{")
- ("citep""*[[{")
- ("Citep""*[[{")
- ("citealt" "*[[{")
- ("Citealt" "*[[{")
- ("citealp" "*[[{")
- ("Citealp" "*[[{"))
-'biblatex
+ ;; Fontification for compat macros does not go into `font-latex.el':
+ (when (and (featurep 'font-latex)
+ (eq TeX-install-font-lock 'font-latex-setup))
+ (font-latex-add-keywords '(("citet""*[[{")
+("Citet""*[[{")
+("citep""*[[{")
+("Citep""*[[{")
+("citealt" "*[[{")
+("Citealt" "*[[{")
+("citealp" "*[[{")
+("Citealp" "*[[{"))
+ 'biblatex
(LaTeX-add-environments
;;; Bibliography commands
diff --git a/style/etoolbox.el b/style/etoolbox.el
new file mode 100644
index 00..42af6a4832
--- /dev/null
+++ b/style/etoolbox.el
@@ -0,0 +1,376 @@
+;;; etoolbox.el --- AUCTeX style for `etoolbox.sty' v2.5k -*-
lexical-binding: t; -*-
+
+;; Copyright (C) 2022 Free Software Foundation, Inc.
+
+;; Author: Arash Esbati
+;; Created: 2022-03-19
+;; Keywords: tex
+
+;; This file is part of AUCTeX.
+
+;; AUCTeX is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; AUCTeX is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with AUCTeX; see the file COPYING. If not, write to the Free
+;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+;; 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file adds support for `etoolbo
[elpa] externals/auctex f8d19d5cbb 07/14: ; * style/ltx-base.el ("ltx-base"): Fix entry for "@addtoreset".
branch: externals/auctex
commit f8d19d5cbbe50c675c26f83544421cd3801d7387
Author: Arash Esbati
Commit: Arash Esbati
; * style/ltx-base.el ("ltx-base"): Fix entry for "@addtoreset".
---
style/ltx-base.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/style/ltx-base.el b/style/ltx-base.el
index 9804c77f21..d10a1379c7 100644
--- a/style/ltx-base.el
+++ b/style/ltx-base.el
@@ -119,7 +119,7 @@
"normalsfcodes"
;; Some general macros not mentioned in clsguide.pdf
-'("@addtoreset" TeX-arg-counter "Within counter" "counter")
+'("@addtoreset" TeX-arg-counter (TeX-arg-counter "Within counter"))
'("addpenalty" "Penalty")
'("@ifundefined" TeX-arg-macro 2)
'("@ifnextchar" (TeX-arg-literal " ") (TeX-arg-free "Character") 2)
[elpa] externals/auctex 0b24e363f8 01/14: Improve indentation after '\end{macrocode}' in docTeX mode
branch: externals/auctex
commit 0b24e363f829f381415fe7cc34f6386baafa9921
Author: Arash Esbati
Commit: Arash Esbati
Improve indentation after '\end{macrocode}' in docTeX mode
* latex.el (LaTeX-indent-calculate-last): Improve indentation
after '\end{macrocode}' if still inside a description environment
like 'macro' or 'environment'.
* tests/latex/doctex-indent-in.dtx:
* tests/latex/doctex-indent-out.dtx: New test files.
* tests/latex/latex-test.el (docTeX-indentation): New test.
---
latex.el | 17 --
tests/latex/doctex-indent-in.dtx | 68 +++
tests/latex/doctex-indent-out.dtx | 68 +++
tests/latex/latex-test.el | 21 +++-
4 files changed, 170 insertions(+), 4 deletions(-)
diff --git a/latex.el b/latex.el
index 4527fbafb7..85c290ec50 100644
--- a/latex.el
+++ b/latex.el
@@ -4156,9 +4156,20 @@ outer indentation in case of a commented line. The
symbols
"end[ \t]*{macrocode\\*?}"))
fill-prefix
(TeX-in-line-comment))
- ;; Reset indentation to zero after a macrocode
- ;; environment.
- 0)
+ ;; Reset indentation to zero after a macrocode environment
+ ;; only when we're not still inside a describing
+ ;; environment like "macro" or "environment" etc. Text
+ ;; inside these environments after '\end{macrocode}' is
+ ;; indented with `LaTeX-indent-level':
+ (let ((outer-env (LaTeX-current-environment 2)))
+ (cond ((member outer-env '("macro" "environment"))
+LaTeX-indent-level)
+ ((and (fboundp 'LaTeX-doc-NewDocElement-list)
+ (LaTeX-doc-NewDocElement-list)
+ (member outer-env
+ (mapcar #'cadr
(LaTeX-doc-NewDocElement-list
+LaTeX-indent-level)
+ (t 0
((looking-at (concat (regexp-quote TeX-esc)
"begin *{"
;; Don't give optional argument here
diff --git a/tests/latex/doctex-indent-in.dtx b/tests/latex/doctex-indent-in.dtx
new file mode 100644
index 00..4f439588a7
--- /dev/null
+++ b/tests/latex/doctex-indent-in.dtx
@@ -0,0 +1,68 @@
+% \iffalse meta-comment
+%
+% This file may be distributed and/or modified under the conditions
+% of the LaTeX Project Public License, either version 1.3 of this
+% license or (at your option) any later version. The latest version
+% of this license is in:
+%
+% http://www.latex-project.org/lppl.txt
+%
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% \fi
+%
+% \iffalse
+%<*driver>
+\documentclass{ltxdoc}
+\usepackage{package}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\begin{document}
+\DocInput{package.dtx}
+\end{document}
+%
+% \fi
+%
+% \section{Usage}
+%
+% \DescribeMacro{\YOURMACRO}
+% Put description of |\YOURMACRO| here.
+%
+% \DescribeEnv{YOURENV}
+% Put description of |YOURENV| here.
+%
+% \StopEventually{\PrintIndex}
+%
+% \section{Implementation}
+%
+% \begin{macro}{\YOURMACRO}
+% Put explanation of |\YOURMACRO|'s implementation here.
+% \begin{macrocode}
+ \newcommand{\YOURMACRO}{%
+ code goes here%
+}
+%\end{macrocode}
+% Some more text afterwards.
+% \end{macro}
+%
+%\begin{environment}{YOURENV}
+%Put explanation of |YOURENV|'s implementation here.
+%\begin{macrocode}
+\newenvironment{YOURENV}{%
+code before environment%
+}{%
+code after environment%
+}
+%\end{macrocode}
+%Some more text afterwards.
+%\end{environment}
+%
+% \Finale
+%
+% \endinput
+% Local Variables:
+% mode: doctex
+% TeX-master: t
+% End:
diff --git a/tests/latex/doctex-indent-out.dtx
b/tests/latex/doctex-indent-out.dtx
new file mode 100644
index 00..2bdcf40cbe
--- /dev/null
+++ b/tests/latex/doctex-indent-out.dtx
@@ -0,0 +1,68 @@
+% \iffalse meta-comment
+%
+% This file may be distributed and/or modified under the conditions
+% of the LaTeX Project Public License, either version 1.3 of this
+% license or (at your option) any later version. The latest version
+% of this license is in:
+%
+% http://www.latex-project.org/lppl.txt
+%
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% \fi
+%
+% \iffalse
+%<*driver>
+\documentclass{ltxdoc}
+\usepackage{package}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\begin{document}
+\DocInput{package.dtx}
+\end{document}
+%
+% \fi
+%
+% \section{Usage}
+%
+% \DescribeMacro{\YOURMACRO}
+% Put description of |\YOURMACRO| here.
+%
+% \DescribeEnv{YOURENV}
+% Put description of |YOURENV| here.
+%
+% \StopEventually{\PrintIndex}
+%
+% \section{Implementation}
+%
+% \begin{macro}{
[elpa] externals/auctex b91f15b3a3 14/14: Release GNU AUCTeX 13.1.3
branch: externals/auctex commit b91f15b3a375445985143ed1d6e41490ea62780a Author: Tassilo Horn Commit: Tassilo Horn Release GNU AUCTeX 13.1.3 * GNU AUCTeX Version 13.1.3 released. --- auctex.el | 4 ++-- auctex.info| 44 +++- preview-latex.info | 6 +++--- tex-site.el| 10 -- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/auctex.el b/auctex.el index 62b451b0ca..5e6c00f6d6 100644 --- a/auctex.el +++ b/auctex.el @@ -2,11 +2,11 @@ ;; Copyright (C) 2014-2021 Free Software Foundation, Inc. -;; Version: 13.1.2 +;; Version: 13.1.3 ;; URL: https://www.gnu.org/software/auctex/ ;; Maintainer: auctex-de...@gnu.org ;; Notifications-To: auctex-di...@gnu.org -;; Package-Requires: ((emacs "24.3")) +;; Package-Requires: ((emacs "25.1")) ;; Keywords: TeX LaTeX Texinfo ConTeXt docTeX preview-latex ;; This file is part of GNU Emacs. diff --git a/auctex.info b/auctex.info index 2322c7baf4..b9ac9eefb3 100644 --- a/auctex.info +++ b/auctex.info @@ -1,6 +1,6 @@ This is auctex.info, produced by makeinfo version 6.8 from auctex.texi. -This manual is for AUCTeX (version 13.1.2 from 2022-04-08), a +This manual is for AUCTeX (version 13.1.3 from 2022-04-16), a sophisticated TeX environment for Emacs. Copyright (C) 1992-1995, 2001, 2002, 2004-2022 Free Software @@ -364,7 +364,7 @@ File: auctex.info, Node: Prerequisites, Next: Configure, Up: Installation 1.2.1 Prerequisites --- - * GNU Emacs 24.3 or higher + * GNU Emacs 25.1 or higher Using preview-latex requires a version of Emacs compiled with image support. @@ -6125,7 +6125,7 @@ A.1 Copying this Manual The copyright notice for this manual is: - This manual is for AUCTeX (version 13.1.2 from 2022-04-08), a + This manual is for AUCTeX (version 13.1.3 from 2022-04-16), a sophisticated TeX environment for Emacs. Copyright (C) 1992-1995, 2001, 2002, 2004-2022 Free Software @@ -6635,6 +6635,8 @@ A.2 Changes and New Features News since last release --- + * AUCTeX now requires GNU Emacs 25.1 or higher. + * AUCTeX tracks the change in Emacs where initial inputs in the minibuffer during queries are getting phased out. Queries for the mandatory arguments of macros and environments are adjusted where @@ -8206,7 +8208,7 @@ A.4 Frequently Asked Questions 2. What versions of Emacs are supported? - AUCTeX was tested with GNU Emacs 24.3. Older versions may work but + AUCTeX was tested with GNU Emacs 25.1. Older versions may work but are unsupported. 3. What should I do when './configure' does not find programs like @@ -9196,7 +9198,7 @@ Concept Index (line 6) * ASCII pTeX <1>:Japanese.(line 6) * auctex.el: Loading the package. (line 10) -* auctex.el <1>: Changes. (line 839) +* auctex.el <1>: Changes. (line 841) * auto directories.: Automatic. (line 6) * auto-fill-mode:Indenting. (line 29) * Auto-Reveal: Folding. (line 6) @@ -9501,7 +9503,7 @@ Concept Index (line 252) * tex-site.el: Loading the package. (line 10) * tex-site.el <1>: Customizing. (line 6) -* tex-site.el <2>: Changes. (line 839) +* tex-site.el <2>: Changes. (line 841) * tool bar, toolbar: Processing. (line 11) * Trailer: Commands.(line 6) * Underfull boxes: Debugging. (line 6) @@ -9607,21 +9609,21 @@ Node: Appendices259774 Node: Copying this Manual260070 Node: GNU Free Documentation License260953 Node: Changes286073 -Node: Development340873 -Node: Mid-term Goals341519 -Node: Wishlist343487 -Node: Bugs349247 -Node: FAQ350327 -Node: Texinfo mode356047 -Node: Exploiting357181 -Node: Superseding357999 -Node: Mapping362230 -Node: Unbinding364065 -Node: Indices364886 -Node: Key Index365049 -Node: Function Index372578 -Node: Variable Index384556 -Node: Concept Index409697 +Node: Development340925 +Node: Mid-term Goals341571 +Node: Wishlist343539 +Node: Bugs349299 +Node: FAQ350379 +Node: Texinfo mode356099 +Node: Exploiting357233 +Node: Superseding358051 +Node: Mapping362282 +Node: Unbinding364117 +Node: Indices364938 +Node: Key Index365101 +Node: Function Index372630 +Node: Variable Index384608 +Node: Concept Index409749 End Tag Table diff --git a/preview-latex.info b/preview-latex.info index 7552634e90..b6aae4782e 100644 --- a/preview-lat
[elpa] externals/auctex 62f8341717 03/14: Lift required GNU Emacs version to 25.1
branch: externals/auctex
commit 62f8341717e71679072d6dd4f53b58302c25e104
Author: Arash Esbati
Commit: Arash Esbati
Lift required GNU Emacs version to 25.1
* auctex.el.in:
* configure.ac (EMACS_CHECK_VERSION):
* doc/changes.texi:
* doc/faq.texi:
* doc/install.texi (Prerequisites):
* doc/preview-faq.texi (Requirements):
* tex-site.el.in:
* tex.el: Bump minimum required Emacs version to 25.1.
---
auctex.el.in | 4 ++--
configure.ac | 4 ++--
doc/changes.texi | 3 +++
doc/faq.texi | 2 +-
doc/install.texi | 2 +-
doc/preview-faq.texi | 2 +-
tex-site.el.in | 6 ++
tex.el | 6 ++
8 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/auctex.el.in b/auctex.el.in
index 014c0a2b8a..61527e2393 100644
--- a/auctex.el.in
+++ b/auctex.el.in
@@ -1,11 +1,11 @@
;;; auctex.el --- Integrated environment for *TeX* -*- lexical-binding: t; -*-
-;; Copyright (C) 2014-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2022 Free Software Foundation, Inc.
;; URL: https://www.gnu.org/software/auctex/
;; Maintainer: auctex-de...@gnu.org
;; Notifications-To: auctex-di...@gnu.org
-;; Package-Requires: ((emacs "24.3") (nadvice "0.3"))
+;; Package-Requires: ((emacs "25.1"))
;; Keywords: TeX LaTeX Texinfo ConTeXt docTeX preview-latex
;; This file is part of AUCTeX.
diff --git a/configure.ac b/configure.ac
index a435cb8ecb..fe7616d5a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Autoconf script for AUCTeX
dnl Maintainer: auctex-de...@gnu.org
-dnl Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2022Free Software Foundation, Inc.
dnl This file is part of AUCTeX.
@@ -37,7 +37,7 @@ AC_SUBST(PREVIEWVERSION)
EMACS_PROG_EMACS
-EMACS_CHECK_VERSION(24,3)
+EMACS_CHECK_VERSION(25,1)
# The Debian package uses `--disable-build-dir-test'; normal users should
# never need to modify the default behavior.
diff --git a/doc/changes.texi b/doc/changes.texi
index 12acd0c247..b8c70ba33e 100644
--- a/doc/changes.texi
+++ b/doc/changes.texi
@@ -11,6 +11,9 @@
@heading News since last release
@itemize @bullet
+@item
+@AUCTeX{} now requires GNU Emacs 25.1 or higher.
+
@item
@AUCTeX{} tracks the change in Emacs where initial inputs in the
minibuffer during queries are getting phased out. Queries for the
diff --git a/doc/faq.texi b/doc/faq.texi
index da5576b122..a6122ec01b 100644
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -71,7 +71,7 @@ statements related to the problem.
@item
What versions of Emacs are supported?
-@AUCTeX{} was tested with @w{GNU Emacs 24.3}. Older versions may work but
+@AUCTeX{} was tested with @w{GNU Emacs 25.1}. Older versions may work but
are unsupported.
@item
diff --git a/doc/install.texi b/doc/install.texi
index f7af60ff2c..19034cb957 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -96,7 +96,7 @@ the file @file{INSTALL.windows}.
@end ifclear
@itemize @bullet
-@item GNU Emacs 24.3 or higher
+@item GNU Emacs 25.1 or higher
Using @previewlatex{} requires a version of Emacs compiled with image
support.
diff --git a/doc/preview-faq.texi b/doc/preview-faq.texi
index 569ef00313..bf16c7f61a 100644
--- a/doc/preview-faq.texi
+++ b/doc/preview-faq.texi
@@ -48,7 +48,7 @@ to @email{auctex-devel@@gnu.org}.
@subsection Which version of Emacs is needed?
@previewlatex{} nominally requires @w{GNU Emacs} with a version of at
-least 24.3.
+least 25.1.
@subsection Which versions of Ghostscript and @AUCTeX{} are needed?
diff --git a/tex-site.el.in b/tex-site.el.in
index 8757fefa83..e088251efd 100644
--- a/tex-site.el.in
+++ b/tex-site.el.in
@@ -38,10 +38,8 @@
;;; Code:
-(when (or (< emacs-major-version 24)
- (and (= emacs-major-version 24)
- (< emacs-minor-version 3)))
- (error "AUCTeX requires Emacs 24.3 or later"))
+(when (< emacs-major-version 25)
+ (error "AUCTeX requires Emacs 25.1 or later"))
(unless (or (fboundp 'TeX-modes-set) ;Avoid inf-looping.
(fboundp 'TeX-tex-mode)) ;auctex-autoloads is not loaded.
diff --git a/tex.el b/tex.el
index 0187459b64..9188ccd74d 100644
--- a/tex.el
+++ b/tex.el
@@ -28,10 +28,8 @@
;;; Code:
-(when (or (< emacs-major-version 24)
- (and (= emacs-major-version 24)
- (< emacs-minor-version 3)))
- (error "AUCTeX requires Emacs 24.3 or later"))
+(when (< emacs-major-version 25)
+ (error "AUCTeX requires Emacs 25.1 or later"))
(require 'custom)
(require 'tex-site)
[elpa] externals/auctex a25652ffe2 10/14: Update style/fbox.el to package version 0.06
branch: externals/auctex
commit a25652ffe22ef190e80780c88fa503ead0ac342c
Author: Arash Esbati
Commit: Arash Esbati
Update style/fbox.el to package version 0.06
* style/fbox.el (LaTeX-fbox-key-val-options): New function.
("fbox"): Run the style hook for 'xcolor'.
("fbox"): Support key=value query for the macros provided by the
package with the new function `LaTeX-fbox-key-val-options'.
(LaTeX-fbox-package-options): New variable.
---
style/fbox.el | 37 ++---
1 file changed, 30 insertions(+), 7 deletions(-)
diff --git a/style/fbox.el b/style/fbox.el
index dc4e211f55..8348dfad6f 100644
--- a/style/fbox.el
+++ b/style/fbox.el
@@ -1,6 +1,6 @@
-;;; fbox.el --- AUCTeX style for `fbox.sty' (v0.04) -*- lexical-binding: t;
-*-
+;;; fbox.el --- AUCTeX style for `fbox.sty' (v0.06) -*- lexical-binding: t;
-*-
-;; Copyright (C) 2019--2020 Free Software Foundation, Inc.
+;; Copyright (C) 2019--2022 Free Software Foundation, Inc.
;; Author: Arash Esbati
;; Maintainer: auctex-de...@gnu.org
@@ -26,26 +26,46 @@
;;; Commentary:
-;; This file adds support for `fbox.sty' (v0.04) from 2020/01/03.
+;; This file adds support for `fbox.sty' (v0.06) from 2022/02/20.
;; `fbox.sty' is part of TeXLive.
;;; Code
(require 'tex)
+(require 'latex)
;; Silence the compiler:
(declare-function font-latex-add-keywords
"font-latex"
(keywords class))
+(declare-function LaTeX-xcolor-definecolor-list "xcolor" ())
+
+(defun LaTeX-fbox-key-val-options ()
+ "Return an updated list of key=vals from fbox package."
+ (let ((colors (mapcar #'car (LaTeX-xcolor-definecolor-list)))
+(lenghts (mapcar (lambda (x)
+ (concat TeX-esc (car x)))
+ (LaTeX-length-list
+`(("boxrule" ,lenghts)
+ ("boxsep" ,lenghts)
+ ("lcolor" ,colors)
+ ("rcolor" ,colors)
+ ("bcolor" ,colors)
+ ("tcolor" ,colors)
+ ("l")
+ ("r")
+ ("b")
+ ("t"
(TeX-add-style-hook
"fbox"
(lambda ()
+ (TeX-run-style-hooks "xcolor")
(TeX-add-symbols
-'("fbox" [ "Frame parts (combination of lrtb)" ] t)
-'("fbox*"[ "Frame parts (combination of lrtb)" ] t)
-'("fparbox" [ "Frame parts (combination of lrtb)" ] t)
-'("fparbox*" [ "Frame parts (combination of lrtb)" ] t))
+'("fbox" [TeX-arg-key-val (LaTeX-fbox-key-val-options)] t)
+'("fbox*"[TeX-arg-key-val (LaTeX-fbox-key-val-options)] t)
+'("fparbox" [TeX-arg-key-val (LaTeX-fbox-key-val-options)] t)
+'("fparbox*" [TeX-arg-key-val (LaTeX-fbox-key-val-options)] t))
;; Fontification
(when (and (featurep 'font-latex)
@@ -55,4 +75,7 @@
'function)))
TeX-dialect)
+(defvar LaTeX-fbox-package-options nil
+ "Package options for the fbox package.")
+
;;; fbox.el ends here
[elpa] externals/auctex c534b17704 12/14: Avoid using variadic setq-local
branch: externals/auctex commit c534b177049f33cfc1d013bbbaa8c2cd68c8527a Author: Radon Rosborough Commit: Tassilo Horn Avoid using variadic setq-local --- latex.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/latex.el b/latex.el index dfbe78dd3d..5747449c5a 100644 --- a/latex.el +++ b/latex.el @@ -7297,8 +7297,8 @@ function would return non-nil and `(match-string 1)' would return (set (make-local-variable 'TeX-search-files-type-alist) LaTeX-search-files-type-alist) - (setq-local beginning-of-defun-function #'LaTeX-find-matching-begin - end-of-defun-function #'LaTeX-find-matching-end) + (setq-local beginning-of-defun-function #'LaTeX-find-matching-begin) + (setq-local end-of-defun-function #'LaTeX-find-matching-end) (LaTeX-indent-commands-regexp-make)
[elpa] externals/auctex 615d6f2052 13/14: Merge remote-tracking branch 'origin/master' into externals/auctex
branch: externals/auctex
commit 615d6f2052085adbdebfd51244e6eecd184af6df
Merge: 2568505587 c534b17704
Author: Tassilo Horn
Commit: Tassilo Horn
Merge remote-tracking branch 'origin/master' into externals/auctex
---
Makefile.in | 2 +-
admin/release-process.org | 24 +++
auctex.el.in | 4 +-
bib-cite.el | 28 +--
configure.ac | 4 +-
context.el| 16 +-
doc/changes.texi | 3 +
doc/faq.texi | 2 +-
doc/install.texi | 2 +-
doc/preview-faq.texi | 2 +-
font-latex.el | 30 +--
latex.el | 49 +++--
latex/preview.dtx | 2 +-
plain-tex.el | 8 +-
preview.el| 36 ++--
style/biblatex.el | 29 ++-
style/etoolbox.el | 376 ++
style/fbox.el | 37 +++-
style/ltx-base.el | 146 +++
style/polyglossia.el | 2 +-
style/pstricks.el | 4 +-
tests/latex/doctex-indent-in.dtx | 68 +++
tests/latex/doctex-indent-out.dtx | 68 +++
tests/latex/latex-test.el | 21 ++-
tex-fold.el | 12 +-
tex-info.el | 4 +-
tex-site.el.in| 6 +-
tex.el| 76
toolbar-x.el | 4 +-
29 files changed, 868 insertions(+), 197 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 9ee6db0c59..c1b29c1733 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -179,7 +179,7 @@ STYLESRC = style/prosper.el \
style/cuted.el style/floatpag.el style/flushend.el \
style/midfloat.el style/stabular.el style/stfloats.el \
style/rotating.el style/sidecap.el style/l3doc.el \
- style/ifthen.el
+ style/ifthen.elstyle/etoolbox.el
STYLEELC = $(STYLESRC:.el=.elc)
diff --git a/admin/release-process.org b/admin/release-process.org
index ea87618ddf..26ff0280d5 100644
--- a/admin/release-process.org
+++ b/admin/release-process.org
@@ -227,3 +227,27 @@ looks for all files without FSF-copyright line which are
not listed in a
special copyright_exceptions file. As result, it spits out a diff between the
actual and expected copyright exceptions. If the diff is empty (or at least
doesn't mention an AUCTeX file), everything is fine.
+
+** Bumping required Emacs version
+
+It happens from time to time that AUCTeX requires a newer Emacs
+version. For this, the following files in the main directory has to
+be adjusted.
+
+- [ ] =auctex.el.in= :: Change the ~;; Package-Requires:~ cookie in
+ the header.
+- [ ] =configure.ac= :: Change the argument of ~EMACS_CHECK_VERSION~
+- [ ] =tex-site.el.in= :: Change the number after ~emacs-major-version~
+- [ ] =tex.el= :: Change the number after ~emacs-major-version~
+
+In the =doc= directory, these files are affected.
+
+- [ ] =doc/changes.texi= :: Add an entry under *News* about the
+ required version.
+- [ ] =doc/faq.texi= :: Adjust the number in this sentence:
+ =@AUCTeX{} was tested with @w{GNU Emacs XX.X}=.
+- [ ] =doc/install.texi= :: Adjust the number in ~@node Prerequisites~:
+ =@item GNU Emacs XX.X or higher=.
+- [ ] =doc/preview-faq.texi= :: Adjust the number in ~@section Requirements~
+ =@previewlatex{} nominally requires @w{GNU Emacs} with a version of
+ at least XX.X.=.
diff --git a/auctex.el.in b/auctex.el.in
index 014c0a2b8a..61527e2393 100644
--- a/auctex.el.in
+++ b/auctex.el.in
@@ -1,11 +1,11 @@
;;; auctex.el --- Integrated environment for *TeX* -*- lexical-binding: t; -*-
-;; Copyright (C) 2014-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2022 Free Software Foundation, Inc.
;; URL: https://www.gnu.org/software/auctex/
;; Maintainer: auctex-de...@gnu.org
;; Notifications-To: auctex-di...@gnu.org
-;; Package-Requires: ((emacs "24.3") (nadvice "0.3"))
+;; Package-Requires: ((emacs "25.1"))
;; Keywords: TeX LaTeX Texinfo ConTeXt docTeX preview-latex
;; This file is part of AUCTeX.
diff --git a/bib-cite.el b/bib-cite.el
index 465f18f973..a6405046f5 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -1,6 +1,6 @@
;; bib-cite.el - Display \cite, \ref or \label / Extract refs from BiBTeX
file. -*- lexical-binding: t; -*-
-;; Copyright (C) 1994-1999, 2001, 2003-2005, 2014-2021 Free Software
Foundation, Inc.
+;; Copyright (C) 1994-1999, 2001, 2003-2005, 2014-2022 Free Software
Foundation, Inc.
;; Author:Peter S. Galbraith
;; Created: 06 July 1994
@@ -629,7 +629,7 @@ BiBTeX 0.99b manual says this should be TEXBIB.
Another version says it should BSTINPUTS. I don't know anymore!
The colon character (:) is the default path separator in unix, but you may
-use semi-colon (;) for DOS or OS/2 if you set bib-dos-or-os
[elpa] externals/eev 84a0b6e6bb: New file: eev-wconfig.el.
branch: externals/eev commit 84a0b6e6bb247efcb519c1e32de172aa55e184c7 Author: Eduardo Ochs Commit: Eduardo Ochs New file: eev-wconfig.el. --- ChangeLog | 10 ++ VERSION | 4 +- eepitch.el| 3 +- eev-intro.el | 12 +- eev-on-windows.el | 29 +++- eev-pdflike.el| 9 +- eev-tlinks.el | 1 + eev-wconfig.el| 494 ++ eev.el| 2 +- 9 files changed, 548 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0c7ae2261..526ef6b598 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2022-04-16 Eduardo Ochs + + * eev-wconfig.el: new file. + +2022-04-15 Eduardo Ochs + + * eev-pdflike.el (find-pdftotext-page): define it explicitly. + + * eepitch.el (eepitch-eshell3): new function. + 2022-04-13 Eduardo Ochs * eev-tlinks.el (ee-find-psne-echo-options): new function. diff --git a/VERSION b/VERSION index 64cba9fa6d..15bdb63af5 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -Thu Apr 14 03:00:14 GMT 2022 -Thu Apr 14 00:00:14 -03 2022 +Sat Apr 16 08:39:20 GMT 2022 +Sat Apr 16 05:39:20 -03 2022 diff --git a/eepitch.el b/eepitch.el index 2dd62a4097..b5b977f5b1 100644 --- a/eepitch.el +++ b/eepitch.el @@ -19,7 +19,7 @@ ;; ;; Author: Eduardo Ochs ;; Maintainer: Eduardo Ochs -;; Version:20220115 +;; Version:20220416 ;; Keywords: e-scripts ;; ;; Latest version: <http://angg.twu.net/eev-current/eepitch.el> @@ -493,6 +493,7 @@ scratch." (defun eepitch-shell3 () (interactive) (eepitch '(shell "*shell 3*"))) (defun eepitch-eshell () (interactive) (eepitch '(eshell))) (defun eepitch-eshell2 () (interactive) (eepitch '(eshell 2))) +(defun eepitch-eshell3 () (interactive) (eepitch '(eshell 3))) diff --git a/eev-intro.el b/eev-intro.el index afee1620df..5cc004fda9 100644 --- a/eev-intro.el +++ b/eev-intro.el @@ -13949,12 +13949,12 @@ explained in the source of eshell: `find-psne-links' accepts two optional arguments after the URL. The first of them is called `wget-options', and when it is not -given it defaults to \"-nc\" (\"no-clobber\"). The optional -argument is called `echo-options', and _ideally_ it should -default to \"\" on \"normal\" unix shells, and to \"-N\" on -eshell. When it is not given eev runs the function -`ee-find-psne-echo-options' to decide what to do, and the -default definition of that function is: +given it defaults to \"-nc\" (\"no-clobber\"). The second +optional argument is called `echo-options', and _ideally_ it +should default to \"\" on \"normal\" unix shells, and to \"-N\" +on eshell. When it is not given eev runs the function +`ee-find-psne-echo-options' to decide what to do, and the default +definition of that function is: ;; See: (find-eev \"eev-tlinks.el\" \"ee-find-psne-echo-options\") ;; diff --git a/eev-on-windows.el b/eev-on-windows.el index 2dd6a4ebf7..ec133f5d68 100644 --- a/eev-on-windows.el +++ b/eev-on-windows.el @@ -19,7 +19,7 @@ ;; ;; Author: Eduardo Ochs ;; Maintainer: Eduardo Ochs -;; Version:2020 +;; Version:20220416 ;; Keywords: e-scripts ;; ;; Latest version: <http://angg.twu.net/eev-current/eev-on-windows.el> @@ -60,10 +60,29 @@ ;;; Commentary: ;; -;; Experimental, undocumented, and messy. Every time that I give a -;; workshop to Windows users this file changes a lot. Most of what was -;; here in the last revision was rewritten in a more human-readable -;; form and placed in: +;; Long short short: this is obsolete. +;; +;; Long story medium-sized: In 2021 I found some Windows users who +;; were interested in learning Emacs and eev, and I wrote this to try +;; to make configuring eev on Windows easier. See: +;; +;; http://angg.twu.net/2021-2022-workshops.html +;; (find-windows-beginner-intro) +;; +;; In april/2022 I started to work on a different approach for +;; configuring eev on Windows, and I declared that this file had +;; become obsolete. The new approach is here: +;; +;; (find-eev "eev-wconfig.el") +;; http://angg.twu.net/eev-customize.html +;; +;; Long story long: read the rest of this file (warning: old stuff!). + + +;; I wrote this for some Experimental, undocumented, and messy. Every +;; time that I give a workshop to Windows users this file changes a +;; lot. Most of what was here in the last revision was rewritten in a +;; more human-readable form and placed in: ;; ;; (find-windows-beginner-intro) diff --git a/eev-pdflike.el b/eev-pdflike.el index 4b9eda17d2..25fe6f1f80 100644 --- a/eev-pdflike.el +++ b/eev-pdflike.el @@ -628,6 +628,8 @@ newline are spurious - and replaces them by \"(ff)\"." ;; (find-code-pdfbackendalias "pdf-text" "pdftotext-text") (co
[elpa] externals-release/org fa5c832e9b 2/2: org-cite-basic--key-completion-table: Reuse bibliography for speed
branch: externals-release/org commit fa5c832e9b8c3f07197df112d2068c8361354736 Author: Ihor Radchenko Commit: Ihor Radchenko org-cite-basic--key-completion-table: Reuse bibliography for speed * lisp/oc-basic.el (org-cite-basic--key-completion-table): Supply the pre-calculated bibliography entries when getting entry fields. This avoids excessive file change checks inside `org-cite-basic--parse-bibliography'. --- lisp/oc-basic.el | 31 ++- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el index 8af150b73a..775690f176 100644 --- a/lisp/oc-basic.el +++ b/lisp/oc-basic.el @@ -734,19 +734,24 @@ Return nil if there are no bibliography files or no entries." (t (clrhash org-cite-basic--completion-cache) (dolist (key (org-cite-basic--all-keys)) -(let ((completion - (concat -(let ((author (org-cite-basic--get-field 'author key nil t))) - (if author - (truncate-string-to-width - (replace-regexp-in-string " and " "; " author) - org-cite-basic-author-column-end nil ?\s) -(make-string org-cite-basic-author-column-end ?\s))) -org-cite-basic-column-separator -(let ((date (org-cite-basic--get-year key nil 'no-suffix))) - (format "%4s" (or date ""))) -org-cite-basic-column-separator -(org-cite-basic--get-field 'title key nil t +(let* ((entry (org-cite-basic--get-entry + key + ;; Supply pre-calculated bibliography to avoid + ;; performance degradation. + (list :cite-basic/bibliography entries))) + (completion +(concat + (let ((author (org-cite-basic--get-field 'author entry nil 'raw))) + (if author + (truncate-string-to-width +(replace-regexp-in-string " and " "; " author) +org-cite-basic-author-column-end nil ?\s) + (make-string org-cite-basic-author-column-end ?\s))) + org-cite-basic-column-separator + (let ((date (org-cite-basic--get-year entry nil 'no-suffix))) + (format "%4s" (or date ""))) + org-cite-basic-column-separator + (org-cite-basic--get-field 'title entry nil t (puthash completion key org-cite-basic--completion-cache))) (unless (map-empty-p org-cite-basic--completion-cache) ;no key (puthash entries t org-cite-basic--completion-cache)
[elpa] externals-release/org 7ddc5b57c0 1/2: oc-basic: Speed up cached bibliography retrival
branch: externals-release/org commit 7ddc5b57c0c9090b5f544f384b35bdf1460d11d5 Author: Ihor Radchenko Commit: Ihor Radchenko oc-basic: Speed up cached bibliography retrival * lisp/oc-basic.el (org-cite-basic--file-id-cache): New variable storing hash of bibliography file contents. (org-cite-basic--parse-bibliography): Skip buffer hash calculation when bibliography file is unchanged on disk. Calculating buffer hash on every call is slow when bibliography file is large. * lisp/org-compat.el: (org-file-has-changed-p--hash-table, org-file-has-changed-p): Define `file-has-changed-p' from Emacs 29 if necessary. See https://list.orgmode.org/lo2p265mb1758e12e04832dc712f5a8e9dc...@lo2p265mb1758.gbrp265.prod.outlook.com/T/#t --- lisp/oc-basic.el | 11 +-- lisp/org-compat.el | 29 + 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el index 81b7e4471f..8af150b73a 100644 --- a/lisp/oc-basic.el +++ b/lisp/oc-basic.el @@ -233,6 +233,8 @@ Return a hash table with citation references as keys and fields alist as values. entries))) entries)) +(defvar org-cite-basic--file-id-cache nil + "Hash table linking files to their hash.") (defun org-cite-basic--parse-bibliography (&optional info) "List all entries available in the buffer. @@ -245,14 +247,19 @@ table where keys are references and values are association lists between fields, as symbols, and values as strings or nil. Optional argument INFO is the export state, as a property list." + (unless (hash-table-p org-cite-basic--file-id-cache) +(setq org-cite-basic--file-id-cache (make-hash-table :test #'equal))) (if (plist-member info :cite-basic/bibliography) (plist-get info :cite-basic/bibliography) (let ((results nil)) (dolist (file (org-cite-list-bibliography-files)) (when (file-readable-p file) (with-temp-buffer -(insert-file-contents file) - (let* ((file-id (cons file (org-buffer-hash))) +(when (or (org-file-has-changed-p file) + (not (gethash file org-cite-basic--file-id-cache))) + (insert-file-contents file) + (puthash file (org-buffer-hash) org-cite-basic--file-id-cache)) + (let* ((file-id (cons file (gethash file org-cite-basic--file-id-cache))) (entries (or (cdr (assoc file-id org-cite-basic--bibliography-cache)) (let ((table diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 4ad87c84d0..c26eb6f10a 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -72,6 +72,35 @@ (defvar org-table1-hline-regexp) +;;; Emacs < 29 compatibility + +(defvar org-file-has-changed-p--hash-table (make-hash-table :test #'equal) + "Internal variable used by `org-file-has-changed-p'.") + +(if (fboundp 'file-has-changed-p) +(defalias 'org-file-has-changed-p #'file-has-changed-p) + (defun org-file-has-changed-p (file &optional tag) +"Return non-nil if FILE has changed. +The size and modification time of FILE are compared to the size +and modification time of the same FILE during a previous +invocation of `org-file-has-changed-p'. Thus, the first invocation +of `org-file-has-changed-p' always returns non-nil when FILE exists. +The optional argument TAG, which must be a symbol, can be used to +limit the comparison to invocations with identical tags; it can be +the symbol of the calling function, for example." +(let* ((file (directory-file-name (expand-file-name file))) + (remote-file-name-inhibit-cache t) + (fileattr (file-attributes file 'integer)) + (attr (and fileattr + (cons (file-attribute-size fileattr) + (file-attribute-modification-time fileattr + (sym (concat (symbol-name tag) "@" file)) + (cachedattr (gethash sym org-file-has-changed-p--hash-table))) + (when (not (equal attr cachedattr)) +(puthash sym attr org-file-has-changed-p--hash-table) + + + ;;; Emacs < 28.1 compatibility (if (fboundp 'directory-empty-p)
[elpa] externals/org updated (a0755ebccf -> 685d78f63c)
elpasync pushed a change to branch externals/org. from a0755ebccf doc/org-manual.org: Fix a typo in the manual new 7ddc5b57c0 oc-basic: Speed up cached bibliography retrival new fa5c832e9b org-cite-basic--key-completion-table: Reuse bibliography for speed new 685d78f63c Merge branch 'bugfix' Summary of changes: lisp/oc-basic.el | 42 +++--- lisp/org-compat.el | 29 + 2 files changed, 56 insertions(+), 15 deletions(-)
[elpa] externals-release/org updated (64ee5c2c47 -> fa5c832e9b)
elpasync pushed a change to branch externals-release/org. from 64ee5c2c47 lisp/org-table.el: Fix bug in `org-table-row-get-visible-string' new 7ddc5b57c0 oc-basic: Speed up cached bibliography retrival new fa5c832e9b org-cite-basic--key-completion-table: Reuse bibliography for speed Summary of changes: lisp/oc-basic.el | 42 +++--- lisp/org-compat.el | 29 + 2 files changed, 56 insertions(+), 15 deletions(-)
[elpa] externals/org 685d78f63c: Merge branch 'bugfix'
branch: externals/org commit 685d78f63cbe210448508b23c0b47d7be70aedfb Merge: a0755ebccf fa5c832e9b Author: Ihor Radchenko Commit: Ihor Radchenko Merge branch 'bugfix' --- lisp/oc-basic.el | 42 +++--- lisp/org-compat.el | 29 + 2 files changed, 56 insertions(+), 15 deletions(-) diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el index e2dfc06030..873986d07e 100644 --- a/lisp/oc-basic.el +++ b/lisp/oc-basic.el @@ -233,6 +233,8 @@ Return a hash table with citation references as keys and fields alist as values. entries))) entries)) +(defvar org-cite-basic--file-id-cache nil + "Hash table linking files to their hash.") (defun org-cite-basic--parse-bibliography (&optional info) "List all entries available in the buffer. @@ -245,14 +247,19 @@ table where keys are references and values are association lists between fields, as symbols, and values as strings or nil. Optional argument INFO is the export state, as a property list." + (unless (hash-table-p org-cite-basic--file-id-cache) +(setq org-cite-basic--file-id-cache (make-hash-table :test #'equal))) (if (plist-member info :cite-basic/bibliography) (plist-get info :cite-basic/bibliography) (let ((results nil)) (dolist (file (org-cite-list-bibliography-files)) (when (file-readable-p file) (with-temp-buffer -(insert-file-contents file) - (let* ((file-id (cons file (org-buffer-hash))) +(when (or (org-file-has-changed-p file) + (not (gethash file org-cite-basic--file-id-cache))) + (insert-file-contents file) + (puthash file (org-buffer-hash) org-cite-basic--file-id-cache)) + (let* ((file-id (cons file (gethash file org-cite-basic--file-id-cache))) (entries (or (cdr (assoc file-id org-cite-basic--bibliography-cache)) (let ((table @@ -753,19 +760,24 @@ Return nil if there are no bibliography files or no entries." (t (clrhash org-cite-basic--completion-cache) (dolist (key (org-cite-basic--all-keys)) -(let ((completion - (concat -(let ((author (org-cite-basic--get-author key nil 'raw))) - (if author - (truncate-string-to-width - (replace-regexp-in-string " and " "; " author) - org-cite-basic-author-column-end nil ?\s) -(make-string org-cite-basic-author-column-end ?\s))) -org-cite-basic-column-separator -(let ((date (org-cite-basic--get-year key nil 'no-suffix))) - (format "%4s" (or date ""))) -org-cite-basic-column-separator -(org-cite-basic--get-field 'title key nil t +(let* ((entry (org-cite-basic--get-entry + key + ;; Supply pre-calculated bibliography to avoid + ;; performance degradation. + (list :cite-basic/bibliography entries))) + (completion +(concat + (let ((author (org-cite-basic--get-author entry nil 'raw))) + (if author + (truncate-string-to-width +(replace-regexp-in-string " and " "; " author) +org-cite-basic-author-column-end nil ?\s) + (make-string org-cite-basic-author-column-end ?\s))) + org-cite-basic-column-separator + (let ((date (org-cite-basic--get-year entry nil 'no-suffix))) + (format "%4s" (or date ""))) + org-cite-basic-column-separator + (org-cite-basic--get-field 'title entry nil t (puthash completion key org-cite-basic--completion-cache))) (unless (map-empty-p org-cite-basic--completion-cache) ;no key (puthash entries t org-cite-basic--completion-cache) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index b926756947..b35e66b84e 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -74,6 +74,35 @@ (defvar org-table1-hline-regexp) +;;; Emacs < 29 compatibility + +(defvar org-file-has-changed-p--hash-table (make-hash-table :test #'equal) + "Internal variable used by `org-file-has-changed-p'.") + +(if (fboundp 'file-has-changed-p) +(defalias 'org-file-has-changed-p #'file-has-changed-p) + (defun org-file-has-changed-p (file &optional tag) +"Return non-nil if FILE has changed. +The size and modification time of FILE are compared to the size +and modification time of the same FILE during a previous +invocation of `org-file-has-changed-p'. Thus, the first invocation +of `org-file-has-changed-p' always returns non-nil when FILE exists. +The optional argument TAG, which must be a symbol, can be used to +limit the
[elpa] externals/embark 7a32b93422: Ignore target for align-regexp
branch: externals/embark commit 7a32b9342221327ea71233404441b5e2466ee0a9 Author: Omar Antolín Commit: Omar Antolín Ignore target for align-regexp --- embark.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/embark.el b/embark.el index 7bf7bf5c31..111cb92265 100644 --- a/embark.el +++ b/embark.el @@ -421,7 +421,8 @@ entry of `embark-target-injection-hooks' whose key is the action." (format-encode-region embark--ignore-target) (format-decode-region embark--ignore-target) (xref-find-definitions embark--ignore-target) -(sort-regexp-fields embark--ignore-target)) +(sort-regexp-fields embark--ignore-target) +(align-regexp embark--ignore-target)) "Alist associating commands with post-injection setup hooks. For commands appearing as keys in this alist, run the corresponding value as a setup hook after injecting the target
[elpa] externals/embark-consult updated (c4889163c8 -> 7a32b93422)
elpasync pushed a change to branch externals/embark-consult. from c4889163c8 Replace cl-constantly with definition (fix #487) adds 7a32b93422 Ignore target for align-regexp No new revisions were added by this update. Summary of changes: embark.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[nongnu] elpa/xah-fly-keys cb2b27ed75: more format change and better readme
branch: elpa/xah-fly-keys commit cb2b27ed7566b7863ad3e9adf67d75945d4118b0 Author: Xah Lee Commit: Xah Lee more format change and better readme --- README.md | 53 +++--- xah-fly-keys.el | 71 + 2 files changed, 75 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index 05aabee6c8..5a59af0f55 100755 --- a/README.md +++ b/README.md @@ -13,43 +13,48 @@ http://ergoemacs.org/misc/ergoemacs_vi_mode.html Major key engine rewrite by Dan Langlois (https://github.com/DanLanglois) and Will Dey (https://github.com/wi11dey) . -The old stable version is available at -http://ergoemacs.org/misc/i/xah-fly-keys_old_2020-04-18.el - QWERTY layout ---  -Documentation +Manual Install --- -Add the following to `.emacs` after installing manually or via MELPA: +put the file xah-fly-keys.el in ~/.emacs.d/lisp/ +create the dir if doesn't exist. + +put the following in your emacs init file: + ```elisp +(add-to-list 'load-path "~/.emacs.d/lisp/") (require 'xah-fly-keys) (xah-fly-keys-set-layout "qwerty") ; required ``` The following keyboard layouts are supported: -* "azerty" -* "azerty-be" -* "colemak" -* "colemak-mod-dh" -* "colemak-mod-dh-new" -* "dvorak" -* "programer-dvorak" -* "qwerty" -* "qwerty-abnt" -* "qwertz" -* "workman" -* "norman" -* ["neo2"](https://neo-layout.org/) -* "koy" -* "adnw" -* "pt-nativo" -* "carpalx-qgmlwy" -* "carpalx-qgmlwb" -* "carpalx-qfmlwy" +* adnw +* azerty +* azerty-be +* beopy +* bepo +* carpalx-qfmlwy +* carpalx-qgmlwb +* carpalx-qgmlwy +* colemak +* colemak-mod-dh +* colemak-mod-dh-new +* dvorak +* koy +* neo2 +* norman +* programer-dvorak +* pt-nativo +* qwerty +* qwerty-abnt +* qwerty-no (qwerty Norwegian) +* qwertz +* workman Full Documentation --- diff --git a/xah-fly-keys.el b/xah-fly-keys.el index 04b52d637c..3b43ca26c4 100644 --- a/xah-fly-keys.el +++ b/xah-fly-keys.el @@ -3,7 +3,7 @@ ;; Copyright © 2013-2022 by Xah Lee ;; Author: Xah Lee ( http://xahlee.info/ ) -;; Version: 17.5.20220415142016 +;; Version: 17.5.20220416101054 ;; Created: 10 Sep 2013 ;; Package-Requires: ((emacs "24.1")) ;; Keywords: convenience, emulations, vim, ergoemacs @@ -14,7 +14,9 @@ ;;; Commentary: -;; xah-fly-keys is a efficient keybinding for emacs. It is modal like vi, but key choices are based on statistics of command call frequency. +;; xah-fly-keys is a efficient keybinding for emacs. It is modal like +;; vi, but key choices are based on statistics of command call +;; frequency. ;; HOW TO USE @@ -22,20 +24,31 @@ ;; Important command/insert mode switch keys: -;; xah-fly-command-mode-activate (press or F8 or Alt+Space or Ctrl+Space or menu key) +;; xah-fly-command-mode-activate (press or F8 or Alt+Space or +;; Ctrl+Space or menu key) -;; xah-fly-insert-mode-activate (when in command mode, press qwerty letter key f.) +;; xah-fly-insert-mode-activate (when in command mode, press qwerty +;; letter key f.) ;; When in command mode: + ;; "f" calls `xah-fly-insert-mode-activate'. -;; Space is a leader key. For example, "SPC r" calls `query-replace'. Press "SPC C-h" to see the full list. + +;; Space is a leader key. For example, "SPC r" calls `query-replace'. +;; Press "SPC C-h" to see the full list. + ;; "SPC SPC" also activates insertion mode. -;; "SPC RET" calls `execute-extended-command-for-buffer' (if emacs 28), else `execute-extended-command'. + +;; "SPC RET" calls `execute-extended-command-for-buffer' (if emacs +;; 28), else `execute-extended-command'. + ;; "a" calls `execute-extended-command'. -;; The leader key sequence basically replace ALL emacs commands that starts with C-x key. +;; The leader key sequence basically replace ALL emacs commands that +;; starts with C-x key. -;; When using xah-fly-keys, you don't need to press Control or Meta, with the following exceptions: +;; When using xah-fly-keys, you don't need to press Control or Meta, +;; with the following exceptions: ;; "C-c" for major mode commands. ;; "C-g" for cancel. @@ -46,30 +59,36 @@ ;; You NEVER need to press "C-x" -;; Any emacs command that has a keybinding starting with C-x, has also a key sequence binding in xah-fly-keys. For example, +;; Any emacs command that has a keybinding starting with C-x, has also +;; a key sequence binding in xah-fly-keys. For example, + ;; "C-x b" for `switch-to-buffer' is "SPC f" ;; "C-x C-f" for `find-file' is "SPC i e" ;; "C-x n n" for `narrow-to-region' is "SPC l l" -;; The first key we call it leader key. In the above examples, the SPC is the leader key. + +;; The first key we call it leader key. In the above examples, the SPC +;; is the leader key. ;; When in command mode, the "SPC" is a leader key. ;; the following standard keys with Control are supported: - ;; "C-TAB" `xa
[elpa] externals/consult updated (b670d9a6d5 -> a924b3b0d9)
elpasync pushed a change to branch externals/consult. from b670d9a6d5 consult--source-project-recent-file: Handle directories in recentf-list new 7031e15394 Cleanup consult--buffer-query new a924b3b0d9 consult--source-project-buffer: No fallback to all buffers outside of project (Fix #551) Summary of changes: consult.el | 69 +++--- 1 file changed, 35 insertions(+), 34 deletions(-)
[elpa] externals/consult a924b3b0d9 2/2: consult--source-project-buffer: No fallback to all buffers outside of project (Fix #551)
branch: externals/consult commit a924b3b0d943d12c71d23964da7733251f4705b2 Author: Daniel Mendler Commit: Daniel Mendler consult--source-project-buffer: No fallback to all buffers outside of project (Fix #551) --- consult.el | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/consult.el b/consult.el index 8d981f29fc..f8b8878469 100644 --- a/consult.el +++ b/consult.el @@ -4175,9 +4175,10 @@ If NORECORD is non-nil, do not record the buffer switch in the buffer list." :enabled ,(lambda () consult-project-function) :items ,(lambda () - (consult--buffer-query :sort 'visibility - :directory 'project - :as #'buffer-name))) + (when-let (root (consult--project-root)) + (consult--buffer-query :sort 'visibility +:directory root +:as #'buffer-name "Project buffer candidate source for `consult-buffer'.") (defvar consult--source-project-recent-file
[elpa] externals/consult 7031e15394 1/2: Cleanup consult--buffer-query
branch: externals/consult
commit 7031e15394a1471ad2049170ed06b480081b0d92
Author: Daniel Mendler
Commit: Daniel Mendler
Cleanup consult--buffer-query
---
consult.el | 62 +++---
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/consult.el b/consult.el
index 031c66559b..8d981f29fc 100644
--- a/consult.el
+++ b/consult.el
@@ -4073,37 +4073,37 @@ AS is a conversion function."
;; This function is the backbone of most `consult-buffer' source. The
;; function supports filtering by various criteria which are used throughout
;; Consult.
- (when-let (root (or (consult--normalize-directory directory) t))
-(let ((buffers (buffer-list)))
- (when sort
-(setq buffers (funcall (intern (format "consult--buffer-sort-%s"
sort)) buffers)))
- (when (or filter mode as (stringp root))
-(let ((mode (consult--ensure-list mode))
- (exclude-re (consult--regexp-filter exclude))
- (include-re (consult--regexp-filter include)))
- (consult--keep! buffers
-(and
- (or (not mode)
- (apply #'provided-mode-derived-p
-(buffer-local-value 'major-mode it) mode))
- (pcase-exhaustive filter
- ('nil t)
- ((or 't 'invert)
-(eq (eq filter t)
-(and
- (or (not exclude)
- (not (string-match-p exclude-re (buffer-name it
- (or (not include)
- (not (not (string-match-p include-re (buffer-name
it)
- (or (not (stringp root))
- (when-let (dir (buffer-local-value 'default-directory it))
- (string-prefix-p root
-(if (and (/= 0 (length dir)) (eq (aref dir
0) ?/))
-dir
- (expand-file-name dir)
- (or (not predicate) (funcall predicate it))
- (if as (funcall as it) it)
- buffers)))
+ (let ((root (consult--normalize-directory directory))
+(buffers (buffer-list)))
+(when sort
+ (setq buffers (funcall (intern (format "consult--buffer-sort-%s" sort))
buffers)))
+(when (or filter mode as root)
+ (let ((mode (consult--ensure-list mode))
+(exclude-re (consult--regexp-filter exclude))
+(include-re (consult--regexp-filter include)))
+(consult--keep! buffers
+ (and
+ (or (not mode)
+ (apply #'provided-mode-derived-p
+ (buffer-local-value 'major-mode it) mode))
+ (pcase-exhaustive filter
+ ('nil t)
+ ((or 't 'invert)
+ (eq (eq filter t)
+ (and
+ (or (not exclude)
+ (not (string-match-p exclude-re (buffer-name it
+ (or (not include)
+ (not (not (string-match-p include-re (buffer-name
it)
+ (or (not root)
+ (when-let (dir (buffer-local-value 'default-directory it))
+ (string-prefix-p root
+ (if (and (/= 0 (length dir)) (eq (aref dir
0) ?/))
+ dir
+(expand-file-name dir)
+ (or (not predicate) (funcall predicate it))
+ (if as (funcall as it) it)
+buffers))
(defun consult--buffer-map (buffer &rest app)
"Run function application APP for each BUFFER.
[nongnu] elpa/subed updated (ea143d6f63 -> be3da4d794)
elpasync pushed a change to branch elpa/subed. from ea143d6f63 Drop unneccessary match-data saves and checks for batch-editing new 7472d62d1e Remove autoloads from the repository to make it get along with ELPA new ee5f92f56e Remove autoloads from the repository to make it get along with ELPA new 32bb088b8c Merge branch 'main' of github.com:sachac/subed into main new be3da4d794 Add license file Summary of changes: .gitignore | 4 ++ Makefile | 5 ++- README.org | 20 - subed/subed-ass.el.license | 3 ++ subed/subed-autoloads.el | 107 - subed/subed-common.el | 4 +- subed/subed.el | 3 +- tests/test-subed-ass.el| 2 +- tests/undercover-init.el | 2 +- 9 files changed, 33 insertions(+), 117 deletions(-) create mode 100644 .gitignore create mode 100644 subed/subed-ass.el.license delete mode 100644 subed/subed-autoloads.el
[nongnu] elpa/subed 32bb088b8c 3/4: Merge branch 'main' of github.com:sachac/subed into main
branch: elpa/subed commit 32bb088b8c06c3b7797d70efd0f2e32e94b8a4bc Merge: 7472d62d1e ee5f92f56e Author: Sacha Chua Commit: Sacha Chua Merge branch 'main' of github.com:sachac/subed into main
[nongnu] elpa/subed ee5f92f56e 1/4: Remove autoloads from the repository to make it get along with ELPA
branch: elpa/subed commit ee5f92f56ece128188054ea04184b2c9263a9ed7 Author: Sacha Chua Commit: Sacha Chua Remove autoloads from the repository to make it get along with ELPA * .gitignore: Don't include autoloads and package files. * Makefile (clean): Remove autoload file. (test): Generate autoloads. * subed/subed-common.el (subed--post-command-handler): Include Stefan Monnier's improvement to the test for buffer-chars-modified-tick. * subed/subed.el: Bump the version. (subed-autoloads): Don't require autoloads. * tests/test-subed-ass.el: Turn on lexical binding. * README.org (Manual installation): Add note about autoloads, since it's not in the repository. ... Not sure if I'm doing this the right way, but maybe it will work! --- .gitignore | 4 subed/subed-autoloads.el | 2 ++ subed/subed-common.el| 4 ++-- subed/subed.el | 3 +-- tests/test-subed-ass.el | 2 +- tests/undercover-init.el | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 00..1f721d93bb --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.elc +/subed-autoloads.el +/subed-pkg.el +/subed/subed-autoloads.el diff --git a/subed/subed-autoloads.el b/subed/subed-autoloads.el index de47cade7e..d6fe3b7f23 100644 --- a/subed/subed-autoloads.el +++ b/subed/subed-autoloads.el @@ -2,6 +2,8 @@ ;; ;;; Code: +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path + ;;;### (autoloads nil "subed" "subed.el" (0 0 0 0)) ;;; Generated autoloads from subed.el diff --git a/subed/subed-common.el b/subed/subed-common.el index 0e6c2c040e..fd6e5d03b8 100644 --- a/subed/subed-common.el +++ b/subed/subed-common.el @@ -480,8 +480,8 @@ Before BODY is run, point is placed on the subtitle's ID." (new-buffer-chars-modified-tick (buffer-chars-modified-tick))) (when (and new-point subed--current-point - (or (not (= new-point subed--current-point)) - (not (= new-buffer-chars-modified-tick subed--buffer-chars-modified-tick + (not (and (= new-point subed--current-point) + (= new-buffer-chars-modified-tick subed--buffer-chars-modified-tick ;; If point is synced to playback position, temporarily disable that so ;; that manual moves aren't cancelled immediately by automated moves. diff --git a/subed/subed.el b/subed/subed.el index c01d6b23cb..538c0f5cb7 100644 --- a/subed/subed.el +++ b/subed/subed.el @@ -1,6 +1,6 @@ ;;; subed.el --- A major mode for editing subtitles -*- lexical-binding: t; -*- -;; Version: 1.0.3 +;; Version: 1.0.4 ;; Keywords: convenience, files, hypermedia, multimedia ;; URL: https://github.com/rndusr/subed ;; Package-Requires: ((emacs "25.1")) @@ -32,7 +32,6 @@ ;;; Code: -(require 'subed-autoloads) (require 'subed-config) (require 'subed-debug) (require 'subed-common) diff --git a/tests/test-subed-ass.el b/tests/test-subed-ass.el index cd8cee4571..692956bddd 100644 --- a/tests/test-subed-ass.el +++ b/tests/test-subed-ass.el @@ -1,4 +1,4 @@ -;; -*- eval: (buttercup-minor-mode) -*- +;; -*- eval: (buttercup-minor-mode); lexical-binding: t; -*- (load-file "./tests/undercover-init.el") (require 'subed) diff --git a/tests/undercover-init.el b/tests/undercover-init.el index 0ffc2aed1a..c7f5c57417 100644 --- a/tests/undercover-init.el +++ b/tests/undercover-init.el @@ -1,4 +1,4 @@ -(add-to-list 'load-path (expand-file-name "./subed")) +(add-to-list 'load-path (expand-file-name "./subed")) ;FIXME: ?? (when (require 'undercover nil t) (undercover "./subed/*.el" (:report-format 'simplecov) (:send-report nil)))
[nongnu] elpa/subed 7472d62d1e 2/4: Remove autoloads from the repository to make it get along with ELPA
branch: elpa/subed
commit 7472d62d1efc2ea785760ec702a1efef11e63e54
Author: Sacha Chua
Commit: Sacha Chua
Remove autoloads from the repository to make it get along with ELPA
* .gitignore: Don't include autoloads and package files.
* Makefile (clean): Remove autoload file.
(test): Generate autoloads.
* subed/subed-common.el (subed--post-command-handler): Include Stefan
Monnier's improvement to the test for buffer-chars-modified-tick.
* subed/subed.el: Bump the version.
(subed-autoloads): Don't require autoloads.
* tests/test-subed-ass.el: Turn on lexical binding.
* README.org (Manual installation): Add note about autoloads, since
it's not in the repository.
... Not sure if I'm doing this the right way, but maybe it will work!
---
.gitignore | 4 ++
Makefile | 5 ++-
README.org | 20 -
subed/subed-autoloads.el | 107 ---
subed/subed-common.el| 4 +-
subed/subed.el | 3 +-
tests/test-subed-ass.el | 2 +-
tests/undercover-init.el | 2 +-
8 files changed, 30 insertions(+), 117 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00..1f721d93bb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.elc
+/subed-autoloads.el
+/subed-pkg.el
+/subed/subed-autoloads.el
diff --git a/Makefile b/Makefile
index 672406686f..674b00570b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,10 @@
clean:
find . -name "*.elc" -delete
+ rm subed/subed-autoloads.el
rm -f coverage/.*.json
-test: test-coverage package-lint checkdoc
+test: autoloads test-coverage package-lint checkdoc
test-coverage:
mkdir -p coverage
@@ -52,4 +53,4 @@ test-compile:
make clean
test-emacs:
- emacs -Q -L ./subed --eval "(require 'subed)"
+ emacs -Q -L ./subed --eval "(require 'subed-autoloads)"
diff --git a/README.org b/README.org
index 5dc51c4016..9951d117e5 100644
--- a/README.org
+++ b/README.org
@@ -112,9 +112,25 @@ If that doesn't work, you can install it manually. To
install from the main bran
git clone https://github.com/sachac/subed.git
#+end_src
-This will create a =subed= directory with the code. Then you can add
+This will create a =subed= directory with the code.
+
+If you have the =make= utility, you can regenerate the autoload definitions
with
+
+#+begin_src sh :eval no
+make autoloads
+#+end_src
+
+If you don't have =make= installed, you can generate the autoloads
+with:
+
+#+begin_src sh :eval no
+emacs --quick --batch --eval "(progn (setq generated-autoload-file
(expand-file-name \"subed-autoloads.el\" \"subed\") backup-inhibited t) \
+ (update-directory-autoloads \"./subed\"))"
+#+end_src
+
+Then you can add
the following to your Emacs configuration (typically
-=~/.config/emacs-init.el=, =~/.emacs.d/init.el=, or =~/.emacs=; you
+=~/.config/emacs/init.el=, =~/.emacs.d/init.el=, or =~/.emacs=; you
can create this file if it doesn't exist yet):
#+begin_src emacs-lisp
diff --git a/subed/subed-autoloads.el b/subed/subed-autoloads.el
deleted file mode 100644
index de47cade7e..00
--- a/subed/subed-autoloads.el
+++ /dev/null
@@ -1,107 +0,0 @@
-;;; subed-autoloads.el --- automatically extracted autoloads -*-
lexical-binding: t -*-
-;;
-;;; Code:
-
-
-;;;### (autoloads nil "subed" "subed.el" (0 0 0 0))
-;;; Generated autoloads from subed.el
-
-(autoload 'subed-mode "subed" "\
-Major mode for editing subtitles.
-
-subed uses the following terminology when it comes to changes in
-subtitles' timestamps:
-
-Adjust - Increase or decrease start or stop time of a subtitle
- Move - Increase or decrease start and stop time of a subtitle
- by the same amount
- Shift - Increase or decrease start and stop time of the current
- and all following subtitles by the same amount
-
-Key bindings:
-\\{subed-mode-map}
-
-\(fn)" t nil)
-
-(register-definition-prefixes "subed" '("subed-"))
-
-;;;***
-
-;;;### (autoloads nil "subed-ass" "subed-ass.el" (0 0 0 0))
-;;; Generated autoloads from subed-ass.el
-
-(autoload 'subed-ass-mode "subed-ass" "\
-Major mode for editing Advanced SubStation Alpha subtitle files.
-
-\(fn)" t nil)
-
-(add-to-list 'auto-mode-alist '("\\.ass\\'" . subed-ass-mode))
-
-(register-definition-prefixes "subed-ass" '("subed-ass-"))
-
-;;;***
-
-;;;### (autoloads nil "subed-common" "subed-common.el" (0 0 0 0))
-;;; Generated autoloads from subed-common.el
-
-(register-definition-prefixes "subed-common" '("subed-"))
-
-;;;***
-
-;;;### (autoloads nil "subed-config" "subed-config.el" (0 0 0 0))
-;;; Generated autoloads from subed-config.el
-
-(register-definition-prefixes "subed-config" '("subed-"))
-
-;;;***
-
-;;;### (autoloads nil "subed-debug" "subed-debug.el" (0 0 0 0))
-;;; Generated autoloads from subed-debug.el
-
-(register-definition-prefixes "subed-debug" '("subed-"))
-
-;;;***
-
-;;;### (autoloads nil "subed-mpv" "subed-mp
[nongnu] elpa/subed be3da4d794 4/4: Add license file
branch: elpa/subed commit be3da4d794f7da5b53cc2be285bc4a1ce3a1e8cb Author: Sacha Chua Commit: Sacha Chua Add license file --- subed/subed-ass.el.license | 3 +++ 1 file changed, 3 insertions(+) diff --git a/subed/subed-ass.el.license b/subed/subed-ass.el.license new file mode 100644 index 00..d3e551b9ac --- /dev/null +++ b/subed/subed-ass.el.license @@ -0,0 +1,3 @@ + SPDX-FileCopyrightText: 2021-2022 The subed Authors + + SPDX-License-Identifier: GPL-3.0-or-later
[elpa] externals/hyperbole 19e965d1e8 2/2: Use klink:at-p (#186)
branch: externals/hyperbole commit 19e965d1e84cdf7dc200b4ac77e3164668143202 Author: Mats Lidell Commit: GitHub Use klink:at-p (#186) --- hypb.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hypb.el b/hypb.el index a779344b0e..80c6e690dc 100644 --- a/hypb.el +++ b/hypb.el @@ -3,7 +3,7 @@ ;; Author: Bob Weiner ;; ;; Orig-Date: 6-Oct-91 at 03:42:38 -;; Last-Mod: 12-Apr-22 at 01:40:32 by Bob Weiner +;; Last-Mod: 16-Apr-22 at 00:42:39 by Mats Lidell ;; ;; Copyright (C) 1991-2022 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. @@ -854,7 +854,7 @@ The value returned is the value of the last form in BODY." "Return a list of any selectable thing at point as a string, start position of thing, end position of thing, or nil if none. Start and end may be nil if thing was generated rather than extracted from a region." (let (thing-and-bounds thing start end) -(cond ((setq thing-and-bounds (klink-at-p)) +(cond ((setq thing-and-bounds (klink:at-p)) (when thing-and-bounds (setcar (klink:absolute thing-and-bounds) thing-and-bounds) thing-and-bounds))
[elpa] externals/hyperbole updated (c86935b4a0 -> 19e965d1e8)
elpasync pushed a change to branch externals/hyperbole.
from c86935b4a0 {M-w} and {C-x r s} utilize selectable things when no
region active
new 1e8ea851ae Add hui-select delimited-thing tests (#185)
new 19e965d1e8 Use klink:at-p (#186)
Summary of changes:
ChangeLog| 9 +++
hypb.el | 4 +-
test/MANIFEST| 1 +
test/hui-select-tests.el | 147 +++
4 files changed, 159 insertions(+), 2 deletions(-)
create mode 100644 test/hui-select-tests.el
[elpa] externals/hyperbole 1e8ea851ae 1/2: Add hui-select delimited-thing tests (#185)
branch: externals/hyperbole commit 1e8ea851ae70ed7fb5902a206af1c260f821e9ec Author: Mats Lidell Commit: GitHub Add hui-select delimited-thing tests (#185) * Add hui-select delimited-thing tests * Use -- for separation from prefix * Add hui-select-thing tests --- ChangeLog| 9 +++ test/MANIFEST| 1 + test/hui-select-tests.el | 147 +++ 3 files changed, 157 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3599ed4bcb..e0745ff6a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2022-04-15 Mats Lidell + +* test/MANIFEST: Add hui-select.el + +* test/hui-select-tests.el (hui-select--thing) +(hui-select--thing-interactive-prints-type-of-match) +(hui-select--at-delimited-thing-p) (hui-select--delimited-thing) +(hui-select--delimited-thing-ending-in-newline): Add hui-select tests. + 2022-04-12 Bob Weiner * hypb.el (hypb:selectable-thing): Add and use in hypb:kill-ring-save, kotl-mode:kill-region, diff --git a/test/MANIFEST b/test/MANIFEST index 1812781f54..2700c67646 100644 --- a/test/MANIFEST +++ b/test/MANIFEST @@ -9,6 +9,7 @@ hmouse-drv-tests.el - hmouse-drv unit tests hmouse-info-tests.el- hmouse-info unit tests hpath-tests.el - unit tests for hpath hsys-org-tests.el - hsys-org tests +hui-select-tests.el - hui-select tests hui-tests.el- Tests for hui.el hypb-tests.el - test for hypb.el hyperbole-tests.el - Tests for hyperbole.el diff --git a/test/hui-select-tests.el b/test/hui-select-tests.el new file mode 100644 index 00..c8e76cfc8f --- /dev/null +++ b/test/hui-select-tests.el @@ -0,0 +1,147 @@ +;;; hui-select-tests.el --- Unit tests-*- lexical-binding: t; -*- + +;; Author: Mats Lidell +;; +;; Orig-Date:14-Apr-22 at 23:45:52 +;; Last-Mod: 15-Apr-22 at 23:53:52 by Mats Lidell +;; +;; Copyright (C) 2021 Free Software Foundation, Inc. +;; See the "../HY-COPY" file for license information. +;; +;; This file is part of Hyperbole. +;; +;;; Commentary: +;; +;; Unit tests for "../hui-select.el" + +;;; Code: + +;; +;;; +;;; Tests +;;; + +(require 'ert) +(require 'hui-select) +(require 'hy-test-helpers "test/hy-test-helpers") + +(declare-function hy-test-helpers:should-last-message "hy-test-helpers") + +(ert-deftest hui-select--at-delimited-thing-p () + "At delimited thing p returns type of thing." + (with-temp-buffer +(insert "(\"x\") ") + +;; hui-select-sexp-start +(goto-char 1) +(should (equal (hui-select-at-delimited-thing-p) 'hui-select-sexp-start)) + +;; hui-select-string +(goto-char 2) +(should (equal (hui-select-at-delimited-thing-p) 'hui-select-string)) + +;; nil +(goto-char 3) +(should-not (hui-select-at-delimited-thing-p)) + +;; hui-select-string +(goto-char 4) +(should (equal (hui-select-at-delimited-thing-p) 'hui-select-string)) + +;; hui-select-sexp-end +(goto-char 5) +(should (equal (hui-select-at-delimited-thing-p) 'hui-select-sexp-end + +(ert-deftest hui-select--delimited-thing () + "Delimited thing marks region of thing." + (with-temp-buffer +(insert "(\"x\") ") + +;; hui-select-sexp-start +(goto-char 1) +(should (hui-select-delimited-thing)) +(should (string= (buffer-substring-no-properties (region-beginning) (region-end)) "(\"x\")")) + +;; hui-select-string +(goto-char 2) +(should (hui-select-delimited-thing)) +(should (string= (buffer-substring-no-properties (region-beginning) (region-end)) "\"x\"" + + +(ert-deftest hui-select--delimited-thing-ending-in-newline () + "Delimited thing marks region of thing when next char after things is a newline." + (with-temp-buffer +(insert "(\"x\")\n") + +;; hui-select-sexp-start +(goto-char 1) +(should (hui-select-delimited-thing)) +(should (string= (buffer-substring-no-properties (region-beginning) (region-end)) "(\"x\")\n" + +(ert-deftest hui-select--thing () + "`hui-select-thing' selects bigger sections of text when called repeatedly." + (hui-select-reset) + (with-temp-buffer +(insert "Buffer\n\nParagraph\nline. One word.\n") +(forward-char -3) + +(should (hui-select-thing)) +(should (string= (buffer-substring-no-properties (region-beginning) (region-end)) "word")) + +(should (hui-select-thing)) +(should (string= (buffer-substring-no-properties (region-beginning) (region-end)) "One word.")) + +(should (hui-select-thing)) +(should (string= (buffer-substring-no-properties (region-beginning) (region-end)) + "line. One word.\n")) + +(should (hui-select-thing)) +(should (string= (buffer-substring-no-properties (region-beginning) (region-end)) + "\nParagraph\nl
[nongnu] elpa/subed 7a0c36c808: Add maintainer info, fix Makefile targets, change setq to defconst
branch: elpa/subed commit 7a0c36c808e107b5851ba48ec3825dfa3c1a902e Author: Sacha Chua Commit: Sacha Chua Add maintainer info, fix Makefile targets, change setq to defconst * Makefile (all): New default target. (compile): New target. (test-compile): Use new compile target. * subed/subed.el: Bump version and add maintainer info. Fix URL. (subed-mode-map): Change to defconst as suggested by Stefan Monnier. --- Makefile | 7 +-- subed/subed.el | 19 +++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 674b00570b..f122f28807 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later +all: clean autoloads compile + clean: find . -name "*.elc" -delete rm subed/subed-autoloads.el @@ -33,7 +35,7 @@ autoloads: emacs --quick --batch --eval "(progn (setq generated-autoload-file (expand-file-name \"subed-autoloads.el\" \"subed\") backup-inhibited t) \ (update-directory-autoloads \"./subed\"))" -test-compile: +compile: emacs --quick --batch --eval "(progn (add-to-list 'load-path (expand-file-name \"subed\" default-directory)) \ (byte-compile-file \"subed/subed.el\"))" emacs --quick --batch --eval "(progn (add-to-list 'load-path (expand-file-name \"subed\" default-directory)) \ @@ -50,7 +52,8 @@ test-compile: (byte-compile-file \"subed/subed-ass.el\"))" emacs --quick --batch --eval "(progn (add-to-list 'load-path (expand-file-name \"subed\" default-directory)) \ (byte-compile-file \"subed/subed-debug.el\"))" - make clean + +test-compile: compile clean test-emacs: emacs -Q -L ./subed --eval "(require 'subed-autoloads)" diff --git a/subed/subed.el b/subed/subed.el index 538c0f5cb7..a8fbfb82e4 100644 --- a/subed/subed.el +++ b/subed/subed.el @@ -1,8 +1,10 @@ ;;; subed.el --- A major mode for editing subtitles -*- lexical-binding: t; -*- -;; Version: 1.0.4 +;; Version: 1.0.5 +;; Maintainer: Sacha Chua +;; Author: Random User ;; Keywords: convenience, files, hypermedia, multimedia -;; URL: https://github.com/rndusr/subed +;; URL: https://github.com/sachac/subed ;; Package-Requires: ((emacs "25.1")) ;;; License: @@ -44,7 +46,7 @@ map) "A keymap for stepping the video by frames.") -(setq subed-mode-map +(defconst subed-mode-map (let ((subed-mode-map (make-keymap))) (define-key subed-mode-map (kbd "M-n") #'subed-forward-subtitle-text) (define-key subed-mode-map (kbd "M-p") #'subed-backward-subtitle-text) @@ -81,11 +83,12 @@ (define-key subed-mode-map (kbd "C-c .") #'subed-toggle-sync-point-to-player) (define-key subed-mode-map (kbd "C-c ,") #'subed-toggle-sync-player-to-point) (define-key subed-mode-map (kbd "C-c C-t") (let ((html-tag-keymap (make-sparse-keymap))) -(define-key html-tag-keymap (kbd "C-t") #'subed-insert-html-tag) -(define-key html-tag-keymap (kbd "C-i") #'subed-insert-html-tag-italic) -(define-key html-tag-keymap (kbd "C-b") #'subed-insert-html-tag-bold) -html-tag-keymap)) -subed-mode-map)) + (define-key html-tag-keymap (kbd "C-t") #'subed-insert-html-tag) + (define-key html-tag-keymap (kbd "C-i") #'subed-insert-html-tag-italic) + (define-key html-tag-keymap (kbd "C-b") #'subed-insert-html-tag-bold) + html-tag-keymap)) +subed-mode-map) + "A keymap for editing subtitles.") (defun subed-auto-find-video-maybe () "Load video associated with this subtitle file."
[elpa] externals/djvu 071c8ab168: Release djvu.el v1.1.2
branch: externals/djvu
commit 071c8ab168588897475899c46eaa16e70141db8c
Author: Roland Winkler
Commit: Roland Winkler
Release djvu.el v1.1.2
---
djvu.el | 1066 ++-
1 file changed, 644 insertions(+), 422 deletions(-)
diff --git a/djvu.el b/djvu.el
index 99154d03f4..85ddfa9138 100644
--- a/djvu.el
+++ b/djvu.el
@@ -1,10 +1,10 @@
;;; djvu.el --- Edit and view Djvu files via djvused -*- lexical-binding: t -*-
-;; Copyright (C) 2011-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2022 Free Software Foundation, Inc.
;; Author: Roland Winkler
;; Keywords: files, wp
-;; Version: 1.1.1
+;; Version: 1.1.2
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -139,6 +139,18 @@
;;; News:
+;; v1.1.2:
+;; - Support changing the mode of a buffer visiting a Djvu document.
+;;
+;; - Support `doc-view-toggle-display' with `major-mode-suspend'.
+;;
+;; - Selecting the background color "transparent" removes the
+;; background color attribute.
+;;
+;; - New options `djvu-image-zoom' and `djvu-ascenders-re'.
+;;
+;; - Bug fixes.
+;;
;; v1.1.1:
;; - Support text and image scrolling similar to `doc-view-mode'.
;; New option `djvu-continuous'.
@@ -204,20 +216,20 @@
;;; Djvu internals (see Sec. 8.3.4.2.3.1 of djvu3spec.djvu)
;;
-;; Supported area attributes rect oval poly line text
+;; Supported area attributes rect text oval line poly
;; (none)/(xor)/(border c)X X X X X
;; (shadow_* t) X
-;; (border_avis) X X X
+;; (border_avis) X X X
;; (hilite color) / (opacity o) X
;; (arrow) / (width w) / (lineclr c)X
-;; (backclr c) / (textclr c) / (pushpin) X
+;; (backclr c) / (textclr c) / (pushpin)X
;;
;; c = #RRGGBB t = thickness (1..32)
;; o = opacity = 0..200 (yes)
;;
;; zones: page, column, region, para, line, word, and char
+;; areas: rect, text, oval, line, and poly
-(require 'button)
(require 'image-mode)
(eval-when-compile
(require 'cl-lib))
@@ -263,8 +275,9 @@
("magenta" . "#FF00FF") ; 5
("purple" . "#7F60FF") ; 6
("cyan". "#00") ; 7
-("white" . "#FF") ; 8
-("black" . "#00")); 9
+("pink". "#FF6060") ; 8
+("white" . "#FF") ; 9
+("black" . "#00")); 10
"Alist of colors for highlighting."
:group 'djvu
:type '(repeat (cons (string) (string
@@ -362,6 +375,11 @@ Used by `djvu-region-string'."
:group 'djvu
:type 'boolean)
+(defcustom djvu-image-zoom 1.2
+ "Zoom factor for images."
+ :group 'djvu
+ :type 'number)
+
(defcustom djvu-descenders-re "[(),;Qgjpqy]" ; some fonts also `J' and `f'
;; https://en.wikipedia.org/wiki/Descender
"Regexp matching any descending characters or nil.
@@ -374,8 +392,41 @@ slightly below the baseline."
:group 'djvu
:type '(choice regexp (const nil)))
+(defcustom djvu-ascenders-re "[^-,.;:acegm-su-z\s]"
+ "Regexp matching ascending characters or nil, see `djvu-descenders-re'."
+ :group 'djvu
+ :type '(choice regexp (const nil)))
+
;; Internal variables
+(defvar djvu-coords-re
+ (format "\\(?2:%s\\)"
+ (mapconcat (lambda (i) (format "\\(?%d:-?[0-9]+\\)" i))
+ '(3 4 5 6) "[\s\t]+"))
+ "Regexp matching the coordinates of Djvu areas and zones.
+Substring 2: coordinates, 3-6: individual coordinates.")
+
+(defvar djvu-coord-xy-re
+ (mapconcat (lambda (i) (format "\\(?%d:-?[0-9]+\\)" i))
+ '(1 2) "[\s\t]+")
+ "Regexp matching pair of xy coordinates of Djvu maparea poly.
+Substrings 1-2: individual coordinates.")
+
+(defvar djvu-area-re
+ (format "(\\(?1:%s\\)[\s\t]+%s[)\s\t\n]"
+ (regexp-opt '("rect" "oval" "text" "line" "poly"))
+ djvu-coords-re)
+ "Regexp matching a Djvu area.
+Substring 1: area type, 2: coordinates, 3-6: individual coordinates.")
+
+(defvar djvu-zone-re
+ (format "[\s\t]*(\\(?1:%s\\)[\s\t]+%s[\s\t\n]+" ; omit closing `)'
+ (regexp-opt '("page" "column" "region" "para" "line"
+"word" "char"))
+ djvu-coords-re)
+ "Regexp matching the beginning of a Djvu text zone.
+Substring 1: zone type, 2: coordinates, 3-6: individual coordinates.")
+
(defvar djvu-test nil
"If non-nil do not process / delete djvused scripts. Useful for testing.")
;; (setq djvu-test t) (setq djvu-test nil)
@@ -408,6 +459,31 @@ Bind this with `let' to select one of these schemes.")
(defvar djvu-image-mode) ; fully defined by `define-minor-mode' (buffer-local)
+(defvar djvu-init nil
+ "Non-nil during initialization of Djview mode.")
+
+(defvar djvu-color-attributes '(border hilite lineclr backclr textclr)
+ "List of color attributes known to Djvu. See
[elpa] externals/marginalia fba798e7a3 1/2: Introduce project-root category
branch: externals/marginalia
commit fba798e7a30165cefcddf0acd0a2b0f17bb12d95
Author: Daniel Mendler
Commit: Daniel Mendler
Introduce project-root category
See the discussion in https://github.com/minad/consult/issues/6.
cc @jdtsmith, @oantolin
---
marginalia.el | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index 31da2c43b7..8fac4a1698 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -90,6 +90,7 @@ a relative age."
(imenu marginalia-annotate-imenu)
(bookmark marginalia-annotate-bookmark)
(file marginalia-annotate-file)
+ (project-root marginalia-annotate-file)
(project-file marginalia-annotate-project-file)
(buffer marginalia-annotate-buffer)
(library marginalia-annotate-library)
@@ -949,11 +950,8 @@ These annotations are skipped for remote paths."
(defun marginalia-annotate-project-file (cand)
"Annotate file CAND with its size, modification time and other attributes."
- ;; Absolute project directories also report project-file category
- (if (file-name-absolute-p cand)
- (marginalia-annotate-file cand)
-(when-let (root (marginalia--project-root))
- (marginalia-annotate-file (expand-file-name cand root)
+ (when-let (root (marginalia--project-root))
+(marginalia-annotate-file (expand-file-name cand root
(defvar-local marginalia--library-cache nil)
(defun marginalia--library-cache ()
@@ -1054,10 +1052,14 @@ These annotations are skipped for remote paths."
"Return original category reported by completion metadata."
;; NOTE: Use `alist-get' instead of `completion-metadata-get' to bypass our
;; `marginalia--completion-metadata-get' advice!
- (when-let (cat (alist-get 'category marginalia--metadata))
+ (pcase (alist-get 'category marginalia--metadata)
;; Ignore Emacs 28 symbol-help category in order to ensure that the
;; categories are refined to our categories function and variable.
-(and (not (eq cat 'symbol-help)) cat)))
+('symbol-help nil)
+;; Refine the project-file category to project-root
+((and 'project-file (guard (equal "Select project: " (minibuffer-prompt
+ 'project-root)
+(cat cat)))
(defun marginalia-classify-symbol ()
"Determine if currently completing symbols."
[elpa] externals/marginalia 4a40cfb4f2 2/2: Revert "Introduce project-root category"
branch: externals/marginalia
commit 4a40cfb4f2d54ddf63722e341e8112bd7fc413e6
Author: Daniel Mendler
Commit: Daniel Mendler
Revert "Introduce project-root category"
This reverts commit fba798e7a30165cefcddf0acd0a2b0f17bb12d95.
Revert this for now since it needs more thought.
---
marginalia.el | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index 8fac4a1698..31da2c43b7 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -90,7 +90,6 @@ a relative age."
(imenu marginalia-annotate-imenu)
(bookmark marginalia-annotate-bookmark)
(file marginalia-annotate-file)
- (project-root marginalia-annotate-file)
(project-file marginalia-annotate-project-file)
(buffer marginalia-annotate-buffer)
(library marginalia-annotate-library)
@@ -950,8 +949,11 @@ These annotations are skipped for remote paths."
(defun marginalia-annotate-project-file (cand)
"Annotate file CAND with its size, modification time and other attributes."
- (when-let (root (marginalia--project-root))
-(marginalia-annotate-file (expand-file-name cand root
+ ;; Absolute project directories also report project-file category
+ (if (file-name-absolute-p cand)
+ (marginalia-annotate-file cand)
+(when-let (root (marginalia--project-root))
+ (marginalia-annotate-file (expand-file-name cand root)
(defvar-local marginalia--library-cache nil)
(defun marginalia--library-cache ()
@@ -1052,14 +1054,10 @@ These annotations are skipped for remote paths."
"Return original category reported by completion metadata."
;; NOTE: Use `alist-get' instead of `completion-metadata-get' to bypass our
;; `marginalia--completion-metadata-get' advice!
- (pcase (alist-get 'category marginalia--metadata)
+ (when-let (cat (alist-get 'category marginalia--metadata))
;; Ignore Emacs 28 symbol-help category in order to ensure that the
;; categories are refined to our categories function and variable.
-('symbol-help nil)
-;; Refine the project-file category to project-root
-((and 'project-file (guard (equal "Select project: " (minibuffer-prompt
- 'project-root)
-(cat cat)))
+(and (not (eq cat 'symbol-help)) cat)))
(defun marginalia-classify-symbol ()
"Determine if currently completing symbols."
[elpa] externals/marginalia updated (20c019e884 -> 4a40cfb4f2)
elpasync pushed a change to branch externals/marginalia. from 20c019e884 marginalia-censor-variables: Add more auth-source variables new fba798e7a3 Introduce project-root category new 4a40cfb4f2 Revert "Introduce project-root category" Summary of changes:
