[nongnu] elpa/cdlatex 614a8d94f6 32/49: Test commit

[ELPA Syncer]

branch: elpa/cdlatex
commit 614a8d94f67cdc1eeef8371f7b6b90aef8a78158
Author: Carsten Dominik 
Commit: Carsten Dominik 

Test commit
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index d08e6a8ffc..6ae51b6b68 100644
--- a/README
+++ b/README
@@ -28,7 +28,7 @@ text development with LaTeX.  CDLaTeX is really about speed.  
AUCTeX
 based system for inserting environments and macros - but while this is
 useful and general, it is sometimes slow to use.  CDLaTeX tries to be
 quick, with very few and easy to remember keys, and intelligent
-on-the-fly help.
+on-the-fly help. 
 
 1. ABBREVIATIONS.  
-

[nongnu] elpa/cdlatex acc1282b73 27/49: Use cl-lib instead of cl

[ELPA Syncer]

branch: elpa/cdlatex
commit acc1282b73fbe59b6338bb0e20a4e6a7c5c18269
Author: Carsten Dominik 
Commit: Carsten Dominik 

Use cl-lib instead of cl
---
 cdlatex.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cdlatex.el b/cdlatex.el
index 2cf3623f47..1b994c91a5 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -317,7 +317,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 
 ;;; Begin of Configuration Section ;;
 

[nongnu] elpa/cdlatex 6ae740fccd 34/49: Fixed a couple typos

[ELPA Syncer]

branch: elpa/cdlatex
commit 6ae740fccded16a16d8e6ff3ecf09044d05f1118
Author: Alberto Luaces 
Commit: GitHub 

Fixed a couple typos
---
 README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 6ae51b6b68..b8239be4ac 100644
--- a/README
+++ b/README
@@ -101,9 +101,9 @@ on-the-fly help.
backquote character several times before pressing the letter.  For
example, typing "`d" inserts "\delta" (level 1), and typing "``d"
inserts "\partial" (level 2).  Similarly, "`e" inserts "\epsilon"
-   and "``e" inserts "\vareppsilon".
+   and "``e" inserts "\varepsilon".
 
-   On each level, on-thy-fly help will pop up automatically if you
+   On each level, on-the-fly help will pop up automatically if you
hesitate to press the next key.  The help screen is a window which
lists all math macros available on the current level.  Initially,
when you type slowly, this window will pop up each time you press

[nongnu] elpa/cdlatex adf96bab0b 29/49: Switch to use `cl-lib', now correctly

[ELPA Syncer]

branch: elpa/cdlatex
commit adf96bab0bbf28f65c882c0874f1c14fdb216bd8
Author: Carsten Dominik 
Commit: Carsten Dominik 

Switch to use `cl-lib', now correctly
---
 cdlatex.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cdlatex.el b/cdlatex.el
index 2cf3623f47..da0759e0cd 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -317,7 +317,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 
 ;;; Begin of Configuration Section ;;
 
@@ -2114,7 +2114,7 @@ these variables via `cdlatex-add-to-label-alist'."
 
   ;; The direct key bindings.
   (let (map dummy-map prefix modifiers symbol bindings) 
-(loop for level from 1 to cdlatex-math-symbol-no-of-levels do
+(cl-loop for level from 1 to cdlatex-math-symbol-no-of-levels do
  (setq dummy-map (make-sparse-keymap))
  (setq prefix (car (nth (1- level)
 cdlatex-math-symbol-direct-bindings)))

[nongnu] elpa/cdlatex 3adedafd20 30/49: Add vars keeping cdlatex from taking over parens insert

[ELPA Syncer]

branch: elpa/cdlatex
commit 3adedafd20da04ed690c3af9b3bb13f250163264
Author: Carsten Dominik 
Commit: Carsten Dominik 

Add vars keeping cdlatex from taking over parens insert

This is an attempt to avoid bad interaction with other packages
messing with these insertion commands.
---
 cdlatex.el | 38 ++
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/cdlatex.el b/cdlatex.el
index da0759e0cd..4ae1c13267 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -557,6 +557,23 @@ Font-lock must be loaded as well to actually get fontified 
display."
   :group 'cdlatex-miscellaneous-configurations
   :type '(boolean))
 
+(defcustom cdlatex-takeover-parenthesis t
+  "*Non-nil means, cdlatex is allowed to take over the parenthesis insertion.
+THis means it will redefine the `(', `{', and `[' keys."
+  :group 'cdlatex-miscellaneous-configurations
+  :type '(boolean))
+
+(defcustom cdlatex-takeover-dollar t
+  "*Non-nil means, cdlatex is allowed to take over the $.
+THis means it will redefine the `$' keys."
+  :group 'cdlatex-miscellaneous-configurations
+  :type '(boolean))
+
+(defcustom cdlatex-takeover-subsuperscript t
+  "*Non-nil means, cdlatex is allowed to take over the ^ and _ keys."
+  :group 'cdlatex-miscellaneous-configurations
+  :type '(boolean))
+
 (defcustom cdlatex-paired-parens "$[{"
   "*String with the opening parens you want to have inserted paired.
 The following parens are allowed here: `$([{|<'.
@@ -2156,14 +2173,19 @@ these variables via `cdlatex-add-to-label-alist'."
 
 ;;; Keybindings --
 
-(define-key cdlatex-mode-map  "$" 'cdlatex-dollar)
-(define-key cdlatex-mode-map  "(" 'cdlatex-pbb)
-(define-key cdlatex-mode-map  "{" 'cdlatex-pbb)
-(define-key cdlatex-mode-map  "[" 'cdlatex-pbb)
-(define-key cdlatex-mode-map  "|" 'cdlatex-pbb)
-(define-key cdlatex-mode-map  "<" 'cdlatex-pbb)
-(define-key cdlatex-mode-map  "^" 'cdlatex-sub-superscript)
-(define-key cdlatex-mode-map  "_" 'cdlatex-sub-superscript)
+(if cdlatex-takeover-dollar
+(define-key cdlatex-mode-map  "$" 'cdlatex-dollar))
+(if cdlatex-takeover-parenthesis
+(progn
+  (define-key cdlatex-mode-map  "(" 'cdlatex-pbb)
+  (define-key cdlatex-mode-map  "{" 'cdlatex-pbb)
+  (define-key cdlatex-mode-map  "[" 'cdlatex-pbb)
+  (define-key cdlatex-mode-map  "|" 'cdlatex-pbb)
+  (define-key cdlatex-mode-map  "<" 'cdlatex-pbb)))
+(if cdlatex-takeover-subsuperscript
+(progn
+  (define-key cdlatex-mode-map  "^" 'cdlatex-sub-superscript)
+  (define-key cdlatex-mode-map  "_" 'cdlatex-sub-superscript)))
 
 (define-key cdlatex-mode-map  "\t"'cdlatex-tab)
 (define-key cdlatex-mode-map  "\C-c?" 'cdlatex-command-help)

[nongnu] elpa/cdlatex f03bcd7a89 43/49: Fix typos

[ELPA Syncer]

branch: elpa/cdlatex
commit f03bcd7a89dcde9c1e73082083bd51b114df2161
Author: Damien Cassou 
Commit: Philip Kaludercic 

Fix typos

Typos found with codespell.
---
 cdlatex.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cdlatex.el b/cdlatex.el
index 8bae0b8d9f..7462040a4a 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -2237,7 +2237,7 @@ and after changes to these variables via
 
 ;;; That's it! 
 
-; Make sure tabels are compiled
+; Make sure tables are compiled
 (cdlatex-compute-tables)
 
 (provide 'cdlatex)

[nongnu] elpa/cdlatex f3eb992be1 40/49: Explicitly require reftex

[ELPA Syncer]

branch: elpa/cdlatex
commit f3eb992be12c8b11b3b522a83205322b77fbab2b
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Explicitly require reftex
---
 cdlatex.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cdlatex.el b/cdlatex.el
index 4f4d38387a..8bae0b8d9f 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -320,6 +320,7 @@
 
 (eval-when-compile (require 'cl-lib))
 (require 'texmathp)
+(require 'reftex)
 
 ;;; Begin of Configuration Section ;;
 

[nongnu] elpa/cdlatex f215b70c5c 33/49: Fix test and math flags for spl abbreviation

[ELPA Syncer]

branch: elpa/cdlatex
commit f215b70c5cb02bbc43f5a7d5c8e5e3460ff82428
Author: Carsten Dominik 
Commit: Carsten Dominik 

Fix test and math flags for spl abbreviation
---
 cdlatex.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cdlatex.el b/cdlatex.el
index 3dd33bcef0..bf1c4f2b99 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -1468,7 +1468,7 @@ zZ
 ("gat*"  "Insert a GATHER* environment template"
  "" cdlatex-environment ("gather*") t nil)
 ("spl"   "Insert SPLIT environment template"
- "" cdlatex-environment ("split") t nil)
+ "" cdlatex-environment ("split") nil t)
 ("fla"   "Insert a FLALIGN environment template"
  "" cdlatex-environment ("flalign") t nil)
 ("fla*"  "Insert a FLALIGN* environment template"

[nongnu] elpa/cdlatex ea52268926 47/49: * cdlatex.el: Fix typos and minor stylistic issues.

[ELPA Syncer]

branch: elpa/cdlatex
commit ea522689267a2e7d4de39a812d7253f81ce91349
Author: dr-scsi <59777257+dr-s...@users.noreply.github.com>
Commit: dr-scsi <59777257+dr-s...@users.noreply.github.com>

* cdlatex.el: Fix typos and minor stylistic issues.
---
 cdlatex.el | 50 +-
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/cdlatex.el b/cdlatex.el
index 5176a1a904..f02760bb19 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -8,12 +8,12 @@
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
-;; GNUTHis file is free software: you can redistribute it and/or modify
+;; This file 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 of the License, or
 ;; (at your option) any later version.
 
-;; cdlatex.el  is distributed in the hope that it will be useful,
+;; cdlatex.el 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.
@@ -34,8 +34,8 @@
 ;; To turn on CDLaTeX Minor Mode for all LaTeX files, add one of the
 ;; following lines to your .emacs file:
 ;;
-;;   (add-hook 'LaTeX-mode-hook 'turn-on-cdlatex)   ; with AUCTeX LaTeX mode
-;;   (add-hook 'latex-mode-hook 'turn-on-cdlatex)   ; with Emacs latex mode
+;;   (add-hook 'LaTeX-mode-hook #'turn-on-cdlatex)   ; with AUCTeX LaTeX mode
+;;   (add-hook 'latex-mode-hook #'turn-on-cdlatex)   ; with Emacs latex mode
 ;;
 ;; For key bindings, see further down in this documentation.
 ;;
@@ -73,7 +73,7 @@
 ;;template, text needs to be filled in at various places, which we
 ;;call "points of interest".  You can use the TAB key to jump to
 ;;the next point of interest in the template.  If there is an
-;;active region, the region will be wrappend into the environment,
+;;active region, the region will be wrapped into the environment,
 ;;ignoring the template content.
 ;;
 ;;For many frequently used LaTeX environments, abbreviations are
@@ -203,8 +203,8 @@
 ;;
 ;;If you press `_' or `^' twice, the template inserted will be
 ;;`_{\rm }' or `^{\rm }', respectively, to insert a roman
-;;sub/super-script.  Style guides require that all sub and
-;;superscipts that are descriptive (so not a mathematical or
+;;sub/super-script.  Style guides require that all sub- and
+;;superscripts that are descriptive (so not a mathematical or
 ;;physical quantity themselves) need to be roman.  So $x_i$ is i
 ;;is an index, but $x_{\rm max}$ to indicate the maximum value.  You
 ;;can disable this behavior through the variable
@@ -370,7 +370,7 @@
 (defcustom cdlatex-command-alist nil
   "List of abbrev-like commands, available with keyword and TAB.
 See `cdlatex-command-alist-default' for examples.  This list only
-defines additons to the defaults.  For a full list of active commands,
+defines additions to the defaults.  For a full list of active commands,
 press \\[cdlatex-command-help].
 Each element of this list is again a list with the following items:
 0. KEYWORD The key that has to be typed into the text.
@@ -422,7 +422,7 @@ in this variable will be added to the default definitions."
 (text  :tag "template" :format "TEMPLATE\n%v" "")
 
 (defcustom cdlatex-insert-auto-labels-in-env-templates t
-  "*Non-nil means the environment templates CDLaTeX will contain labels.
+  "Non-nil means the environment templates CDLaTeX will contain labels.
 This variable may be set to t, nil, or a string of label type letters
 indicating the label types for which it should be true."
   :group 'cdlatex-making-and-inserting-labels
@@ -486,9 +486,9 @@ this key.  When the string contains a question mark, this 
is where the
 cursor will be positioned after insertion of the string into the buffer.
 See `cdlatex-math-symbol-alist-default' for an example.  Any entry defined
 here will replace the corresponding entry of the default list.  The
-defaults implement 3 levels of symbols so far: Level 1 for greek letters
+defaults implement 3 levels of symbols so far: Level 1 for Greek letters
 and standard symbols, level 2 for variations of level 1, and level 3 for
-functions and opperators."
+functions and operators."
   :group 'cdlatex-math-support
   :type '(repeat
   (list
@@ -506,7 +506,7 @@ or a Lisp vector."
   (sexp :value [] :tag "a lisp vector")))
 
 (defcustom cdlatex-modify-backwards t
-  "*Non-nil means, `cdlatex-math-modify' modifies char before point.
+  "Non-nil means, `cdlatex-math-modify' modifies char before point.
 Nil means, always insert only an empty modification form.  This is also
 the case if the character before point is white or some punctuation."
   :group 'cdlatex-math-support
@@ -538,12 +538,12 @@ Each eleme

[nongnu] elpa/cdlatex 7791fa94d5 46/49: Bump version to 4.12

[ELPA Syncer]

branch: elpa/cdlatex
commit 7791fa94d509f56ed671055e856c5d00c788dd7e
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Bump version to 4.12
---
 cdlatex.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cdlatex.el b/cdlatex.el
index 5da1f4542f..5176a1a904 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -3,7 +3,7 @@
 ;;
 ;; Author: Carsten Dominik 
 ;; Keywords: tex
-;; Version: 4.11
+;; Version: 4.12
 ;; Package-Requires: ((auctex "9.9"))
 ;;
 ;; This file is not part of GNU Emacs.

[nongnu] elpa/cdlatex a15311a52d 45/49: * cdlatex.el (cdlatex-version): Remove variable

[ELPA Syncer]

branch: elpa/cdlatex
commit a15311a52d09fbd9905352160f0c7d43cbca5131
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

* cdlatex.el (cdlatex-version): Remove variable

This is an alternative to the patch proposed in #16.
---
 cdlatex.el | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cdlatex.el b/cdlatex.el
index 80acb29f8d..5da1f4542f 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -618,9 +618,6 @@ automatic help when idle for more than this amount of time."
   (require 'finder)
   (finder-commentary "cdlatex.el"))
 
-(defconst cdlatex-version "4.6"
-  "Version string for CDLaTeX.")
-
 (defvar cdlatex-mode nil
   "Determines if CDLaTeX minor mode is active.")
 (make-variable-buffer-local 'cdlatex-mode)

[nongnu] elpa/cdlatex aa298afc87 02/49: Initial commit

[ELPA Syncer]

branch: elpa/cdlatex
commit aa298afc87f848806e5ea99b6f59b23c158dfa90
Author: Carsten Dominik 
Commit: Carsten Dominik 

Initial commit
---
 cdlatex.el | 2166 
 1 file changed, 2166 insertions(+)

diff --git a/cdlatex.el b/cdlatex.el
new file mode 100644
index 00..c75b6aef9e
--- /dev/null
+++ b/cdlatex.el
@@ -0,0 +1,2166 @@
+;;; cdlatex.el -- Fast input methods for LaTeX environments and math
+;; Copyright (c) 1995, 1996, 1997, 2003, 2005 Carsten Dominik
+;;
+;; Author: Carsten Dominik 
+;; Keywords: tex
+;; Version: 4.3
+;;
+;; This file is not part of GNU Emacs
+;;
+;; 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 the Free
+;; Software Foundation; either version 2 of the License, or (at your option)
+;; any later version.
+;;
+;; This program 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 GNU Emacs.  If you did not, write to the Free Software Foundation,
+;; Inc., 675 Mass Ave., Cambridge, MA 02139, USA.
+;;
+;
+;;
+;;; Commentary:
+;;
+;; CDLaTeX is a minor mode supporting fast insertion of environment
+;; templates and math stuff in LaTeX.
+;;
+;; INSTALLATION
+;;
+;; In order to make the command `cdlatex-mode' work, you need to put the
+;; file cdlatex.el on your load path (you should compile it) and put
+;; this in you .emacs file:
+;;
+;; (autoload 'cdlatex-mode "cdlatex" "CDLaTeX Mode" t)
+;; (autoload 'turn-on-cdlatex "cdlatex" "CDLaTeX Mode" nil)
+;;
+;; To turn CDLaTeX Minor Mode on and off in a particular buffer, use
+;; `M-x cdlatex-mode'.
+;;
+;; To turn on CDLaTeX Minor Mode for all LaTeX files, add one of the
+;; following lines to your .emacs file:
+;;
+;;   (add-hook 'LaTeX-mode-hook 'turn-on-cdlatex)   ; with AUCTeX LaTeX mode
+;;   (add-hook 'latex-mode-hook 'turn-on-cdlatex)   ; with Emacs latex mode
+;;
+;; For key bindings, see further down in this documentation.
+;;
+;; CDLaTeX requires texmathp.el which is distributed with AUCTeX.
+;; Starting with Emacs 21.3, texmathp.el will be part of Emacs.
+;;
+;;--
+;;
+;; OVERVIEW
+;; 
+;; 
+;; CDLaTeX is a minor mode supporting mainly mathematical and scientific
+;; text development with LaTeX.  CDLaTeX is really about speed.  AUCTeX
+;; (the major mode I recommend for editing LaTeX files) does have a hook
+;; based system for inserting environments and macros - but while this is
+;; useful and general, it is sometimes slow to use.  CDLaTeX tries to be
+;; quick, with very few and easy to remember keys, and intelligent
+;; on-the-fly help.
+;; 
+;; 1. ABBREVIATIONS.  
+;;-
+;;CDLaTeX has an abbrev-like mechanism to insert full LaTeX
+;;environments and other templates into the buffer.  Abbreviation
+;;expansion is triggered with the TAB key only, not with SPC or RET.
+;;For example, typing "ite" inserts an itemize environment.  A
+;;full list of defined abbreviations is available with the command
+;;`C-c ?' (`cdlatex-command-help').
+;; 
+;;1a. ENVIRONMENT TEMPLATES
+;;-
+;;Typing `C-c {' (`cdlatex-environment') uses the minibuffer to
+;;complete the name of a LaTeX environment and inserts a template
+;;for this environment into the buffer.  These environment
+;;templates also contain labels created with RefTeX.  In a
+;;template, text needs to be filled in at various places, which we
+;;call "points of interest".  You can use the TAB key to jump to
+;;the next point of interest in the template.
+;; 
+;;For many frequently used LaTeX environments, abbreviations are
+;;available.  Most of the time, the abbreviation consists of the
+;;first three letters of the environment name: `equ' expands
+;;into
+;;\begin{equation}
+;;\label{eq:1}
+;; 
+;;\end{equation}
+;; 
+;;Similarly, `ali' inserts an AMS-LaTeX align environment
+;;template etc.  For a full list of environment abbreviations, use
+;;`C-c ?'.
+;;
+;;Use the command `C-c -' (`cdlatex-item') to insert a generalized
+;;new "item" in any "list"-like environment.  For example, in an
+;;itemize environment, this inserts "\item", in an enumerate
+;;environment it inserts "\item\label{item:25}" and in an eqnarray
+;;environment, it inserts "\label{eq:25} \n & &".  When
+;;appropriate, newlines are inserted, and the previous item is also
+;; 

[nongnu] branch elpa/cdlatex created (now 4c392765e1)

[ELPA Syncer]

elpasync pushed a change to branch elpa/cdlatex.

at  4c392765e1 Merge branch 'minorfixes' of github.com:dr-scsi/cdlatex 
into minorfixes

This branch includes the following new commits:

   new  6fe5992805 Initial commit
   new  aa298afc87 Initial commit
   new  a43e1f9e90 Overwrite using version 4.6
   new  a0e0ad9efa Change version number to 4.7
   new  a9f3833566 Update README file
   new  1d491c2ddd Fix copyright notice
   new  7ce2c74171 Add texmathp.el
   new  575f7bfcf9 Added dash to conform to header rules
   new  b7183c2200 texmathp.el removed
   new  31b0d9372b update README and make sure cdlatex is new.
   new  4633ecf52d modified README.
   new  ff534912b9 Merge pull request #6 from songpeng/master
   new  90d785a94c New option `cdlatex-sub-super-scripts-outside-math-mode'.
   new  f36e5351f6 Fixed regex in cdlatex-tab to support \(...\)
   new  fea53d325b Merge pull request #10 from benide/master
   new  b7af5a9884 Make `C-u C-c ?' call TeX-documentation-texdoc
   new  880723a514 New variable `cdlatex-use-dollar-to-ensure-math'.
   new  437c06ebf8 Simplify the insertion of roman supscripts and 
superscripts.
   new  a5cb624ef5 Fix some typografic issues in README file
   new  ef1145697d Update README
   new  2af5ee74d1 Add the AMSMATH split environment
   new  76e6d8e068 Add .gitignore
   new  017735c611 Use spl as abbreviation for split
   new  573d0918d0 Make C-c { wrap the region if there is an active region
   new  c456ce8d45 Bump version number
   new  480387b39f Fix bug in Makefile
   new  acc1282b73 Use cl-lib instead of cl
   new  4e939a8386 reversing previous change for now
   new  adf96bab0b Switch to use `cl-lib', now correctly
   new  3adedafd20 Add vars keeping cdlatex from taking over parens insert
   new  720f9145d8 Fix bug when "*CDLaTeX Help*" buffer was read-only
   new  614a8d94f6 Test commit
   new  f215b70c5c Fix test and math flags for spl abbreviation
   new  6ae740fccd Fixed a couple typos
   new  8e963c6853 Merge pull request #31 from aluaces/patch-1
   new  4d21552480 Fix whitespace issues
   new  0eb638546c Fix checkdoc issues
   new  55299f20e8 Require auctex for texmathp
   new  64eb3570b5 Use define-minor-mode to define cdlatex-mode
   new  f3eb992be1 Explicitly require reftex
   new  07d45fb38e Update .gitignore to ignore .elc and package files
   new  d7bec27d31 Add .dir-locals.el to prevent whitespace issues
   new  f03bcd7a89 Fix typos
   new  75c4e9c4e5 Added `text` macro in math mode
   new  a15311a52d * cdlatex.el (cdlatex-version): Remove variable
   new  7791fa94d5 Bump version to 4.12
   new  ea52268926 * cdlatex.el: Fix typos and minor stylistic issues.
   new  355614380c * cdlatex.el: Fix typos and minor stylistic issues.
   new  4c392765e1 Merge branch 'minorfixes' of github.com:dr-scsi/cdlatex 
into minorfixes

[nongnu] elpa/cdlatex 90d785a94c 13/49: New option `cdlatex-sub-super-scripts-outside-math-mode'.

[ELPA Syncer]

branch: elpa/cdlatex
commit 90d785a94c0db7aa0043ea62f5807af3df155438
Author: Carsten Dominik 
Commit: GitHub 

New option `cdlatex-sub-super-scripts-outside-math-mode'.

Thanks to Benedikt Tissot for suggesting it.
---
 cdlatex.el | 48 +---
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/cdlatex.el b/cdlatex.el
index 9c3a2d7d37..e2e6be1f8c 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -1,9 +1,9 @@
 ;;; cdlatex.el --- Fast input methods for LaTeX environments and math
-;; Copyright (c) 2010, 2011, 2012, 2014 Free Software Foundation, Inc.
+;; Copyright (c) 2010, 2011, 2012, 2014, 2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik 
 ;; Keywords: tex
-;; Version: 4.7
+;; Version: 4.8
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
@@ -551,6 +551,13 @@ letter, the parenthesis will be removed."
   :group 'cdlatex-miscellaneous-configurations
   :type '(boolean))
 
+(defcustom cdlatex-sub-super-scripts-outside-math-mode t
+  "*Non-nil means, inserting ^ or _ will add dollars outside math environment.
+So in text mode surrounding dollars and braces will be added with `_' and `^'.
+When nil, `_' and `^' will just self-insert."
+  :group 'cdlatex-miscellaneous-configurations
+  :type '(boolean))
+
 (defcustom cdlatex-auto-help-delay 1.5
   "Number of idle seconds before display of auto-help.
 When executing cdlatex-math-symbol or cdlatex-math-modify, display
@@ -772,23 +779,26 @@ When not in LaTeX math environment, _{} and ^{} will have 
dollars."
   (if (cdlatex-number-of-backslashes-is-odd)
   ;; Quoted
   (insert (event-basic-type last-command-event))
-;; Check if we need to switch to math mode
-(if (not (texmathp)) (cdlatex-dollar))
-(if (string= (buffer-substring (max (point-min) (- (point) 2)) (point))
- (concat (char-to-string (event-basic-type last-command-event))
-"{"))
-;; We are at the start of a sub/suberscript.  Allow a__{b} and a^^{b}
-;; This is an undocumented feature, please keep it in.  It supports
-;; a special notation which can be used for upright sub- and 
-;; superscripts. 
-(progn
-  (backward-char 1)
-  (insert (event-basic-type last-command-event))
-  (forward-char 1))
-  ;; Insert the normal template.
-  (insert (event-basic-type last-command-event))
-  (insert "{}")
-  (forward-char -1
+;; Check if we are in math mode, if not switch to or only add _ or ^
+(if (and (not (texmathp))
+(not cdlatex-sub-super-scripts-outside-math-mode))
+   (insert (event-basic-type last-command-event))
+  (if (not (texmathp)) (cdlatex-dollar))
+  (if (string= (buffer-substring (max (point-min) (- (point) 2)) (point))
+   (concat (char-to-string (event-basic-type 
last-command-event))
+  "{"))
+  ;; We are at the start of a sub/suberscript.  Allow a__{b} and a^^{b}
+  ;; This is an undocumented feature, please keep it in.  It supports
+  ;; a special notation which can be used for upright sub- and
+  ;; superscripts.
+  (progn
+(backward-char 1)
+(insert (event-basic-type last-command-event))
+(forward-char 1))
+;; Insert the normal template.
+(insert (event-basic-type last-command-event))
+(insert "{}")
+(forward-char -1)
 
 (defun cdlatex-lr-pair ()
   "Insert a \\left-\\right pair of parens."

[nongnu] elpa/cdlatex ff534912b9 12/49: Merge pull request #6 from songpeng/master

[ELPA Syncer]

branch: elpa/cdlatex
commit ff534912b93fc2c7a6b191b1c8d6d699a46bbb01
Merge: b7183c2200 4633ecf52d
Author: Carsten Dominik 
Commit: GitHub 

Merge pull request #6 from songpeng/master

Add README and make sure the cdlatex is latest.
---
 README.md | 274 --
 1 file changed, 269 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index bb75477625..4a7d8d818f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,271 @@
-cdlatex
-===
+# CDLaTex
+Copyright (c) 2010, 2011, 2012, 2014 Free Software Foundation, Inc.  
+**AUTHOR:** Carsten Dominik   
+**KEYWORD** tex  
+**VERSION:** 4.7
 
-Fast input methods for LaTeX environments and math
+## Note
+This is a mirror from Carsten Dominik, which is maintained by Songpeng Zu.
+Currently it is the **latest** version.
 
-This is now the main home for cdlatex.el, the version at
-staff.astro.uva.nl/~dominik will be removed soon.
+## Introduction
+CDLaTeX is a minor mode for Emacs supporting fast insertion of environment
+templates and math stuff in LaTeX. Similar commands are also offered as part of
+the AUCTeX package, but it is not the same - CDLaTeX focuses on speediness for
+inserting LaTeX constructs. I myself am using CDLaTeX on top of AUCTeX.
+
+Here are some of the differences between CDLaTeX and the corresponding parts 
of AUCTeX:
+
+1. Environment insertion is template based, and not hook based. 
+2. Keyword commands (which are executed by typing a short (2-4 letters) 
keyword into
+the buffer, followed by TAB) give very rapid access to the main environment
+templates and mathematical constructs. 
+3. CDLaTeX knows the difference between
+text mode and math mode in LaTeX and adapts automatically to that.
+
+## Download & Installation
+You can directly install this package under *melpa* in Emacs. Or you can
+download this file, add it to your load-path. 
+
+## Manual
+There is no manual for CDLaTeX, but here is the quick look for the commentary
+section of the Emacs Lisp file, it contains a decent description.
+
+### Turn on CDLaTeX
+
+
+To turn CDLaTeX Minor Mode on and off in a particular buffer, use
+`M-x cdlatex-mode'.  
+To turn on CDLaTeX Minor Mode for all LaTeX files, add one of the
+following lines to your .emacs file:
+```lisp
+   (add-hook 'LaTeX-mode-hook 'turn-on-cdlatex)   ; with AUCTeX LaTeX mode
+   (add-hook 'latex-mode-hook 'turn-on-cdlatex)   ; with Emacs latex mode
+```
+For key bindings, see further down in this documentation.  
+CDLaTeX requires texmathp.el which is distributed with AUCTeX.
+Starting with Emacs 21.3, texmathp.el will be part of Emacs.
+
+### ABBREVIATIONS 
+CDLaTeX has an abbrev-like mechanism to insert full LaTeX environments and 
other
+templates into the buffer. Abbreviation expansion is triggered with the TAB
+key only, not with SPC or RET. For example, typing "ite" inserts an
+itemize environment. A full list of defined abbreviations is available with
+the command `C-c ?` (cdlatex-command-help).
+ 
+ ENVIRONMENT 
+Typing `C-c {`, which means
+**cdlatex-environment**, and uses the minibuffer to
+complete the name of a LaTeX environment and inserts a template
+for this environment into the buffer.  These environment
+templates also contain labels created with RefTeX.  In a
+template, text needs to be filled in at various places, which we
+call "points of interest".  You can use the TAB key to jump to
+the next point of interest in the template.
+
+For many frequently used LaTeX environments, abbreviations are
+available.  Most of the time, the abbreviation consists of the
+first three letters of the environment name: `equ` expands
+into
+```latex
+\begin{equation}
+\label{eq:1}
+
+\end{equation}
+```  
+Similarly, `ali` inserts an AMS-LaTeX align environment
+template etc.  For a full list of environment abbreviations, use
+`C-c ?`.
+
+Use the command `C-c -` , which means **cdlatex-item** to insert a generalized
+new "item" in any "list"-like environment.  For example, in an
+itemize environment, this inserts "\item", in an enumerate
+environment it inserts `\item\label{item:25}` and in an eqnarray
+environment, it inserts `\label{eq:25} \n & &`.  When
+appropriate, newlines are inserted, and the previous item is also
+closed with "\\".  **cdlatex-item** can also be invoked with the 
+abbreviation `it`.
+ 
+ MATH TEMPLATES
+Abbreviations are also used to insert simple math templates
+into the buffer.  The cursor will be positioned properly.  For
+example, typing `fr` will insert `\frac{}{}` with the
+cursor in the first pair of parenthesis.  Typing `lr(`
+will insert a **`\left( \right)`** pair and position the cursor in
+between, etc.  Again, the TAB key can be used to jump to the
+points in the template where additional text has to be
+inserted.  For example in the `\frac{}{}` template, it will
+move you from the first argument to the second and then out of
+the second.  For a list of available templates, type `

[nongnu] elpa/cdlatex a5cb624ef5 19/49: Fix some typografic issues in README file

[ELPA Syncer]

branch: elpa/cdlatex
commit a5cb624ef5f9e3d51fce6faa8dc153277f61043a
Author: Carsten Dominik 
Commit: Carsten Dominik 

Fix some typografic issues in README file
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 635d98c3bf..692a5065b0 100644
--- a/README.md
+++ b/README.md
@@ -164,7 +164,7 @@ and the cursor positioned between them.  You can configure 
which
 delimiter are inserted pairwise by configuring the variable
 `cdlatex-paired-parens'.
 
-Also, the keys `_' and `^' will insert "_{}" and "^{}",
+Also, the keys `_` and `^` will insert "_{}" and "^{}",
 respectively, and, if necessary, also a pair of dollar signs to
 switch to math mode.  You can use TAB to exit paired parenthesis.
 As a special case, when you use TAB to exit a pair of braces that
@@ -173,11 +173,11 @@ the sub/superscript consists of a single character.  For 
example
 typing "$10^3" inserts "$10^3$", but typing "$10^34"
 inserts "$10^{34}$".
 
-If you press `_' or `^' twice, the template inserted will be "_{\rm }"
+If you press `_` or `^` twice, the template inserted will be "_{\rm }"
 or "^{\rm }", respectively, to insert a roman sub/super-script.  Style
 guides require that all sub and superscipts that are descriptive (so
 not a mathematical or physical quantity themselves) need to be roman.
-So $x_i$ is i is an index, but $x_{\rm max}$ to indicate the maximum
+So $x_i$ if i is an index, but $x_{\rm max}$ to indicate the maximum
 value.
 
  

[nongnu] elpa/cdlatex ef1145697d 20/49: Update README

[ELPA Syncer]

branch: elpa/cdlatex
commit ef1145697d100fe2d4ecf1e8b191a51b4238f80a
Author: Carsten Dominik 
Commit: Carsten Dominik 

Update README
---
 README.md  | 4 ++--
 cdlatex.el | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 692a5065b0..84cc5193e1 100644
--- a/README.md
+++ b/README.md
@@ -173,8 +173,8 @@ the sub/superscript consists of a single character.  For 
example
 typing "$10^3" inserts "$10^3$", but typing "$10^34"
 inserts "$10^{34}$".
 
-If you press `_` or `^` twice, the template inserted will be "_{\rm }"
-or "^{\rm }", respectively, to insert a roman sub/super-script.  Style
+If you press `_` or `^` twice, the template inserted will be `_{\rm }`
+or `^{\rm }`, respectively, to insert a roman sub/super-script.  Style
 guides require that all sub and superscipts that are descriptive (so
 not a mathematical or physical quantity themselves) need to be roman.
 So $x_i$ if i is an index, but $x_{\rm max}$ to indicate the maximum
diff --git a/cdlatex.el b/cdlatex.el
index 47a3bfcf54..c97ff9dd9c 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -199,7 +199,7 @@
 ;;inserts "$10^{34}$".
 ;;
 ;;If you press `_' or `^' twice, the template inserted will be
-;;"_{\rm }" or "^{\rm }", respectively, to insert a roman
+;;`_{\rm }' or `^{\rm }', respectively, to insert a roman
 ;;sub/super-script.  Style guides require that all sub and
 ;;superscipts that are descriptive (so not a mathematical or
 ;;physical quantity themselves) need to be roman.  So $x_i$ is i

[nongnu] elpa/cdlatex 573d0918d0 24/49: Make C-c { wrap the region if there is an active region

[ELPA Syncer]

branch: elpa/cdlatex
commit 573d0918d0b50e3488d4f12da9bd32d7977bbec3
Author: Carsten Dominik 
Commit: Carsten Dominik 

Make C-c { wrap the region if there is an active region
---
 Makefile   |   4 +
 README | 278 
 README.md  | 279 -
 cdlatex.el | 113 +++--
 4 files changed, 349 insertions(+), 325 deletions(-)

diff --git a/Makefile b/Makefile
new file mode 100644
index 00..df222d3857
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+
+
+README.pod: cdlatex.el
+   perl -ne 'if (/^;;; Commentary/../^;/) {s/^;;;? ?//;print}' 
cdlatex.el > README
diff --git a/README b/README
new file mode 100644
index 00..d08e6a8ffc
--- /dev/null
+++ b/README
@@ -0,0 +1,278 @@
+Commentary:
+
+CDLaTeX is a minor mode supporting fast insertion of environment
+templates and math stuff in LaTeX.
+
+To turn CDLaTeX Minor Mode on and off in a particular buffer, use
+`M-x cdlatex-mode'.
+
+To turn on CDLaTeX Minor Mode for all LaTeX files, add one of the
+following lines to your .emacs file:
+
+  (add-hook 'LaTeX-mode-hook 'turn-on-cdlatex)   ; with AUCTeX LaTeX mode
+  (add-hook 'latex-mode-hook 'turn-on-cdlatex)   ; with Emacs latex mode
+
+For key bindings, see further down in this documentation.
+
+CDLaTeX requires texmathp.el which is distributed with AUCTeX.
+Starting with Emacs 21.3, texmathp.el will be part of Emacs.
+
+--
+
+OVERVIEW
+
+
+CDLaTeX is a minor mode supporting mainly mathematical and scientific
+text development with LaTeX.  CDLaTeX is really about speed.  AUCTeX
+(the major mode I recommend for editing LaTeX files) does have a hook
+based system for inserting environments and macros - but while this is
+useful and general, it is sometimes slow to use.  CDLaTeX tries to be
+quick, with very few and easy to remember keys, and intelligent
+on-the-fly help.
+
+1. ABBREVIATIONS.  
+   -
+   CDLaTeX has an abbrev-like mechanism to insert full LaTeX
+   environments and other templates into the buffer.  Abbreviation
+   expansion is triggered with the TAB key only, not with SPC or RET.
+   For example, typing "ite" inserts an itemize environment.  A
+   full list of defined abbreviations is available with the command
+   `C-c ?' (`cdlatex-command-help').
+
+   1a. ENVIRONMENT TEMPLATES
+   -
+   Typing `C-c {' (`cdlatex-environment') uses the minibuffer to
+   complete the name of a LaTeX environment and inserts a template
+   for this environment into the buffer.  These environment
+   templates also contain labels created with RefTeX.  In a
+   template, text needs to be filled in at various places, which we
+   call "points of interest".  You can use the TAB key to jump to
+   the next point of interest in the template.  If there is an
+   active region, the region will be wrappend into the environment,
+   ignoring the template content.
+
+   For many frequently used LaTeX environments, abbreviations are
+   available.  Most of the time, the abbreviation consists of the
+   first three letters of the environment name: `equ' expands
+   into
+   \begin{equation}
+   \label{eq:1}
+
+   \end{equation}
+
+   Similarly, `ali' inserts an AMS-LaTeX align environment
+   template etc.  For a full list of environment abbreviations, use
+   `C-c ?'.
+
+   Use the command `C-c -' (`cdlatex-item') to insert a generalized
+   new "item" in any "list"-like environment.  For example, in an
+   itemize environment, this inserts "\item", in an enumerate
+   environment it inserts "\item\label{item:25}" and in an eqnarray
+   environment, it inserts "\label{eq:25} \n & &".  When
+   appropriate, newlines are inserted, and the previous item is also
+   closed with "\\".  `cdlatex-item' can also be invoked with the 
+   abbreviation "it".
+
+   1b. MATH TEMPLATES
+   --
+   Abbreviations are also used to insert simple math templates
+   into the buffer.  The cursor will be positioned properly.  For
+   example, typing `fr' will insert "\frac{}{}" with the
+   cursor in the first pair of parenthesis.  Typing `lr('
+   will insert a "\left( \right)" pair and position the cursor in
+   between, etc.  Again, the TAB key can be used to jump to the
+   points in the template where additional text has to be
+   inserted.  For example in the `\frac{}{}' template, it will
+   move you from the first argument to the second and then out of
+   the second.  For a list of available templates, type `C-c ?'.
+
+2. MATHEMATICAL SYMBOLS
+   
+   This feature is similar to the functionality in the Math minor mode
+   of AUCTeX, and to the input methods of the X-Symbol packag

[nongnu] elpa/cdlatex 76e6d8e068 22/49: Add .gitignore

[ELPA Syncer]

branch: elpa/cdlatex
commit 76e6d8e0680ab0ab147151cce2b3f342b1451ad5
Author: Carsten Dominik 
Commit: Carsten Dominik 

Add .gitignore
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00..89a1cb7526
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*~
+test/*
\ No newline at end of file

[nongnu] elpa/cdlatex 8e963c6853 35/49: Merge pull request #31 from aluaces/patch-1

[ELPA Syncer]

branch: elpa/cdlatex
commit 8e963c68531f75e459e8ebe7a34fd3ba9d3729a0
Merge: f215b70c5c 6ae740fccd
Author: Carsten Dominik 
Commit: GitHub 

Merge pull request #31 from aluaces/patch-1

Fixed a couple typos
---
 README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 6ae51b6b68..b8239be4ac 100644
--- a/README
+++ b/README
@@ -101,9 +101,9 @@ on-the-fly help.
backquote character several times before pressing the letter.  For
example, typing "`d" inserts "\delta" (level 1), and typing "``d"
inserts "\partial" (level 2).  Similarly, "`e" inserts "\epsilon"
-   and "``e" inserts "\vareppsilon".
+   and "``e" inserts "\varepsilon".
 
-   On each level, on-thy-fly help will pop up automatically if you
+   On each level, on-the-fly help will pop up automatically if you
hesitate to press the next key.  The help screen is a window which
lists all math macros available on the current level.  Initially,
when you type slowly, this window will pop up each time you press

[nongnu] elpa/cdlatex 55299f20e8 38/49: Require auctex for texmathp

[ELPA Syncer]

branch: elpa/cdlatex
commit 55299f20e84bd9dd01d23eb8aa5ed6841410cd9b
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Require auctex for texmathp

If not installed, byte-compilation fails, confusing the user with a
non-obvious error message.
---
 cdlatex.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cdlatex.el b/cdlatex.el
index 2bea2391ac..f76c03c393 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -4,6 +4,7 @@
 ;; Author: Carsten Dominik 
 ;; Keywords: tex
 ;; Version: 4.11
+;; Package-Requires: ((auctex "9.9"))
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
@@ -318,6 +319,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl-lib))
+(require 'texmathp)
 
 ;;; Begin of Configuration Section ;;
 
@@ -604,8 +606,6 @@ automatic help when idle for more than this amount of time."
   :group 'cdlatex-miscellaneous-configurations
   :type 'number)
 
-(require 'texmathp)
-
 ;;;
 ;;;
 ;;; Define the formal stuff for a minor mode named CDLaTeX.

[nongnu] elpa/cdlatex 720f9145d8 31/49: Fix bug when "*CDLaTeX Help*" buffer was read-only

[ELPA Syncer]

branch: elpa/cdlatex
commit 720f9145d88b3e54b5388742c8a1a2b963d74581
Author: Carsten Dominik 
Commit: Carsten Dominik 

Fix bug when "*CDLaTeX Help*" buffer was read-only

Github issue #24, closed
---
 cdlatex.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cdlatex.el b/cdlatex.el
index 4ae1c13267..3dd33bcef0 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -848,6 +848,7 @@ When pressed twice, make the sub/superscript roman."
 (if (and (stringp cdlatex-paired-parens)
  (string-match (regexp-quote paren) cdlatex-paired-parens)
  (string= close (char-to-string (following-char
+; parens are inserted paired, and there is already a closing 
parenthesis
 (delete-char 1))
 (insert "\\left" paren1 " ? \\right" close1)
 (cdlatex-position-cursor)))
@@ -1372,6 +1373,7 @@ zZ
 (if (get-buffer-window " *CDLaTeX Help*")
 (select-window (get-buffer-window " *CDLaTeX Help*"))
   (switch-to-buffer-other-window " *CDLaTeX Help*"))
+(if buffer-read-only (read-only-mode 'toggle))
 (erase-buffer)
 (make-local-variable 'truncate-lines)
 (setq truncate-lines t)

[nongnu] elpa/cdlatex d7bec27d31 42/49: Add .dir-locals.el to prevent whitespace issues

[ELPA Syncer]

branch: elpa/cdlatex
commit d7bec27d31186b575474292cf79d4856769753f0
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Add .dir-locals.el to prevent whitespace issues
---
 .dir-locals.el | 5 +
 1 file changed, 5 insertions(+)

diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 00..0d12a2f44a
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,5 @@
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+((emacs-lisp-mode . ((indent-tabs-mode . nil)
+(show-trailing-whitespace . t

[nongnu] elpa/cdlatex 75c4e9c4e5 44/49: Added `text` macro in math mode

[ELPA Syncer]

branch: elpa/cdlatex
commit 75c4e9c4e57768ac4a5889fbf2e96c35ded54082
Author: danielfleischer 
Commit: Philip Kaludercic 

Added `text` macro in math mode

Using the shortcut `'t` one can insert text inside equations.
The `text` macro is the preferable way of inserting text, better than 
`mbox` or `mathrm`, see 
[discussion](https://tex.stackexchange.com/questions/88730/mathrm-or-mbox-what-is-the-convention-when-writing-a-equation).
---
 cdlatex.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cdlatex.el b/cdlatex.el
index 7462040a4a..80acb29f8d 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -1547,6 +1547,7 @@ zZ
 ( ?v"\\check" nilt   t   nil )
 ( ?u"\\breve" nilt   t   nil )
 ( ?m"\\mbox"  nilt   nil nil )
+( ?t"\\text"  nilt   nil nil )
 ( ?c"\\mathcal"   nilt   nil nil )
 ( ?r"\\mathrm""\\textrm" t   nil nil )
 ( ?i"\\mathit""\\textit" t   nil nil )

[nongnu] elpa/cdlatex 355614380c 48/49: * cdlatex.el: Fix typos and minor stylistic issues.

[ELPA Syncer]

branch: elpa/cdlatex
commit 355614380cf37779aafebaaad6dc26e501ad884f
Author: dr-scsi <59777257+dr-s...@users.noreply.github.com>
Commit: dr-scsi <59777257+dr-s...@users.noreply.github.com>

* cdlatex.el: Fix typos and minor stylistic issues.
---
 cdlatex.el | 50 +-
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/cdlatex.el b/cdlatex.el
index 5176a1a904..076e73ec44 100644
--- a/cdlatex.el
+++ b/cdlatex.el
@@ -8,12 +8,12 @@
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
-;; GNUTHis file is free software: you can redistribute it and/or modify
+;; This file 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 of the License, or
 ;; (at your option) any later version.
 
-;; cdlatex.el  is distributed in the hope that it will be useful,
+;; cdlatex.el 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.
@@ -34,8 +34,8 @@
 ;; To turn on CDLaTeX Minor Mode for all LaTeX files, add one of the
 ;; following lines to your .emacs file:
 ;;
-;;   (add-hook 'LaTeX-mode-hook 'turn-on-cdlatex)   ; with AUCTeX LaTeX mode
-;;   (add-hook 'latex-mode-hook 'turn-on-cdlatex)   ; with Emacs latex mode
+;;   (add-hook 'LaTeX-mode-hook #'turn-on-cdlatex)   ; with AUCTeX LaTeX mode
+;;   (add-hook 'latex-mode-hook #'turn-on-cdlatex)   ; with Emacs latex mode
 ;;
 ;; For key bindings, see further down in this documentation.
 ;;
@@ -73,7 +73,7 @@
 ;;template, text needs to be filled in at various places, which we
 ;;call "points of interest".  You can use the TAB key to jump to
 ;;the next point of interest in the template.  If there is an
-;;active region, the region will be wrappend into the environment,
+;;active region, the region will be wrapped into the environment,
 ;;ignoring the template content.
 ;;
 ;;For many frequently used LaTeX environments, abbreviations are
@@ -203,8 +203,8 @@
 ;;
 ;;If you press `_' or `^' twice, the template inserted will be
 ;;`_{\rm }' or `^{\rm }', respectively, to insert a roman
-;;sub/super-script.  Style guides require that all sub and
-;;superscipts that are descriptive (so not a mathematical or
+;;sub/super-script.  Style guides require that all sub- and
+;;superscripts that are descriptive (so not a mathematical or
 ;;physical quantity themselves) need to be roman.  So $x_i$ is i
 ;;is an index, but $x_{\rm max}$ to indicate the maximum value.  You
 ;;can disable this behavior through the variable
@@ -370,7 +370,7 @@
 (defcustom cdlatex-command-alist nil
   "List of abbrev-like commands, available with keyword and TAB.
 See `cdlatex-command-alist-default' for examples.  This list only
-defines additons to the defaults.  For a full list of active commands,
+defines additions to the defaults.  For a full list of active commands,
 press \\[cdlatex-command-help].
 Each element of this list is again a list with the following items:
 0. KEYWORD The key that has to be typed into the text.
@@ -422,7 +422,7 @@ in this variable will be added to the default definitions."
 (text  :tag "template" :format "TEMPLATE\n%v" "")
 
 (defcustom cdlatex-insert-auto-labels-in-env-templates t
-  "*Non-nil means the environment templates CDLaTeX will contain labels.
+  "Non-nil means the environment templates CDLaTeX will contain labels.
 This variable may be set to t, nil, or a string of label type letters
 indicating the label types for which it should be true."
   :group 'cdlatex-making-and-inserting-labels
@@ -486,9 +486,9 @@ this key.  When the string contains a question mark, this 
is where the
 cursor will be positioned after insertion of the string into the buffer.
 See `cdlatex-math-symbol-alist-default' for an example.  Any entry defined
 here will replace the corresponding entry of the default list.  The
-defaults implement 3 levels of symbols so far: Level 1 for greek letters
+defaults implement 3 levels of symbols so far: Level 1 for Greek letters
 and standard symbols, level 2 for variations of level 1, and level 3 for
-functions and opperators."
+functions and operators."
   :group 'cdlatex-math-support
   :type '(repeat
   (list
@@ -506,7 +506,7 @@ or a Lisp vector."
   (sexp :value [] :tag "a lisp vector")))
 
 (defcustom cdlatex-modify-backwards t
-  "*Non-nil means, `cdlatex-math-modify' modifies char before point.
+  "Non-nil means, `cdlatex-math-modify' modifies char before point.
 Nil means, always insert only an empty modification form.  This is also
 the case if the character before point is white or some punctuation."
   :group 'cdlatex-math-support
@@ -538,12 +538,12 @@ Each eleme

[elpa] externals/denote a40658ed13: Refine face attribute of denote-link-backlink-button

[ELPA Syncer]

branch: externals/denote
commit a40658ed136e1c3529608c8b722b60a8521559a5
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Refine face attribute of denote-link-backlink-button

Thanks to Jean-Philippe Gagné Guay for the feedback:
.
---
 denote-link.el | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/denote-link.el b/denote-link.el
index 82df7a2034..6f7264e567 100644
--- a/denote-link.el
+++ b/denote-link.el
@@ -367,13 +367,10 @@ positions, limit the process to the region in-between."
 
  Backlinks' buffer
 
-(defface denote-link--backlink-button nil
-  "Face for backlink buttons.")
-
 (define-button-type 'denote-link-backlink-button
   'follow-link t
   'action #'denote-link--backlink-find-file
-  'face 'denote-link--backlink-button) ; we use this face attribute to 
style it later
+  'face nil); we use this face though we style it later
 
 (defun denote-link--backlink-find-file (button)
   "Action for BUTTON to `find-file'."

[nongnu] elpa/evil-numbers 61dde4e371 2/2: Bump to 0.7

[ELPA Syncer]

branch: elpa/evil-numbers
commit 61dde4e3715fd1255df8f87a37d9c8022e909bf4
Author: Campbell Barton 
Commit: Campbell Barton 

Bump to 0.7

This contains a few fixes and improvements which are now every well
tested and justify being in a release.
---
 CHANGELOG.org   | 2 +-
 evil-numbers.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index c9a1c6400b..4388e49466 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -1,6 +1,6 @@
 #+TITLE: Evil Numbers CHANGELOG
 
-* in development
+* 0.7
 
 ** Additions
+ =evil-numbers-use-cursor-at-end-of-number= option to match numbers 
directly before the cursor
diff --git a/evil-numbers.el b/evil-numbers.el
index dcbea620c8..c26a1f983c 100644
--- a/evil-numbers.el
+++ b/evil-numbers.el
@@ -10,7 +10,7 @@
 ;; URL: http://github.com/juliapath/evil-numbers
 ;; Git-Repository: git://github.com/juliapath/evil-numbers.git
 ;; Created: 2011-09-02
-;; Version: 0.6
+;; Version: 0.7
 ;; Package-Requires: ((emacs "24.1") (evil "1.2.0"))
 ;; Keywords: convenience tools
 

[nongnu] elpa/evil-numbers 061f523397 1/2: Cleanup: quiet un-escaped quote warning

[ELPA Syncer]

branch: elpa/evil-numbers
commit 061f523397ac9e3ec7564692fa01ebd4cc849ba1
Author: Campbell Barton 
Commit: Campbell Barton 

Cleanup: quiet un-escaped quote warning
---
 evil-numbers.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/evil-numbers.el b/evil-numbers.el
index 4f558f3d0d..dcbea620c8 100644
--- a/evil-numbers.el
+++ b/evil-numbers.el
@@ -587,9 +587,9 @@ INCREMENTAL causes the first number to be increased by 
1*AMOUNT,
 the second by 2*AMOUNT and so on.
 
 PADDED is whether numbers should be padded (e.g. 10 -> 09).
--  nil: is default behavior set by `evil-numbers-pad-default',
--t: is the opposite of `evil-numbers-pad-default',
-- '(t): enables padding and '(nil) disables padding.
+-nil: is default behavior set by `evil-numbers-pad-default',
+-  t: is the opposite of `evil-numbers-pad-default',
+- `'(t)': enables padding and `'(nil)' disables padding.
 
 Numbers with a leading zero are always padded.
 Signs are preserved when padding is enabled, for example: increasing a

[nongnu] elpa/evil-numbers updated (a6c886dd5b -> 61dde4e371)

[ELPA Syncer]

elpasync pushed a change to branch elpa/evil-numbers.

  from  a6c886dd5b Add Makefile for "make test"
   new  061f523397 Cleanup: quiet un-escaped quote warning
   new  61dde4e371 Bump to 0.7


Summary of changes:
 CHANGELOG.org   | 2 +-
 evil-numbers.el | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)

[elpa] externals/compat 6a04a8599c 1/3: Fix markup for fixed with text in manual

[ELPA Syncer]

branch: externals/compat
commit 6a04a8599c7c902e7c8715bac2a57baffece1435
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Fix markup for fixed with text in manual
---
 MANUAL | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MANUAL b/MANUAL
index 02070c8b89..f33adb1dcd 100644
--- a/MANUAL
+++ b/MANUAL
@@ -30,7 +30,7 @@ newest version on CentOS 7. It is intended to preserve 
compatibility
 for at least as the Centos 7 reaches 
[[https://wiki.centos.org/About/Product][EOL]], 2024.
 
 If you are developing a package with Compat in mind, consider loading
-`compat-help` (on your system, not in a package) to get relevant notes
+=compat-help= (on your system, not in a package) to get relevant notes
 inserted into the help buffers of functions that are implemented or
 advised in Compat.
 
@@ -52,7 +52,7 @@ and later on a
 : (require 'compat)
 
 This will load all non-prefixed definitions (functions and macros with
-a leading `compat-`).  To load these, an additional
+a leading =compat-=).  To load these, an additional
 
 : (require 'compat-XY) ; e.g. 26
 

[elpa] externals/compat 0c4af13dde 3/3: Simplify loading and compiling of Compat

[ELPA Syncer]

branch: externals/compat
commit 0c4af13dde7eb9980b636eae42954a9dfea31ba9
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Simplify loading and compiling of Compat

To avoid the issue like having to find the source of the other files
in the project during byte compilation, we will stop embedding (or
"entwining") the compiled results of compat-*.el into compat.elc.
While this may make loading slightly slower -- in my own tests it was
unnoticeable -- it makes loading Compat a lot easier to manage and
decreases the risk of running into peculiar edge cases, as documented
here[0].

To accommodate for Compat's unusual approach, we still need to do
something unusual, namely rebind the `features' variable, that is used
by `require' to check if a feature is already bound or not.  This is
done so that while loading compat-NM.el, the bound version of
`features' is updated but the updated version is reverted back as soon
as the scope of the let-block is left.  This allows `compat-NM' to be
loaded again later on, without `compat--inhibit-prefixed' being bound,
as is the case in compat.el.  This variable, if bound, suppresses the
evaluation of prefixed definitions, as had previously been done by the
generator function `compat--generate-minimal-no-prefix'.

Another marginal advantage of this approach is that if someone loads
`compat-NM' before `compat' (for whatever reason), `compat-NM' will
not be reloaded, as it is represented in both the actual as well as
the copied value of `features'.

[0] https://todo.sr.ht/~pkal/compat/4#event-180270
---
 compat-macs.el | 31 +--
 compat.el  | 78 +++---
 2 files changed, 33 insertions(+), 76 deletions(-)

diff --git a/compat-macs.el b/compat-macs.el
index 85f31b8804..a2de41da7b 100644
--- a/compat-macs.el
+++ b/compat-macs.el
@@ -29,6 +29,17 @@
   "Ignore all arguments."
   nil)
 
+(defvar compat--inhibit-prefixed nil
+  "Non-nil means that prefixed definitions are not loaded.
+A prefixed function is something like `compat-assoc', that is
+only made visible when the respective compatibility version file
+is loaded (in this case `compat-26').")
+
+(defmacro compat--inhibit-prefixed (&rest body)
+  "Ignore BODY unless `compat--inhibit-prefixed' is true."
+  `(unless (bound-and-true-p compat--inhibit-prefixed)
+ ,@body))
+
 (defvar compat--generate-function #'compat--generate-minimal
   "Function used to generate compatibility code.
 The function must take six arguments: NAME, DEF-FN, INSTALL-FN,
@@ -84,7 +95,6 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
  (cond (plist-get attr :cond))
  (version ; If you edit this, also edit `compat--generate-verbose'.
   (or (plist-get attr :version)
-  (bound-and-true-p compat--entwine-version)
   (let* ((file (car (last current-load-list)))
  (file (if (stringp file)
;; Some library, which requires compat-XY.el,
@@ -92,7 +102,9 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
;; been compiled yet.
file
  ;; compat-XY.el is being compiled.
- (bound-and-true-p byte-compile-current-file
+ (or (bound-and-true-p byte-compile-current-file)
+ ;; Fallback to the buffer being evaluated.
+ (buffer-file-name)
 (if (and file
  (string-match
   "compat-\\([[:digit:]]+\\)\\.\\(?:elc?\\)\\'" file))
@@ -107,7 +119,7 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
(version< max-version emacs-version)))
   '(compat--ignore))
  ((plist-get attr :prefix)
-  '(progn))
+  '(compat--inhibit-prefixed))
  ((and version (version<= version emacs-version) (not cond))
   '(compat--ignore))
  (`(when (and ,(if cond cond t)
@@ -143,13 +155,6 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
 `(eval-after-load ,feature `(funcall ',(lambda () ,body)))
   body))
 
-(defun compat--generate-minimal-no-prefix (name def-fn install-fn check-fn 
attr type)
-  "Generate a leaner compatibility definition.
-See `compat-generate-function' for details on the arguments NAME,
-DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
-  (unless (plist-get attr :prefix)
-(compat--generate-minimal name def-fn install-fn check-fn attr type)))
-
 (defun compat--generate-verbose (name def-fn install-fn check-fn attr type)
   "Generate a more verbose compatibility definition, fit for testing.
 See `compat-generate-function' for details on the arguments NAME,
@@ -160,11 +165,1

[elpa] externals/compat 9042f9f772 2/3: Fix byte compiler issue related to compat-json-serialize

[ELPA Syncer]

branch: externals/compat
commit 9042f9f7721300c9e2b833753b7551e983134332
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Fix byte compiler issue related to compat-json-serialize
---
 compat-28.el | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compat-28.el b/compat-28.el
index 9c5b00c00a..89c24c2f52 100644
--- a/compat-28.el
+++ b/compat-28.el
@@ -197,7 +197,12 @@ If COUNT is non-nil and a natural number, the function will
   :min-version "27"
   (if (or (listp object) (vectorp object))
   (apply #'json-insert object args)
-(insert (apply #'compat-json-serialize object args
+;; `compat-json-serialize' is not sharp-quoted as the byte
+;; compiled doesn't always know that the function has been
+;; defined, but it will only be used in this function if the
+;; prefixed definition of `json-serialize' (see above) has also
+;; been defined.
+(insert (apply 'compat-json-serialize object args
 
 (compat-defun json-parse-string (string &rest args)
   "Handle top-level JSON values."

[elpa] externals/compat updated (8f5ce2a7f2 -> 0c4af13dde)

[ELPA Syncer]

elpasync pushed a change to branch externals/compat.

  from  8f5ce2a7f2 Add missing "@end defun" from 61d8e3953f
   new  6a04a8599c Fix markup for fixed with text in manual
   new  9042f9f772 Fix byte compiler issue related to compat-json-serialize
   new  0c4af13dde Simplify loading and compiling of Compat


Summary of changes:
 MANUAL |  4 +--
 compat-28.el   |  7 +-
 compat-macs.el | 31 +--
 compat.el  | 78 +++---
 4 files changed, 41 insertions(+), 79 deletions(-)

[elpa] externals/org 654005394b: org-list-struct-apply-struct: Do not rely on `match-data' after edits

[ELPA Syncer]

branch: externals/org
commit 654005394b68cc1bf4ba8ff5791333fc3f080826
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-list-struct-apply-struct: Do not rely on `match-data' after edits

* lisp/org-list.el (org-list-struct-apply-struct): Refresh
`org-list-full-item-re' match data if we edit the bullet.  Fixes

https://orgmode.org/list/62cbc0f3.1c69fb81.13d5e.e250smtpin_added_bro...@mx.google.com
* testing/lisp/test-org-list.el (test-org-list/indent-item): Add test
checking for the reported bug.
---
 lisp/org-list.el  |  3 +++
 testing/lisp/test-org-list.el | 10 ++
 2 files changed, 13 insertions(+)

diff --git a/lisp/org-list.el b/lisp/org-list.el
index e2c3fad7c5..0f0aaefdc3 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -1953,6 +1953,9 @@ Initial position of cursor is restored after the changes."
 (goto-char (match-end 1))
 (insert-before-markers new-bul)
 (insert keep-space
+  ;; Refresh potentially shifted match markers.
+  (goto-char item)
+  (looking-at org-list-full-item-re)
  ;; b.  Replace checkbox.
  (cond
   ((equal (match-string 3) new-box))
diff --git a/testing/lisp/test-org-list.el b/testing/lisp/test-org-list.el
index da1841e73e..cab2937126 100644
--- a/testing/lisp/test-org-list.el
+++ b/testing/lisp/test-org-list.el
@@ -309,6 +309,16 @@
(buffer-string
   (should
(equal "
+- [ ] list item 1
+  + [ ] list item 2"
+  (org-test-with-temp-text "
+- [ ] list item 1
+- [ ] list item 2"
+(let ((org-list-demote-modify-bullet '(("-" . "+"
+  (org-indent-item)
+  (buffer-string)
+  (should
+   (equal "
 1. Item 1
+ Item 2"
  (org-test-with-temp-text "

[elpa] externals/compat d4495ecfdb: Rebuild all files when compat-macs.el is changed

[ELPA Syncer]

branch: externals/compat
commit d4495ecfdba76b0bc2ad44e4f4af78d938b7b09e
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Rebuild all files when compat-macs.el is changed

This could have been written in a single line, but that would have
resulted in a long line in the long time.
---
 Makefile | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3ed7ee57d1..05fe2eb422 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,12 @@ test: compile
 clean:
$(RM) $(BYTEC) compat.info
 
-compat.elc: compat.el compat-macs.el compat-24.el compat-25.el compat-26.el 
compat-27.el compat-28.el
+compat.el: compat-macs.el
+compat-24.el:  compat-macs.el
+compat-25.el:  compat-macs.el
+compat-26.el:  compat-macs.el
+compat-27.el:  compat-macs.el
+compat-28.el:  compat-macs.el
 
 .el.elc:
$(EMACS) -Q --batch -L . -f batch-byte-compile $<

[elpa] externals/consult updated (df3dbe1174 -> 1680f26f1c)

[ELPA Syncer]

elpasync pushed a change to branch externals/consult.

  from  df3dbe1174 README: Add link to consult-dash
   new  634d006297 consult-xref: Add preview support for 
xref-etags-location (Fix #606)
   new  1680f26f1c consult-xref--preview: Simplify


Summary of changes:
 consult-xref.el | 29 -
 1 file changed, 16 insertions(+), 13 deletions(-)

[elpa] externals/consult 1680f26f1c 2/2: consult-xref--preview: Simplify

[ELPA Syncer]

branch: externals/consult
commit 1680f26f1c692743d3c9a38cfd33fcd5d943550f
Author: Daniel Mendler 
Commit: Daniel Mendler 

consult-xref--preview: Simplify
---
 consult-xref.el | 31 ---
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/consult-xref.el b/consult-xref.el
index 2fb8883ce9..6a0dc03bc2 100644
--- a/consult-xref.el
+++ b/consult-xref.el
@@ -61,21 +61,22 @@
 (funcall preview action
  (when-let (loc (and cand (eq action 'preview)
  (xref-item-location cand)))
-   ;; Only preview file and buffer markers
-   (pcase (type-of loc)
- ('xref-buffer-location
-  (xref-location-marker loc))
- ((and type (or 'xref-file-location 'xref-etags-location))
-  (consult--position-marker
-   (funcall open
-;; xref-location-group returns the file name
-(let ((xref-file-name-display 'abs))
-  (xref-location-group loc)))
-   (xref-location-line loc)
-   (if (eq type 'xref-file-location)
-   (xref-file-location-column loc)
- 0)))
- (_ (message "No preview for %s" (type-of loc)) nil
+   (let ((type (type-of loc)))
+ ;; Only preview file and buffer markers
+ (pcase type
+   ('xref-buffer-location
+(xref-location-marker loc))
+   ((or 'xref-file-location 'xref-etags-location)
+(consult--position-marker
+ (funcall open
+  ;; xref-location-group returns the file name
+  (let ((xref-file-name-display 'abs))
+(xref-location-group loc)))
+ (xref-location-line loc)
+ (if (eq type 'xref-file-location)
+ (xref-file-location-column loc)
+   0)))
+   (_ (message "No preview for %s" type) nil)
 
 (defun consult-xref--group (cand transform)
   "Return title for CAND or TRANSFORM the candidate."

[elpa] externals/consult 634d006297 1/2: consult-xref: Add preview support for xref-etags-location (Fix #606)

[ELPA Syncer]

branch: externals/consult
commit 634d006297354b5e27b8554c7c616574ce55211d
Author: Daniel Mendler 
Commit: Daniel Mendler 

consult-xref: Add preview support for xref-etags-location (Fix #606)
---
 consult-xref.el | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/consult-xref.el b/consult-xref.el
index 8405abac34..2fb8883ce9 100644
--- a/consult-xref.el
+++ b/consult-xref.el
@@ -62,18 +62,20 @@
  (when-let (loc (and cand (eq action 'preview)
  (xref-item-location cand)))
;; Only preview file and buffer markers
-   (cl-typecase loc
- (xref-buffer-location
+   (pcase (type-of loc)
+ ('xref-buffer-location
   (xref-location-marker loc))
- (xref-file-location
+ ((and type (or 'xref-file-location 'xref-etags-location))
   (consult--position-marker
(funcall open
 ;; xref-location-group returns the file name
 (let ((xref-file-name-display 'abs))
   (xref-location-group loc)))
(xref-location-line loc)
-   (xref-file-location-column loc)))
- (t (message "No preview for %s" (type-of loc)) nil
+   (if (eq type 'xref-file-location)
+   (xref-file-location-column loc)
+ 0)))
+ (_ (message "No preview for %s" (type-of loc)) nil
 
 (defun consult-xref--group (cand transform)
   "Return title for CAND or TRANSFORM the candidate."

[elpa] externals/denote 4d5063f68a: Update to version 0.3.0

[ELPA Syncer]

branch: externals/denote
commit 4d5063f68afc7a8a9d2cc168c5ec18640b69acaa
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Update to version 0.3.0
---
 CHANGELOG.org | 197 ++
 README.org|  18 ++---
 denote-dired.el   |   2 +-
 denote-faces.el   |   2 +-
 denote-link.el|   2 +-
 denote-org-capture.el |   2 +-
 denote-retrieve.el|   2 +-
 denote.el |   2 +-
 8 files changed, 210 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index c5d66f638c..548518893f 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -9,6 +9,203 @@ project's main git repository: 
.
 The newest release is at the top.  For further details, please consult
 the manual: .
 
+* Version 0.3.0 on 2022-07-11
+:PROPERTIES:
+:CUSTOM_ID: h:6864cfd4-d0be-4c89-b313-39ba6e892a03
+:END:
+
++ Fixed how references are analysed to produce the backlinks' buffer.
+  This should resolve the issue that some users faced where the
+  backlinks would not be produced.
+
+  The previous implementation would not yield the appropriate results if
+  (i) the value of the user option ~denote-directory~ was a "project"
+  per the built-in project.el and (ii) the link to the given entry was
+  from a subdirectory.  In short, the references were sometimes returned
+  as relative file paths, whereas they should always be absolute.
+  Thanks to Jean-Philippe Gagné Guay for the feedback in issue 42 over
+  at the GitHub mirror: .
+
+  [ Jean-Philippe has assigned copyright to the Free Software
+Foundation.  It is a prerequisite for contributing to core Emacs
+and/or any package distributed via the official GNU ELPA. ]
+
++ Addressed a regression in the function ~denote-directory~ (this is the
+  function that normalises the variable of the same name) which
+  prevented it from returning an expanded file path.  This too
+  contributed to problems with the backlinking facility.  Thanks to
+  Jean-Philippe Gagné Guay for the contribution in pull request 44 over
+  at the GitHub mirror: .
+
+  Also thanks to user pRot0ta1p for the relevant feedback in issue 43
+  (also on the mirror): .
+  More thanks to Alfredo Borrás, Benjamin Kästner, and Sven Seebeck for
+  their comments in a related thread on the mailing list:
+  
.
+  These discussions showed we had a problem, which we managed to
+  identify.
+
++ Introduced the user option ~denote-prompts~ (read its doc string or
+  the relevant entry in the manual).  It governs how the standard
+  ~denote~ command for creating new notes will behave in interactive
+  usage.  By default, ~denote~ prompts for a title and keywords.  With
+  ~denote-prompts~, the command can also ask for a file type (per
+  ~denote-file-type~), subdirectory of the ~denote-directory~, and a
+  specific date+time.  Prompts occur in the order they are specified.
+  Furthermore, the ~denote-prompts~ can be set to values which do not
+  include the title and keywords.  This means that the resulting file
+  names can be any of those permutations:
+
+  : DATE.EXT
+  : DATE--TITLE.EXT
+  : DATE__KEYWORDS.EXT
+
+  Recall that Denote's standard file-naming scheme is defined as follows
+  (read the manual for the details):
+
+  : DATE--TITLE__KEYWORDS.EXT
+
+  For our purposes, Denote will work perfectly fine for linking and
+  backlinking, even if file names do not include the =TITLE= and
+  =KEYWORDS= fields.  However, the user is advised to consider the
+  implications on usability: notes without a descriptive title and/or
+  useful keywords may be hard to filter and practically impossible to
+  manage at scale.  File names without such information should at least
+  be added to subdirectories which themselves have a descriptive name.
+
+  At any rate, Denote does not have strong opinions about one's
+  workflow.  The standard file name is the culmination of years of
+  experience.
+
+  Consider the ~denote-prompts~ the affirmative answer to the question
+  "Can keywords be optional?" as posed by Jack Baty on the mailing list:
+  
.
+
+  Thanks to Jean-Philippe Gagné Guay for the original contribution in
+  commit 9b981a2.  It was originally part of a pull request, but due to
+  some internal changes I had to merge it as a patch and technically the
+  web UI did not count the PR as "merged" (though it was in terms of
+  substance).
+
++ Refactored the ~denote~ command to (i) accommodate the new user option
+  ~denote-prompts~ via its interactive specification and (ii) be more
+  flexible when called from Lisp.  The latter

[nongnu] elpa/helm-core updated (aa2ece8aba -> 68f4dde811)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm-core.

  from  aa2ece8aba Fix completing-read's using something else than `t'
  adds  68f4dde811 Add bug number link to comment

No new revisions were added by this update.

Summary of changes:
 helm-mode.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[nongnu] elpa/helm 68f4dde811: Add bug number link to comment

[ELPA Syncer]

branch: elpa/helm
commit 68f4dde811fa3255070968932639c8c8180086fd
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Add bug number link to comment
---
 helm-mode.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/helm-mode.el b/helm-mode.el
index 2543ac3151..e037d5839a 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -739,7 +739,8 @@ that use `helm-comp-read'.  See `helm-M-x' for example."
   (when (get-buffer helm-action-buffer)
 (kill-buffer helm-action-buffer))
   (unless (memq must-match '(confirm confirm-after-completion t nil))
-;; Fix completing-read's using something else than `t' e.g. 1 or whatever.
+;; Fix completing-read's using something else than `t' e.g. 1 or
+;; whatever (bug #2527).
 (setq must-match t))
   (let ((action-fn `(("Sole action (Identity)"
   . (lambda (candidate)

[elpa] externals/xr 74906f6d10 2/2: Increment version to 1.23

[Mattias Engdegård]

branch: externals/xr
commit 74906f6d104b7daae162dc32684e0443e80fdb03
Author: Mattias Engdegård 
Commit: Mattias Engdegård 

Increment version to 1.23
---
 xr.el | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xr.el b/xr.el
index 95c0df27b2..ea1854a817 100644
--- a/xr.el
+++ b/xr.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
 
 ;; Author: Mattias Engdegård 
-;; Version: 1.22
+;; Version: 1.23
 ;; Package-Requires: ((emacs "26.1"))
 ;; URL: https://github.com/mattiase/xr
 ;; Keywords: lisp, regexps
@@ -29,6 +29,11 @@
 
 ;;; News:
 
+;; Version 1.23:
+;; - Represent explicitly the gap in ranges from ASCII to raw bytes:
+;;   "[A-\xbb]" becomes (any "A-\x7f\x80-\xbb") because that is how
+;;   Emacs regexps work. This also suppresses some false positives
+;;   in `xr-lint' and `xr-skip-set-lint'.
 ;; Version 1.22:
 ;; - More compact distribution
 ;; Version 1.21:

[elpa] externals/xr 6d02ab45b6 1/2: Recognise implicit gap in ASCII-raw ranges

[Mattias Engdegård]

branch: externals/xr
commit 6d02ab45b6e8a99b65d792c3e91b95827f0ac3e5
Author: Mattias Engdegård 
Commit: Mattias Engdegård 

Recognise implicit gap in ASCII-raw ranges

Character ranges between ASCII and raw bytes, such as "[a-\xc0]", do
not include the intervening codes 80..3fff7f. That is, "[a-\xc0]"
really means "[a-\x7f\x80-\xc0]" and does not match any non-ASCII
Unicode character. This is also true for skip-sets.

This change does two things: xr-lint no longer complains about
"[a-\xc0λ]" since the λ is in the gap not matched by the range, and
the conversion to rx now represents the gap explicitly:
(any "a-\x7f\x80-\xc0" "λ").
---
 xr-test.el |  24 ++---
 xr.el  | 174 -
 2 files changed, 120 insertions(+), 78 deletions(-)

diff --git a/xr-test.el b/xr-test.el
index 2d5d8859a4..e78c72d4f8 100644
--- a/xr-test.el
+++ b/xr-test.el
@@ -441,6 +441,13 @@
  (xr-lint "\\`\\{2\\}\\(a\\|\\|b\\)\\{,8\\}")
  '((2 . "Repetition of zero-width assertion")
(17 . "Repetition of expression matching an empty string"
+;; The range "[\x70-\x8f]" only includes 70..7f and 3fff80..3fff8f;
+;; the gap 80..3fff7f is excluded.
+(should (equal (xr-lint "[\x70-\x8f∃]") nil))
+(should (equal (xr-lint "[\x70-\x8f\x7e-å]")
+   '((4 . "Ranges `\x70-\\x7f' and `\x7e-å' overlap"
+(should (equal (xr-lint "[\x70-\x8få-\x82]")
+   '((4 . "Ranges `å-\\x82' and `\\x80-\\x8f' overlap"
 ))
 
 (ert-deftest xr-lint-repetition-of-empty ()
@@ -714,11 +721,11 @@
 
 (ert-deftest xr-skip-set ()
   (should (equal (xr-skip-set "0-9a-fA-F+*")
- '(any "0-9a-fA-F" "+*")))
+ '(any "0-9A-Fa-f" "*+")))
   (should (equal (xr-skip-set "^ab-ex-")
  '(not (any "b-e" "ax-"
   (should (equal (xr-skip-set "-^][\\")
- '(any "^][-")))
+ '(any "[]^-")))
   (should (equal (xr-skip-set "\\^a\\-bc-\\fg")
  '(any "c-f" "^abg-")))
   (should (equal (xr-skip-set "\\")
@@ -728,15 +735,15 @@
   (should (equal (xr-skip-set "^Q-\\c-\\n")
  '(not (any "Q-c" "n-"
   (should (equal (xr-skip-set "A-")
- '(any "\\A-")))
+ '(any "A\\-")))
   (should (equal (xr-skip-set "[a-z]")
  '(any "a-z" "[]")))
   (should (equal (xr-skip-set "[:ascii:]-[:digit:]")
  '(any "-" ascii digit)))
   (should (equal (xr-skip-set "A-[:blank:]")
- '(any "A-[" ":blank]")))
+ '(any "A-[" ":]abkln")))
   (should (equal (xr-skip-set "\\[:xdigit:]-b")
- '(any "]-b" "[:xdigt")))
+ '(any "]-b" ":[dgitx")))
   (should (equal (xr-skip-set "^a-z+" 'terse)
  '(not (in "a-z" "+"
   (should-error (xr-skip-set "[::]"))
@@ -763,7 +770,7 @@
 (should (equal (xr-skip-set-lint "A-Fa-z3D-KM-N!3-7\\!b")
'((7 . "Ranges `A-F' and `D-K' overlap")
  (10 . "Two-element range `M-N'")
- (14 . "Range `3-7' includes character `3'")
+ (14 . "Character `3' included in range `3-7'")
  (17 . "Duplicated character `!'")
  (17 . "Unnecessarily escaped `!'")
  (19 . "Character `b' included in range `a-z'"
@@ -787,6 +794,11 @@
nil))
 (should (equal (xr-skip-set-lint "A-Z-z")
'((3 . "Literal `-' not first or last"
+(should (equal (xr-skip-set-lint "\x70-\x8f∃") nil))
+(should (equal (xr-skip-set-lint "\x70-\x8f\x7e-å")
+   '((3 . "Ranges `\x70-\\x7f' and `\x7e-å' overlap"
+(should (equal (xr-skip-set-lint "\x70-\x8få-\x82")
+   '((3 . "Ranges `å-\\x82' and `\\x80-\\x8f' overlap"
 ))
 
 (provide 'xr-test)
diff --git a/xr.el b/xr.el
index aa4089d552..95c0df27b2 100644
--- a/xr.el
+++ b/xr.el
@@ -129,6 +129,11 @@
 (let ((start ch)
   (end (char-after (+ (point) 2
   (cond
+   ((<= start #x7f #x3fff80 end)
+;; Intervals that go from ASCII (0-7f) to raw bytes
+;; (3fff80-3f) always exclude the intervening (Unicode) points.
+(push (vector start #x7f (point)) intervals)
+(push (vector #x3fff80 end (point)) intervals))
((<= start end)
 (push (vector start end (point)) intervals))
;; It's unlikely that anyone writes z-a by mistake; don't complain.
@@ -1458,7 +1463,7 @@ A-SETS and B-SETS are arguments to `any'."
 
   (let ((negated (eq (following-char) ?^))
 (start-pos (point))
-(ranges nil)
+(intervals nil)
 (classes nil))
 (when negated
   (forward-char)
@@ -1531,39 +1536,16 @@ A-SETS and B-SETS are arguments to `any'."
(format-me

[elpa] externals/xr updated (6d27d53098 -> 74906f6d10)

[Mattias Engdegård]

mattiase pushed a change to branch externals/xr.

  from  6d27d53098 Run github tests with Emacs 28.1
   new  6d02ab45b6 Recognise implicit gap in ASCII-raw ranges
   new  74906f6d10 Increment version to 1.23


Summary of changes:
 xr-test.el |  24 ++--
 xr.el  | 181 -
 2 files changed, 126 insertions(+), 79 deletions(-)

[elpa] externals/compat 08a673a8eb: Revert "Simplify loading and compiling of Compat"

[ELPA Syncer]

branch: externals/compat
commit 08a673a8eb713374d18bae1b52e34fecd5b6733f
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Revert "Simplify loading and compiling of Compat"

This reverts commit 0c4af13dde7eb9980b636eae42954a9dfea31ba9.
---
 compat-macs.el | 31 ++-
 compat.el  | 78 +++---
 2 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/compat-macs.el b/compat-macs.el
index a2de41da7b..85f31b8804 100644
--- a/compat-macs.el
+++ b/compat-macs.el
@@ -29,17 +29,6 @@
   "Ignore all arguments."
   nil)
 
-(defvar compat--inhibit-prefixed nil
-  "Non-nil means that prefixed definitions are not loaded.
-A prefixed function is something like `compat-assoc', that is
-only made visible when the respective compatibility version file
-is loaded (in this case `compat-26').")
-
-(defmacro compat--inhibit-prefixed (&rest body)
-  "Ignore BODY unless `compat--inhibit-prefixed' is true."
-  `(unless (bound-and-true-p compat--inhibit-prefixed)
- ,@body))
-
 (defvar compat--generate-function #'compat--generate-minimal
   "Function used to generate compatibility code.
 The function must take six arguments: NAME, DEF-FN, INSTALL-FN,
@@ -95,6 +84,7 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
  (cond (plist-get attr :cond))
  (version ; If you edit this, also edit `compat--generate-verbose'.
   (or (plist-get attr :version)
+  (bound-and-true-p compat--entwine-version)
   (let* ((file (car (last current-load-list)))
  (file (if (stringp file)
;; Some library, which requires compat-XY.el,
@@ -102,9 +92,7 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
;; been compiled yet.
file
  ;; compat-XY.el is being compiled.
- (or (bound-and-true-p byte-compile-current-file)
- ;; Fallback to the buffer being evaluated.
- (buffer-file-name)
+ (bound-and-true-p byte-compile-current-file
 (if (and file
  (string-match
   "compat-\\([[:digit:]]+\\)\\.\\(?:elc?\\)\\'" file))
@@ -119,7 +107,7 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
(version< max-version emacs-version)))
   '(compat--ignore))
  ((plist-get attr :prefix)
-  '(compat--inhibit-prefixed))
+  '(progn))
  ((and version (version<= version emacs-version) (not cond))
   '(compat--ignore))
  (`(when (and ,(if cond cond t)
@@ -155,6 +143,13 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
 `(eval-after-load ,feature `(funcall ',(lambda () ,body)))
   body))
 
+(defun compat--generate-minimal-no-prefix (name def-fn install-fn check-fn 
attr type)
+  "Generate a leaner compatibility definition.
+See `compat-generate-function' for details on the arguments NAME,
+DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
+  (unless (plist-get attr :prefix)
+(compat--generate-minimal name def-fn install-fn check-fn attr type)))
+
 (defun compat--generate-verbose (name def-fn install-fn check-fn attr type)
   "Generate a more verbose compatibility definition, fit for testing.
 See `compat-generate-function' for details on the arguments NAME,
@@ -165,11 +160,11 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
  (cond (plist-get attr :cond))
  (version ; If you edit this, also edit `compat--generate-minimal'.
   (or (plist-get attr :version)
+  (bound-and-true-p compat--entwine-version)
   (let* ((file (car (last current-load-list)))
  (file (if (stringp file)
file
- (or (bound-and-true-p byte-compile-current-file)
- (buffer-file-name)
+ (bound-and-true-p byte-compile-current-file
 (if (and file
  (string-match
   "compat-\\([[:digit:]]+\\)\\.\\(?:elc?\\)\\'" file))
@@ -198,7 +193,7 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
  (version< max-version emacs-version)))
 '(compat--ignore))
((plist-get attr :prefix)
-'(compat--inhibit-prefixed))
+'(progn))
((and version (version<= version emacs-version) (not cond))
 '(compat--ignore))
(`(when (and ,(if cond cond t)
diff --git a/compat.el b/compat.el
index b8e5e93898..9484211879 100644
--- a/compat.el
+++ b/compat.el
@@ -41,21 +41,69 @@
 
 (eval-when-compile (require 'compat-macs))
 
-;; We load all the components of Compat with a copied v

[nongnu] elpa/elpher 3d9d07495a: Changed default preformatted face to default.

[ELPA Syncer]

branch: elpa/elpher
commit 3d9d07495a70cf969150c031881d8f1c902a5572
Author: plugd 
Commit: plugd 

Changed default preformatted face to default.
---
 elpher.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elpher.el b/elpher.el
index 6268cb6af5..1959dfeb72 100644
--- a/elpher.el
+++ b/elpher.el
@@ -315,7 +315,7 @@ meaningfully."
   "Face used for gemini quoted texts.")
 
 (defface elpher-gemini-preformatted
-  '((t :inherit elpher-text))
+  '((t :inherit default))
   "Face used for gemini preformatted text.")
 
 (defface elpher-gemini-preformatted-toggle

[elpa] externals/org c66bdb0c9b: org-fold-core-style: Clarify "error-prone" in the docstring

[ELPA Syncer]

branch: externals/org
commit c66bdb0c9bb89b993b95fb32f5a3f89e99d91f67
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-fold-core-style: Clarify "error-prone" in the docstring

* lisp/org-fold-core.el (org-fold-core-style): Explain that the new
folding with text properties can be problematic with third-party
packages, not with Org itself.

See https://orgmode.org/list/877d4jve13@gmail.com
---
 lisp/org-fold-core.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 212fa09a83..23507967f7 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -298,7 +298,8 @@
   "Internal implementation detail used to hide folded text.
 Can be either `text-properties' or `overlays'.
 The former is faster on large files, while the latter is generally
-less error-prone."
+less error-prone with regard to third-party packages that haven't yet
+adapted to the new folding implementation."
   :group 'org
   :package-version '(Org . "9.6")
   :type '(choice

[elpa] externals/ada-mode a4ecb2e2e2: * ada-mode.el: Bump version to 7.3.beta1

[Stephen Leake]

branch: externals/ada-mode
commit a4ecb2e2e2416cf6066d9a57d9823b257d0f389e
Author: Stephen Leake 
Commit: Stephen Leake 

* ada-mode.el: Bump version to 7.3.beta1

* ada_mode.prj: Add comment.

* build.sh: Add verbosity, fix WISI_DIR algorithm for beta.
---
 ada-mode.el  |  2 +-
 ada_mode.prj |  1 +
 build.sh | 20 +---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ada-mode.el b/ada-mode.el
index 12eea01d71..8ec5544587 100644
--- a/ada-mode.el
+++ b/ada-mode.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Stephen Leake 
 ;; Keywords: languages
 ;;  ada
-;; Version: 7.3.beta
+;; Version: 7.3.beta1
 ;; package-requires: ((uniquify-files "1.0.1") (wisi "4.0.beta") (emacs 
"25.3"))
 ;; url: http://www.nongnu.org/ada-mode/
 ;;
diff --git a/ada_mode.prj b/ada_mode.prj
index e02082d677..c45ed512e3 100644
--- a/ada_mode.prj
+++ b/ada_mode.prj
@@ -1,3 +1,4 @@
+--  For compiling in ELPA worktree
 gpr_project_path=$WISI
 
 gpr_file=ada_mode_wisi_parse.gpr
diff --git a/build.sh b/build.sh
index 6fad8f352b..ac6b778380 100755
--- a/build.sh
+++ b/build.sh
@@ -17,16 +17,21 @@ else
 fi
 
 # support for libadalang is still experimental
-gnatprep  -DHAVE_LIBADALANG="no" -DELPA="yes" -DHAVE_GNAT_UTIL=$HAVE_GNAT_UTIL 
ada_mode_wisi_parse.gpr.gp ada_mode_wisi_parse.gpr
+args=`echo -DHAVE_LIBADALANG="no" -DELPA="yes" 
-DHAVE_GNAT_UTIL=$HAVE_GNAT_UTIL ada_mode_wisi_parse.gpr.gp 
ada_mode_wisi_parse.gpr`
 
-if [ -d ../wisi-3.1.? ]; then
-WISI_DIR=`ls -d ../wisi-3.1.?`
+echo "gnatprep " $args
+gnatprep $args
+
+if [ -d ../wisi-4.0.? ]; then
+WISI_DIR=`ls -d ../wisi-4.0.?`
 else
 # try devel version
-WISI_DIR=`ls -d ../wisi-3.1.?.0.*`
+WISI_DIR=`find .. -type d -name "wisi-4.0beta*"`
 fi
 
-gnatprep -DELPA="yes" $WISI_DIR/wisi.gpr.gp $WISI_DIR/wisi.gpr
+args=`echo -DELPA="yes" $WISI_DIR/wisi.gpr.gp $WISI_DIR/wisi.gpr`
+echo "gnatprep " $args
+gnatprep $args
 
 # We don't add WISI_DIR to GPR_PROJECT_PATH because the user may have
 # already set GPR_PROJECT_PATH.
@@ -38,11 +43,12 @@ gprclean -r -P ada_mode_wisi_parse.gpr -aP$WISI_DIR
 
 gprbuild -p -j8 -P $WISI_DIR/wisi.gpr wisitoken-bnf-generate
 
-# We generate the Ada LR parse table .txt file here, because it is too
+# We generate the Ada LR1 parse table .txt file here, because it is too
 # large to keep in ELPA. The code generated by wisitoken-bnf-generate
 # is in ELPA, because it requires the re2c tool, which we don't expect
-# users to have installed. The LR parse table for gpr is in the Ada
+# users to have installed. The LR1 parse table for gpr is in the Ada
 # code, so we don't need to generate that here.
+echo "generate Ada LR1 parse table"
 $WISI_DIR/wisitoken-bnf-generate --task_count 1 ada_annex_p.wy
 
 gprbuild -p -j8 -P ada_mode_wisi_parse.gpr -aP $WISI_DIR "$@"

[elpa] externals/wisi 08a90d2dbf: * wisi-process-parse.el: Improve updating fringe error marks

[Stephen Leake]

branch: externals/wisi
commit 08a90d2dbfc1005814c1143d4d4da4459a0fd897
Author: Stephen Leake 
Commit: Stephen Leake 

* wisi-process-parse.el: Improve updating fringe error marks

* README: Version 4.0.beta.

* wisi-fringe.el: Add verbosity.

* wisi-run-indent-test.el (test-left-fringe-mark): New.

* wisi-tests.el: Delete.

* wisi.el: Bump version to 4.0.beta1.
(wisi--run-parse): Don't call wisi-fringe-display-errors here.

* wisi.texi: Version 4.0.beta.
---
 README  |   2 +-
 wisi-fringe.el  |  14 +-
 wisi-process-parse.el   |  20 ++--
 wisi-run-indent-test.el |  21 -
 wisi-tests.el   | 119 
 wisi.el |   8 +---
 wisi.texi   |   6 +--
 7 files changed, 54 insertions(+), 136 deletions(-)

diff --git a/README b/README
index 5898d91ee8..4375ad58c4 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Emacs wisi package 3.1.2
+Emacs wisi package 4.0.beta
 
 The wisi package provides utilities for using generalized
 error-correcting LR parsers (in external processes) to do indentation,
diff --git a/wisi-fringe.el b/wisi-fringe.el
index c7b1715334..54146a577e 100644
--- a/wisi-fringe.el
+++ b/wisi-fringe.el
@@ -88,6 +88,10 @@
   (save-excursion
 (goto-char (point-min))
 (forward-line (1- line))
+
+(when (< 1 wisi-debug)
+  (wisi-parse-log-message wisi-parser-shared (format 
"wisi-fringe--put-left line %d" line)))
+
 (let* ((endpos (line-end-position))
   (ov (make-overlay endpos (1+ endpos)))
   (bmp 'wisi-fringe--double-exclaim-bmp))
@@ -125,7 +129,7 @@ The buffer containing POSITIONS must be current, and the 
window
 displaying that buffer must be current."
   ;; We don't recompute fringe display on scroll, because the user
   ;; will probably have edited the code by then, triggering a new
-  ;; parse.
+  ;; parse. FIXME: use flymake.
   (wisi-fringe-clean)
   (when positions
 (let (scaled-posns
@@ -134,6 +138,14 @@ displaying that buffer must be current."
  (window-pos-first (window-start))
  (window-pos-last  (window-end))
  (window-line-first (line-number-at-pos (window-start) t)))
+
+  (when (< 1 wisi-debug)
+   (wisi-parse-log-message wisi-parser-shared
+   (format "wisi-fringe-display-errors %d %d %d"
+   (length positions)
+   window-pos-first
+   window-pos-last)))
+
   (dolist (pos positions)
(let* ((line (line-number-at-pos (max (point-min) (min (point-max) 
pos)) t))
   (scaled-pos (wisi-fringe--scale line buffer-lines 
window-line-first window-lines)))
diff --git a/wisi-process-parse.el b/wisi-process-parse.el
index cf6ee963ab..d00e6762fb 100644
--- a/wisi-process-parse.el
+++ b/wisi-process-parse.el
@@ -59,6 +59,7 @@ Must match emacs_wisi_common_parse.ads Protocol_Version.")
   end-pos ;; last character position parsed
   language-action-table   ;; array of function pointers, each taking an sexp 
sent by the process
   query-result;; holds result of wisi-process-parse--Query
+  update-fringe   ;; non-nil if wpp--handle-messages should run 
wisi-fringe-display-errors
   )
 
 (cl-defmethod wisi-parser-transaction-log-buffer-name ((parser 
wisi-process--parser))
@@ -340,10 +341,11 @@ complete."
   ;; characters, this is hit by
   ;; ada_mode-conditional_expressions.adb.
   (let ((changes
-;; wisi--changes is in reverse time order.
-(if wisi--changes
-(prin1-to-string (nreverse wisi--changes))
-  "()")))
+(unless full
+  ;; wisi--changes is in reverse time order.
+  (if wisi--changes
+  (prin1-to-string (nreverse wisi--changes))
+(error "wpp--send-incremental-parse with nil wisi--changes")
 (when (> (length changes) )
   (setq full t))
 
@@ -1075,6 +1077,16 @@ Source buffer is current."
  (setf (wisi-process--parser-response-count parser) response-count)
  (setf (wisi-process--parser-busy parser) nil)
  (set-buffer source-buffer)
+
+ (when (wisi-process--parser-update-fringe parser)
+   (setf (wisi-process--parser-update-fringe parser) nil)
+   (wisi-fringe-display-errors
+(append
+ (seq-map (lambda (err) (wisi--lexer-error-pos err))
+  (wisi-parser-local-lexer-errors wisi-parser-local))
+ (seq-map (lambda (err) (wisi--parse-error-pos err))
+  (wisi-parser-local-parse-errors wisi-parser-local)
+
  (when (< 1 wisi-debug)
(wisi-parse-log-message parser (format "parse--handle-messages in 
%s done" source-buffer)))
  )
diff --git a/wisi-run-indent-test.el b/wisi-run-indent-test.el
index b4a82ddaca..3aea39bbde 100644
--

[elpa] externals/vcard f5df1907bb 02/13: *** empty log message ***

[Stefan Monnier via]

branch: externals/vcard
commit f5df1907bbed20c5e46ec89348e033570161aeba
Author: Noah Friedman 
Commit: Noah Friedman 

*** empty log message ***
---
 vcard.el | 189 +++
 1 file changed, 177 insertions(+), 12 deletions(-)

diff --git a/vcard.el b/vcard.el
index 876866c14c..0d02e0bcbb 100644
--- a/vcard.el
+++ b/vcard.el
@@ -1,13 +1,13 @@
-;;; vcard.el --- vcard parsing and formatting routines
+;;; vcard.el --- vcard parsing and display routines
 
 ;; Copyright (C) 1997 Noah S. Friedman
 
-;; Author: Noah Friedman 
-;; Maintainer: fried...@prep.ai.mit.edu
+;; Author: Noah Friedman 
+;; Maintainer: fried...@splode.com
 ;; Keywords: extensions
 ;; Created: 1997-09-27
 
-;; $Id: vcard.el,v 1.1 1997/10/01 11:55:52 friedman Exp $
+;; $Id: vcard.el,v 1.2 1997/10/14 19:38:18 friedman Exp $
 
 ;; 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
@@ -25,18 +25,52 @@
 ;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
+
+;; The display routines here are just an example.  The primitives in the
+;; first section can be used to construct other vcard formatters.
+
 ;;; Code:
 
-(defun vcard-parse-string (raw)
+(defvar vcard-standard-filters '(vcard-filter-html)
+  "*Standard list of filters to apply to parsed vcard data.
+These filters are applied sequentially to vcard data records when
+the function `vcard-standard-filter' is supplied as the second argument to
+`vcard-parse-string'.")
+
+(defun vcard-parse-string (raw &optional filter)
+  "Parse RAW vcard data as a string, and return an alist representing data.
+
+If the optional function FILTER is specified, apply that filter to the
+data record of each key before splitting fields.  Filters should accept
+two arguments: the key and the data.  They are expected to operate on
+\(and return\) a modified data value.
+
+Vcard data is normally in the form
+
+begin:vcard
+key1: field
+key2;subkey1: field
+key2;subkey2: field1;field2;field3
+end:  vcard
+
+If supplied to this function an alist of the form
+
+((\"key1\" \"field\")
+ (\"key2\"
+  (\"subkey2\" \"field1\" \"field2\" \"field3\")
+  (\"subkey1\" \"field\")))
+
+would be returned."
   (save-match-data
 (let ((raw-pos 0)
   (vcard-data nil)
   key data)
-  (string-match "^begin:[ \t]*vcard[ \t]*[\r\n]+" raw raw-pos)
+  (string-match "^[ \t]*begin:[ \t]*vcard[ \t]*[\r\n]+" raw raw-pos)
   (setq raw-pos (match-end 0))
   (while (and (< raw-pos (length raw))
-  (string-match "^\\([^:]+\\):[ \t]+\\(.*\\)[ \t]*[\n\r]+"
-raw raw-pos))
+  (string-match
+   "^[ \t]*\\([^:]+\\):[ \t]+\\(.*\\)[ \t]*[\n\r]+"
+   raw raw-pos))
 (setq key (vcard-matching-substring 1 raw))
 (setq data (vcard-matching-substring 2 raw))
 (setq raw-pos (match-end 0))
@@ -44,6 +78,8 @@
  ((string= key "end")
   (setq raw-pos (length raw)))
  (t
+  (and filter
+   (setq data (funcall filter key data)))
   (setq vcard-data
 (vcard-set-alist-slot vcard-data
   (vcard-split-string key ";")
@@ -51,22 +87,64 @@
   (nreverse vcard-data
 
 (defun vcard-ref (key vcard-data)
+  "Return the vcard data associated with KEY in VCARD-DATA.
+Key may be a list of nested keys or a single string of colon-separated
+keys."
   (cond ((listp key)
- (vcard-nested-alist-assoc key vcard-data))
+ (vcard-alist-assoc key vcard-data))
 ((and (stringp key)
   (save-match-data
 (string-match ";" key)))
- (vcard-nested-alist-assoc (vcard-split-string key ";") vcard-data))
+ (vcard-alist-assoc (vcard-split-string key ";") vcard-data))
 ((stringp key)
  (cdr (assoc key vcard-data)
 
 
-(defun vcard-nested-alist-assoc (keys alist)
+;;; Vcard data filters.
+
+;; These receive both the key and data, but are expected to operate on (and
+;; return) just the data.
+;;
+;; There is probably no overwhelming need for this, except that some lusers
+;; put HTML in their vcards under the misguided notion that it's a standard
+;; feature of vcards just because Netscape supports this feature.  (Or
+;; perhaps those lusers just don't care that their vcards look like shit in
+;; every other MUA).
+;;
+;; On the other hand, perhaps someone will devise some other use for these
+;; filters, such as noticing common phone number formats and re-formatting
+;; them to fit personal preferences.
+
+(defun vcard-filter-apply-filter-list (filter-list key data)
+  (while filter-list
+(setq data (funcall (car filter-list) key data))
+(setq filter-list (cdr filter-list)))
+  data)
+
+(defun vcard-standard-filter (

[elpa] externals/vcard ec3986a43a 03/13: *** empty log message ***

[Stefan Monnier via]

branch: externals/vcard
commit ec3986a43a2fd958fe22b30dbf972a8af3703327
Author: Noah Friedman 
Commit: Noah Friedman 

*** empty log message ***
---
 vcard.el | 61 +
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/vcard.el b/vcard.el
index 0d02e0bcbb..3c902009f5 100644
--- a/vcard.el
+++ b/vcard.el
@@ -7,7 +7,7 @@
 ;; Keywords: extensions
 ;; Created: 1997-09-27
 
-;; $Id: vcard.el,v 1.2 1997/10/14 19:38:18 friedman Exp $
+;; $Id: vcard.el,v 1.3 1997/10/15 07:10:25 friedman Exp $
 
 ;; 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
@@ -200,37 +200,50 @@ keys."
 
 ;;; Sample formatting routines.
 
-(defun vcard-display-string (vcard-data)
+(defun vcard-format-box (vcard-data)
+  "Like `vcard-format-string', but put an ascii box around text."
+  (let* ((lines (vcard-format-lines vcard-data))
+ (len (vcard-format-max-length lines))
+ (edge (concat "\n+" (make-string (+ len 2) ?-) "+\n"))
+ (line-fmt (format "| %%-%ds |" len)))
+(concat edge
+(mapconcat (function (lambda (s) (format line-fmt s))) lines "\n")
+edge)))
+
+(defun vcard-format-string (vcard-data)
   "Format VCARD-DATA into a string suitable for presentation.
 VCARD-DATA should be a parsed vcard alist.  The result is a string
 with formatted vcard information which can be inserted into a mime
 presentation buffer."
-  (let* ((name  (vcard-display-get-name  vcard-data))
- (title (vcard-display-ref "title"   vcard-data))
- (org   (vcard-display-ref "org" vcard-data))
- (addr  (vcard-display-get-address   vcard-data))
- (tel   (vcard-display-get-telephone vcard-data))
+  (mapconcat 'identity (vcard-format-lines vcard-data) "\n"))
+
+(defun vcard-format-lines (vcard-data)
+  (let* ((name  (vcard-format-get-name  vcard-data))
+ (title (vcard-format-ref "title"   vcard-data))
+ (org   (vcard-format-ref "org" vcard-data))
+ (addr  (vcard-format-get-address   vcard-data))
+ (tel   (vcard-format-get-telephone vcard-data))
  (lines (delete nil (vcard-flatten (list name title org addr
  (col-template (format "%%-%ds%%s"
-   (vcard-display-offset lines tel)))
+   (vcard-format-offset lines tel)))
  (l lines))
 (while tel
   (setcar l (format col-template (car l) (car tel)))
   (setq l (cdr l))
   (setq tel (cdr tel)))
-(mapconcat 'identity lines "\n")))
+lines))
 
-(defun vcard-display-get-name (vcard-data)
-  (let ((name (vcard-display-ref "fn" vcard-data))
-(email (or (vcard-display-ref '("email" "internet") vcard-data)
-   (vcard-display-ref "email" vcard-data
+(defun vcard-format-get-name (vcard-data)
+  (let ((name (vcard-format-ref "fn" vcard-data))
+(email (or (vcard-format-ref '("email" "internet") vcard-data)
+   (vcard-format-ref "email" vcard-data
 (if email
 (format "%s <%s>" name email)
   name)))
 
-(defun vcard-display-get-address (vcard-data)
-  (let* ((addr (or (vcard-display-ref '("adr" "dom") vcard-data)
-   (vcard-display-ref "adr" vcard-data)))
+(defun vcard-format-get-address (vcard-data)
+  (let* ((addr (or (vcard-format-ref '("adr" "dom") vcard-data)
+   (vcard-format-ref "adr" vcard-data)))
  (street (delete "" (list (nth 0 addr) (nth 1 addr) (nth 2 addr
  (city-list (delete "" (nthcdr 3 addr)))
  (city (cond ((null (car city-list)) nil)
@@ -244,18 +257,18 @@ presentation buffer."
 (append street (list city))
   street
 
-(defun vcard-display-get-telephone (vcard-data)
+(defun vcard-format-get-telephone (vcard-data)
   (delete nil
   (mapcar (function (lambda (x)
-  (let ((result (vcard-display-ref (car x)
-   vcard-data)))
+  (let ((result (vcard-format-ref (car x)
+  vcard-data)))
 (and result
  (concat (cdr x) result)
   '((("tel" "work") . "Work: ")
 (("tel" "home") . "Home: ")
 (("tel" "fax")  . "Fax:  ")
 
-(defun vcard-display-ref (key vcard-data)
+(defun vcard-format-ref (key vcard-data)
   (setq key (vcard-ref key vcard-data))
   (or (cdr key)
   (setq key (car key)))
@@ -264,13 +277,13 @@ presentation buffer."
(setq key nil))
   key)
 
-(defun vcard-display-offset (row1 row2 &optional maxwidth)
+(defun vcard-format-offset (row1 row2 &optional maxwidth)
   (or maxwidth (setq maxwidth (frame-width)))
-  (let ((max1 (vcard-display-max-le

[elpa] externals/vcard a50b9e4395 04/13: (vcard-format-lines): Handle case where 2nd column has more lines than

[Stefan Monnier via]

branch: externals/vcard
commit a50b9e43950f26f28d27ac68d5ac14b7fb79e97d
Author: Noah Friedman 
Commit: Noah Friedman 

(vcard-format-lines): Handle case where 2nd column has more lines than
first column.
---
 vcard.el | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/vcard.el b/vcard.el
index 3c902009f5..0d13bb4f4a 100644
--- a/vcard.el
+++ b/vcard.el
@@ -7,7 +7,7 @@
 ;; Keywords: extensions
 ;; Created: 1997-09-27
 
-;; $Id: vcard.el,v 1.3 1997/10/15 07:10:25 friedman Exp $
+;; $Id: vcard.el,v 1.4 1998/02/10 11:02:00 friedman Exp $
 
 ;; 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
@@ -229,10 +229,16 @@ presentation buffer."
  (l lines))
 (while tel
   (setcar l (format col-template (car l) (car tel)))
+  ;; If we stripped away too many nil slots from l, add empty strings
+  ;; back in so setcar above will work on next iteration.
+  (and (cdr tel)
+   (null (cdr l))
+   (setcdr l (cons "" nil)))
   (setq l (cdr l))
   (setq tel (cdr tel)))
 lines))
 
+
 (defun vcard-format-get-name (vcard-data)
   (let ((name (vcard-format-ref "fn" vcard-data))
 (email (or (vcard-format-ref '("email" "internet") vcard-data)

[elpa] externals/vcard ef82e79ac7 01/13: *** empty log message ***

[Stefan Monnier via]

branch: externals/vcard
commit ef82e79ac7f426220cc4b43e81d6aafce58fc2e1
Author: Noah Friedman 
Commit: Noah Friedman 

*** empty log message ***
---
 .gitignore |  28 +++
 vcard.el   | 120 +
 2 files changed, 148 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00..da8168b37b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,28 @@
+# CVS default ignores begin
+tags
+TAGS
+.make.state
+.nse_depinfo
+*~
+\#*
+.#*
+,*
+_$*
+*$
+*.old
+*.bak
+*.BAK
+*.orig
+*.rej
+.del-*
+*.a
+*.olb
+*.o
+*.obj
+*.so
+*.exe
+*.Z
+*.elc
+*.ln
+core
+# CVS default ignores end
diff --git a/vcard.el b/vcard.el
new file mode 100644
index 00..876866c14c
--- /dev/null
+++ b/vcard.el
@@ -0,0 +1,120 @@
+;;; vcard.el --- vcard parsing and formatting routines
+
+;; Copyright (C) 1997 Noah S. Friedman
+
+;; Author: Noah Friedman 
+;; Maintainer: fried...@prep.ai.mit.edu
+;; Keywords: extensions
+;; Created: 1997-09-27
+
+;; $Id: vcard.el,v 1.1 1997/10/01 11:55:52 friedman Exp $
+
+;; 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
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; This program 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 this program; if not, you can either send email to this
+;; program's maintainer or write to: The Free Software Foundation,
+;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;;; Code:
+
+(defun vcard-parse-string (raw)
+  (save-match-data
+(let ((raw-pos 0)
+  (vcard-data nil)
+  key data)
+  (string-match "^begin:[ \t]*vcard[ \t]*[\r\n]+" raw raw-pos)
+  (setq raw-pos (match-end 0))
+  (while (and (< raw-pos (length raw))
+  (string-match "^\\([^:]+\\):[ \t]+\\(.*\\)[ \t]*[\n\r]+"
+raw raw-pos))
+(setq key (vcard-matching-substring 1 raw))
+(setq data (vcard-matching-substring 2 raw))
+(setq raw-pos (match-end 0))
+(cond
+ ((string= key "end")
+  (setq raw-pos (length raw)))
+ (t
+  (setq vcard-data
+(vcard-set-alist-slot vcard-data
+  (vcard-split-string key ";")
+  (vcard-split-string data ";"))
+  (nreverse vcard-data
+
+(defun vcard-ref (key vcard-data)
+  (cond ((listp key)
+ (vcard-nested-alist-assoc key vcard-data))
+((and (stringp key)
+  (save-match-data
+(string-match ";" key)))
+ (vcard-nested-alist-assoc (vcard-split-string key ";") vcard-data))
+((stringp key)
+ (cdr (assoc key vcard-data)
+
+
+(defun vcard-nested-alist-assoc (keys alist)
+  (while (and keys alist)
+(setq alist (cdr (assoc (car keys) alist)))
+(setq keys (cdr keys)))
+  alist)
+
+(defun vcard-set-alist-slot (alist key-list value)
+  (let* ((key (car key-list))
+ (elt (assoc key alist)))
+(setq key-list (cdr key-list))
+(cond ((and (cdr elt) key-list)
+   (vcard-set-alist-slot (cdr elt) key-list value))
+  ((and elt key-list)
+   (setcdr elt (vcard-set-alist-slot nil key-list value)))
+  (elt (setcdr elt value))
+  (t
+   (let ((new))
+ (setq key-list (nreverse (cons key key-list)))
+ (while key-list
+   (if new
+   (setq new (cons (car key-list) (cons new nil)))
+ (setq new (cons (car key-list) value)))
+   (setq key-list (cdr key-list)))
+
+ (cond ((null alist)
+(setq alist (cons new nil)))
+   (t
+(setcdr alist (cons (car alist) (cdr alist)))
+(setcar alist new))
+alist))
+
+
+;; Return substring matched by last search.
+;; N specifies which match data pair to use
+;; Value is nil if there is no Nth match.
+;; If STRING is not specified, the current buffer is used.
+(defun vcard-matching-substring (n &optional string)
+  (if (match-beginning n)
+  (if string
+ (substring string (match-beginning n) (match-end n))
+   (buffer-substring (match-beginning n) (match-end n)
+
+;; Split STRING at occurences of SEPARATOR.  Return a list of substrings.
+;; SEPARATOR can be any regexp, but anything matching the separator will
+;; never appear in any of the returned substrings.
+(defun vcard-split-string (string separator)
+  (let* ((list nil)
+ (pos 0))
+(save-match-data
+  (while 

[elpa] externals/vcard a3e60e2883 09/13: (vcard-parse-region-value): Do not use `new-marker';

[Stefan Monnier via]

branch: externals/vcard
commit a3e60e2883f2ffe894475d32f352b5e184ddac48
Author: Noah Friedman 
Commit: Noah Friedman 

(vcard-parse-region-value): Do not use `new-marker';
use `set-marker' and `make-marker' instead.
---
 vcard.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vcard.el b/vcard.el
index 228d815c7d..842ee09cd4 100644
--- a/vcard.el
+++ b/vcard.el
@@ -7,7 +7,7 @@
 ;; Keywords: vcard, mail, news
 ;; Created: 1997-09-27
 
-;; $Id: vcard.el,v 1.8 2000/02/03 17:54:50 friedman Exp $
+;; $Id: vcard.el,v 1.9 2000/02/03 20:51:51 friedman Exp $
 
 ;; 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
@@ -275,7 +275,7 @@ Note: this function modifies the buffer!"
  ;; chars and those which were encoded in order to quote them
  ;; against being treated as field separators.
  (goto-char beg)
- (setq pos (new-marker (point)))
+ (setq pos (set-marker (make-marker) (point)))
  (setq match-beg (make-marker))
  (setq match-end (make-marker))
  (save-match-data

[elpa] externals/vcard c1fa6a26be 10/13: (vcard-char-to-int): New defalias.

[Stefan Monnier via]

branch: externals/vcard
commit c1fa6a26be49c6066464acc9b0703231e8321112
Author: Noah Friedman 
Commit: Noah Friedman 

(vcard-char-to-int): New defalias.
(vcard-region-decode-base64-table): Use it.
(vcard-region-decode-base64): Here too.
---
 vcard.el | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/vcard.el b/vcard.el
index 842ee09cd4..90014663fd 100644
--- a/vcard.el
+++ b/vcard.el
@@ -7,7 +7,7 @@
 ;; Keywords: vcard, mail, news
 ;; Created: 1997-09-27
 
-;; $Id: vcard.el,v 1.9 2000/02/03 20:51:51 friedman Exp $
+;; $Id: vcard.el,v 1.10 2000/02/23 19:39:15 friedman Exp $
 
 ;; 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
@@ -109,6 +109,11 @@ the function `vcard-standard-filter' is supplied as the 
second argument to
 
 ;;; No user-settable options below.
 
+;; XEmacs 21 ints and chars are disjoint types.
+;; For all else, treat them as the same.
+(defalias 'vcard-char-to-int
+  (if (fboundp 'char-to-int) 'char-to-int 'identity))
+
 ;; This is just the version number for this package; it does not refer to
 ;; the vcard format specification.  Currently, this package does not yet
 ;; support the full vcard 3.0 specification.
@@ -139,7 +144,7 @@ the function `vcard-standard-filter' is supplied as the 
second argument to
  (tbl (make-vector 123 nil))
  (i 0))
 (while (< i len)
-  (aset tbl (char-to-int (aref a i)) i)
+  (aset tbl (vcard-char-to-int (aref a i)) i)
   (setq i (1+ i)))
 tbl))
 
@@ -498,7 +503,7 @@ US domestic telephone numbers are replaced with 
international format."
(delete-region (point) (point-max)))
   (t
(setq n (+ n (aref vcard-region-decode-base64-table
-  (char-to-int c
+  (vcard-char-to-int c
(setq count (1+ count))
(cond ((= count 4)
   (insert (logand 255 (lsh n -16))

[elpa] externals/vcard 1399f2b8cb 06/13: (vcard-format-box): Return empty string if no data to present; don't

[Stefan Monnier via]

branch: externals/vcard
commit 1399f2b8cbdee6e0b1265070b135190ec0815b96
Author: Noah Friedman 
Commit: Noah Friedman 

(vcard-format-box): Return empty string if no data to present; don't
return borders.

(vcard-format-get-address): Handle case that `adr' contains only one field.
---
 vcard.el | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/vcard.el b/vcard.el
index ad24f7e0ec..58662c6c92 100644
--- a/vcard.el
+++ b/vcard.el
@@ -7,7 +7,7 @@
 ;; Keywords: extensions
 ;; Created: 1997-09-27
 
-;; $Id: vcard.el,v 1.5 1998/06/05 19:56:06 friedman Exp $
+;; $Id: vcard.el,v 1.6 1998/07/21 20:35:40 friedman Exp $
 
 ;; 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
@@ -206,10 +206,12 @@ keys."
   (let* ((lines (vcard-format-lines vcard-data))
  (len (vcard-format-max-length lines))
  (edge (concat "\n+" (make-string (+ len 2) ?-) "+\n"))
- (line-fmt (format "| %%-%ds |" len)))
-(concat edge
-(mapconcat (function (lambda (s) (format line-fmt s))) lines "\n")
-edge)))
+ (line-fmt (format "| %%-%ds |" len))
+ (formatted-lines
+  (mapconcat (function (lambda (s) (format line-fmt s))) lines "\n")))
+(if (string= formatted-lines "")
+formatted-lines
+  (concat edge formatted-lines edge
 
 (defun vcard-format-string (vcard-data)
   "Format VCARD-DATA into a string suitable for presentation.
@@ -249,8 +251,11 @@ presentation buffer."
   name)))
 
 (defun vcard-format-get-address (vcard-data)
-  (let* ((addr (or (vcard-format-ref '("adr" "dom") vcard-data)
-   (vcard-format-ref "adr" vcard-data)))
+  (let* ((addr-raw (or (vcard-format-ref '("adr" "dom") vcard-data)
+   (vcard-format-ref "adr" vcard-data)))
+ (addr (if (consp addr-raw)
+   addr-raw
+ (list addr-raw)))
  (street (delete "" (list (nth 0 addr) (nth 1 addr) (nth 2 addr
  (city-list (delete "" (nthcdr 3 addr)))
  (city (cond ((null (car city-list)) nil)

[elpa] externals/vcard 0200b96343 13/13: Adjust package to the new `vcard.el` file

[Stefan Monnier via]

branch: externals/vcard
commit 0200b96343c2c2bb3900fa0fa44c9dea429dcf67
Author: Stefan Monnier 
Commit: Stefan Monnier 

Adjust package to the new `vcard.el` file

* vcard.el: Setup as package's main file.  Update license to GPLv3+.
Use lexical-binding.  Prefer #' to quote function names.
Only use `;;;` for headings.  Remove ineffectual backslashes.
(vcard-parse-string): Use `with-current-buffer`.
(vcard-filter-html): Mark `proplist` as unused.

* vcard-parse.el (vcard-parse-select-fields)
(vcard-contact-property-type): Fix docstring quoting.

* vcard-mode.el: Move package version and dependencies back to `vcard.el`.
---
 vcard-mode.el  |  5 +--
 vcard-parse.el |  8 ++---
 vcard.el   | 98 +++---
 3 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/vcard-mode.el b/vcard-mode.el
index c502ef2f8c..3a317cffa2 100644
--- a/vcard-mode.el
+++ b/vcard-mode.el
@@ -5,9 +5,6 @@
 ;; Author: Eric Abrahamsen 
 ;; Maintainer: Eric Abrahamsen 
 
-;; Version: 0.2.1
-;; Package-Requires: ((emacs "27.1"))
-
 ;; 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
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -60,5 +57,5 @@
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.[Vv][Cc][Ff]\\'" . vcard-mode))
 
-(provide 'vcard)
+(provide 'vcard-mode)
 ;;; vcard-mode.el ends here
diff --git a/vcard-parse.el b/vcard-parse.el
index a9d9a5b390..aaa4a04662 100644
--- a/vcard-parse.el
+++ b/vcard-parse.el
@@ -1,6 +1,6 @@
 ;;; vcard-parse.el --- Library for parsing vCards  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2019  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2022  Free Software Foundation, Inc.
 
 ;; Author: Eric Abrahamsen 
 ;; Maintainer: Eric Abrahamsen 
@@ -98,8 +98,8 @@
 (defvar vcard-parse-select-fields nil
   "A list of field types to select.
 If this variable is non-nil, only the fields listed will be
-parsed, all others will be discarded.  Note that the 'version and
-'fn properties are always returned.
+parsed, all others will be discarded.  Note that the `version' and
+`fn' properties are always returned.
 
 Most useful when let-bound around one of the parsing functions.")
 
@@ -355,7 +355,7 @@ Each type is a symbol representing a downcased property 
name."
 (cl-defmethod vcard-contact-property-type ((contact list)
   (type symbol))
   "Return all properties of TYPE from CONTACT.
-TYPE is a symbol, e.g. 'email."
+TYPE is a symbol, e.g. `email'."
   (let (props)
 (dolist (p (vcard-contact-properties contact) props)
   (when (eql type (car p))
diff --git a/vcard.el b/vcard.el
index 27eb3df643..53ca373582 100644
--- a/vcard.el
+++ b/vcard.el
@@ -1,17 +1,20 @@
-;;; vcard.el --- vcard parsing and display routines
+;;; vcard.el --- Package for handling vCard files  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1997, 1999, 2000 Noah S. Friedman
+;; Copyright (C) 1997-2022  Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman 
-;; Maintainer: fried...@splode.com
+;; Maintainer: Noah Friedman , Eric Abrahamsen 

 ;; Keywords: vcard, mail, news
 ;; Created: 1997-09-27
 
+;; Version: 0.2.1
+;; Package-Requires: ((emacs "27.1"))
+
 ;; $Id: vcard.el,v 1.11 2000/06/29 17:07:55 friedman Exp $
 
 ;; 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
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 ;;
 ;; This program is distributed in the hope that it will be useful,
@@ -20,9 +23,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; along with this program.  If not, see .
 
 ;;; Commentary:
 
@@ -70,8 +71,11 @@
 ;; exist for an attribute is considered to have a nil parameter.
 
 ;; TODO:
+;;   * Consolidate the functionality duplicated between `vcard.el' and
+;; `vcard-parse.el'.
 ;;   * Finish supporting the 3.0 extensions.
-;; Currently, only the 2.1 standard is supported.
+;; Currently, only the 2.1 standard is supported by `vcard.el'
+;; But newer 4.0 is supported by `vcard-parse.el'.
 ;;   * Handle nested vcards and grouped attributes?
 ;; (I've never actually seen one of these in use.)
 ;;   * Handle multibyte charsets.
@@ -79,6 +83,11 @@
 ;;   * Implement a vcard address book?  Or is using BBDB preferable?
 ;;   * Improve the sample formatter.
 
+;; News:
+
+;; Since 0.2.1:
+;; - Incorporat

[elpa] externals/vcard d0ec40a5c6 08/13: Complete rewrite.

[Stefan Monnier via]

branch: externals/vcard
commit d0ec40a5c62980a6cfe183b27c517117264465e2
Author: Noah Friedman 
Commit: Noah Friedman 

Complete rewrite.
---
 vcard.el | 803 ++-
 1 file changed, 590 insertions(+), 213 deletions(-)

diff --git a/vcard.el b/vcard.el
index 74ff63497d..228d815c7d 100644
--- a/vcard.el
+++ b/vcard.el
@@ -1,13 +1,13 @@
 ;;; vcard.el --- vcard parsing and display routines
 
-;; Copyright (C) 1997, 1999 Noah S. Friedman
+;; Copyright (C) 1997, 1999, 2000 Noah S. Friedman
 
 ;; Author: Noah Friedman 
 ;; Maintainer: fried...@splode.com
-;; Keywords: extensions
+;; Keywords: vcard, mail, news
 ;; Created: 1997-09-27
 
-;; $Id: vcard.el,v 1.7 1999/10/25 05:49:12 friedman Exp $
+;; $Id: vcard.el,v 1.8 2000/02/03 17:54:50 friedman Exp $
 
 ;; 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
@@ -26,179 +26,525 @@
 
 ;;; Commentary:
 
-;; The display routines here are just an example.  The primitives in the
-;; first section can be used to construct other vcard formatters.
+;; Unformatted vcards are just plain ugly.  But if you live in the MIME
+;; world, they are a better way of exchanging contact information than
+;; freeform signatures since the former can be automatically parsed and
+;; stored in a searchable index.
+;;
+;; This library of routines provides the back end necessary for parsing
+;; vcards so that they can eventually go into an address book like BBDB
+;; (although this library does not implement that itself).  Also included
+;; is a sample pretty-printer which MUAs can use which do not provide their
+;; own vcard formatters.
+
+;; This library does not interface directly with any mail user agents.  For
+;; an example of bindings for the VM MUA, see vm-vcard.el available from
+;;
+;;http://www.splode.com/~friedman/software/emacs-lisp/index.html#mail
+;;
+;; Updates to vcard.el should be available there too.
+
+;; The main entry point to this package is `vcard-pretty-print' although
+;; any documented variable or function is considered part of the API for
+;; operating on vcard data.
 
 ;; The vcard 2.1 format is defined by the versit consortium.
 ;; See http://www.imc.org/pdi/vcard-21.ps
+;;
 ;; RFC 2426 defines the vcard 3.0 format.
 ;; See ftp://ftp.rfc-editor.org/in-notes/rfc2426.txt
 
+;; A parsed vcard is a list of attributes of the form
+;;
+;; (proplist value1 value2 ...)
+;;
+;; Where proplist is a list of property names and parameters, e.g.
+;;
+;; (property1 (property2 . parameter2) ...)
+;;
+;; Each property has an associated implicit or explicit parameter value
+;; (not to be confused with attribute values; in general this API uses
+;; `parameter' to refer to property values and `value' to refer to attribute
+;; values to avoid confusion).  If a property has no explicit parameter value,
+;; the parameter value is considered to be `t'.  Any property which does not
+;; exist for an attribute is considered to have a nil parameter.
+
+;; TODO:
+;;   * Finish supporting the 3.0 extensions.
+;; Currently, only the 2.1 standard is supported.
+;;   * Handle nested vcards and grouped attributes?
+;; (I've never actually seen one of these in use.)
+;;   * Handle multibyte charsets.
+;;   * Inverse of vcard-parse-string: write .VCF files from alist
+;;   * Implement a vcard address book?  Or is using BBDB preferable?
+;;   * Improve the sample formatter.
+
 ;;; Code:
 
-(defvar vcard-standard-filters '(vcard-filter-html)
+(defgroup vcard nil
+  "Support for the vCard electronic business card format."
+  :group 'vcard
+  :group 'mail
+  :group 'news)
+
+;;;###autoload
+(defcustom vcard-pretty-print-function 'vcard-format-sample-box
+  "*Formatting function used by `vcard-pretty-print'."
+  :type 'function
+  :group 'vcard)
+
+;;;###autoload
+(defcustom vcard-standard-filters
+  '(vcard-filter-html
+vcard-filter-adr-newlines
+vcard-filter-tel-normalize
+vcard-filter-textprop-cr)
   "*Standard list of filters to apply to parsed vcard data.
-These filters are applied sequentially to vcard data records when
+These filters are applied sequentially to vcard attributes when
 the function `vcard-standard-filter' is supplied as the second argument to
-`vcard-parse-string'.")
+`vcard-parse'."
+  :type 'hook
+  :group 'vcard)
 
+
+;;; No user-settable options below.
+
+;; This is just the version number for this package; it does not refer to
+;; the vcard format specification.  Currently, this package does not yet
+;; support the full vcard 3.0 specification.
+;;
+;; Whenever any part of the API defined in this package change in a way
+;; that is not backward-compatible, the major version number here should be
+;; incremented.  Backward-compatible additions to the API should be
+;; indicated by increasing the minor version number.
+(defconst vcard-api-version "2.0")
+
+;; The vcard standards allow specifying the 

[elpa] externals/vcard 4bf38d79fc 05/13: (vcard-parse-string): Handle "key:field" type entries, i.e. no whitespace

[Stefan Monnier via]

branch: externals/vcard
commit 4bf38d79fc833ca951dc9042e2f3b7d105f060c9
Author: Noah Friedman 
Commit: Noah Friedman 

(vcard-parse-string): Handle "key:field" type entries, i.e. no whitespace
between key and field.  Communicator 4.1 seems to generate these.
---
 vcard.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vcard.el b/vcard.el
index 0d13bb4f4a..ad24f7e0ec 100644
--- a/vcard.el
+++ b/vcard.el
@@ -7,7 +7,7 @@
 ;; Keywords: extensions
 ;; Created: 1997-09-27
 
-;; $Id: vcard.el,v 1.4 1998/02/10 11:02:00 friedman Exp $
+;; $Id: vcard.el,v 1.5 1998/06/05 19:56:06 friedman Exp $
 
 ;; 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
@@ -53,6 +53,7 @@ Vcard data is normally in the form
 key2;subkey2: field1;field2;field3
 end:  vcard
 
+\(Whitespace after the colon separating the key and field is optional.\)
 If supplied to this function an alist of the form
 
 ((\"key1\" \"field\")
@@ -69,7 +70,7 @@ would be returned."
   (setq raw-pos (match-end 0))
   (while (and (< raw-pos (length raw))
   (string-match
-   "^[ \t]*\\([^:]+\\):[ \t]+\\(.*\\)[ \t]*[\n\r]+"
+   "^[ \t]*\\([^:]+\\):[ \t]*\\(.*\\)[ \t]*[\n\r]+"
raw raw-pos))
 (setq key (vcard-matching-substring 1 raw))
 (setq data (vcard-matching-substring 2 raw))

[elpa] externals/vcard updated (a85359ee83 -> 0200b96343)

[Stefan Monnier via]

monnier pushed a change to branch externals/vcard.

  from  a85359ee83 Use a different fix for parsing multiple cards, bump to 
0.2.1
   new  ef82e79ac7 *** empty log message ***
   new  f5df1907bb *** empty log message ***
   new  ec3986a43a *** empty log message ***
   new  a50b9e4395 (vcard-format-lines): Handle case where 2nd column has 
more lines than first column.
   new  4bf38d79fc (vcard-parse-string): Handle "key:field" type entries, 
i.e. no whitespace between key and field.  Communicator 4.1 seems to generate 
these.
   new  1399f2b8cb (vcard-format-box): Return empty string if no data to 
present; don't return borders.
   new  5f5af1f780 (vcard-parse-string): Bind case-fold-search to t. 
Downcase key for comparison purposes.
   new  d0ec40a5c6 Complete rewrite.
   new  a3e60e2883 (vcard-parse-region-value): Do not use `new-marker'; use 
`set-marker' and `make-marker' instead.
   new  c1fa6a26be (vcard-char-to-int): New defalias. 
(vcard-region-decode-base64-table): Use it. (vcard-region-decode-base64): Here 
too.
   new  6283103cc6 (vcard-hexstring-to-ascii): New macro. 
(vcard-region-decode-quoted-printable): Use it.
   new  49301aa94d Merge branch 'vcard-friedman' into externals/vcard Move 
the old `vcard.el` to `vcard-mode.el`.
   new  0200b96343 Adjust package to the new `vcard.el` file


Summary of changes:
 vcard.el => vcard-mode.el |  11 +-
 vcard-parse.el|   8 +-
 vcard.el  | 716 +++---
 3 files changed, 690 insertions(+), 45 deletions(-)
 copy vcard.el => vcard-mode.el (89%)

[elpa] externals/vcard 49301aa94d 12/13: Merge branch 'vcard-friedman' into externals/vcard

[Stefan Monnier via]

branch: externals/vcard
commit 49301aa94d70ce6f8eb186f501047d055932c67f
Merge: a85359ee83 6283103cc6
Author: Stefan Monnier 
Commit: Stefan Monnier 

Merge branch 'vcard-friedman' into externals/vcard
Move the old `vcard.el` to `vcard-mode.el`.
---
 vcard.el => vcard-mode.el |   6 +-
 vcard.el  | 712 +++---
 2 files changed, 679 insertions(+), 39 deletions(-)

diff --git a/vcard.el b/vcard-mode.el
similarity index 92%
copy from vcard.el
copy to vcard-mode.el
index 0eea42c8d4..c502ef2f8c 100644
--- a/vcard.el
+++ b/vcard-mode.el
@@ -1,6 +1,6 @@
-;;; vcard.el --- Package for handling vCard files  -*- lexical-binding: t; -*-
+;;; vcard-mode.el --- Package for handling vCard files  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2020  Free Software Foundation, Inc.
+;; Copyright (C) 2020-2022  Free Software Foundation, Inc.
 
 ;; Author: Eric Abrahamsen 
 ;; Maintainer: Eric Abrahamsen 
@@ -61,4 +61,4 @@
 (add-to-list 'auto-mode-alist '("\\.[Vv][Cc][Ff]\\'" . vcard-mode))
 
 (provide 'vcard)
-;;; vcard.el ends here
+;;; vcard-mode.el ends here
diff --git a/vcard.el b/vcard.el
index 0eea42c8d4..27eb3df643 100644
--- a/vcard.el
+++ b/vcard.el
@@ -1,64 +1,704 @@
-;;; vcard.el --- Package for handling vCard files  -*- lexical-binding: t; -*-
+;;; vcard.el --- vcard parsing and display routines
 
-;; Copyright (C) 2020  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2000 Noah S. Friedman
 
-;; Author: Eric Abrahamsen 
-;; Maintainer: Eric Abrahamsen 
+;; Author: Noah Friedman 
+;; Maintainer: fried...@splode.com
+;; Keywords: vcard, mail, news
+;; Created: 1997-09-27
 
-;; Version: 0.2.1
-;; Package-Requires: ((emacs "27.1"))
+;; $Id: vcard.el,v 1.11 2000/06/29 17:07:55 friedman Exp $
 
 ;; 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
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
 ;; This program 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 this program.  If not, see .
+;; along with this program; if not, you can either send email to this
+;; program's maintainer or write to: The Free Software Foundation,
+;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
-;; This file contains `vcard-mode', for viewing vCard files.  Other
-;; files in this package contain functions for parsing and writing
-;; vCard data.
+;; Unformatted vcards are just plain ugly.  But if you live in the MIME
+;; world, they are a better way of exchanging contact information than
+;; freeform signatures since the former can be automatically parsed and
+;; stored in a searchable index.
+;;
+;; This library of routines provides the back end necessary for parsing
+;; vcards so that they can eventually go into an address book like BBDB
+;; (although this library does not implement that itself).  Also included
+;; is a sample pretty-printer which MUAs can use which do not provide their
+;; own vcard formatters.
+
+;; This library does not interface directly with any mail user agents.  For
+;; an example of bindings for the VM MUA, see vm-vcard.el available from
+;;
+;;http://www.splode.com/~friedman/software/emacs-lisp/index.html#mail
+;;
+;; Updates to vcard.el should be available there too.
+
+;; The main entry point to this package is `vcard-pretty-print' although
+;; any documented variable or function is considered part of the API for
+;; operating on vcard data.
+
+;; The vcard 2.1 format is defined by the versit consortium.
+;; See http://www.imc.org/pdi/vcard-21.ps
+;;
+;; RFC 2426 defines the vcard 3.0 format.
+;; See ftp://ftp.rfc-editor.org/in-notes/rfc2426.txt
+
+;; A parsed vcard is a list of attributes of the form
+;;
+;; (proplist value1 value2 ...)
+;;
+;; Where proplist is a list of property names and parameters, e.g.
+;;
+;; (property1 (property2 . parameter2) ...)
+;;
+;; Each property has an associated implicit or explicit parameter value
+;; (not to be confused with attribute values; in general this API uses
+;; `parameter' to refer to property values and `value' to refer to attribute
+;; values to avoid confusion).  If a property has no explicit parameter value,
+;; the parameter value is considered to be `t'.  Any property which does not
+;; exist for an attribute is considered to have a nil parameter.
+
+;; TODO:
+;;   * Finish supporting the 3.0 extensions.
+;; Currently, only the 2.1 standard is supported.
+;;   * Handle nested vcards an

[elpa] externals/vcard 5f5af1f780 07/13: (vcard-parse-string): Bind case-fold-search to t.

[Stefan Monnier via]

branch: externals/vcard
commit 5f5af1f780654aba6b8e3689921995a28a74f077
Author: Noah Friedman 
Commit: Noah Friedman 

(vcard-parse-string): Bind case-fold-search to t.
Downcase key for comparison purposes.
---
 vcard.el | 19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/vcard.el b/vcard.el
index 58662c6c92..74ff63497d 100644
--- a/vcard.el
+++ b/vcard.el
@@ -1,13 +1,13 @@
 ;;; vcard.el --- vcard parsing and display routines
 
-;; Copyright (C) 1997 Noah S. Friedman
+;; Copyright (C) 1997, 1999 Noah S. Friedman
 
 ;; Author: Noah Friedman 
 ;; Maintainer: fried...@splode.com
 ;; Keywords: extensions
 ;; Created: 1997-09-27
 
-;; $Id: vcard.el,v 1.6 1998/07/21 20:35:40 friedman Exp $
+;; $Id: vcard.el,v 1.7 1999/10/25 05:49:12 friedman Exp $
 
 ;; 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
@@ -29,6 +29,11 @@
 ;; The display routines here are just an example.  The primitives in the
 ;; first section can be used to construct other vcard formatters.
 
+;; The vcard 2.1 format is defined by the versit consortium.
+;; See http://www.imc.org/pdi/vcard-21.ps
+;; RFC 2426 defines the vcard 3.0 format.
+;; See ftp://ftp.rfc-editor.org/in-notes/rfc2426.txt
+
 ;;; Code:
 
 (defvar vcard-standard-filters '(vcard-filter-html)
@@ -63,7 +68,8 @@ If supplied to this function an alist of the form
 
 would be returned."
   (save-match-data
-(let ((raw-pos 0)
+(let ((case-fold-search t)
+  (raw-pos 0)
   (vcard-data nil)
   key data)
   (string-match "^[ \t]*begin:[ \t]*vcard[ \t]*[\r\n]+" raw raw-pos)
@@ -72,7 +78,7 @@ would be returned."
   (string-match
"^[ \t]*\\([^:]+\\):[ \t]*\\(.*\\)[ \t]*[\n\r]+"
raw raw-pos))
-(setq key (vcard-matching-substring 1 raw))
+(setq key (downcase (vcard-matching-substring 1 raw)))
 (setq data (vcard-matching-substring 2 raw))
 (setq raw-pos (match-end 0))
 (cond
@@ -147,7 +153,8 @@ keys."
 ;; If any key is not present in an alist, the key and value pair will be
 ;; inserted into the parent alist.
 (defun vcard-set-alist-slot (alist key-list value)
-  (let* ((key (car key-list))
+  (let* ((orig-key-list key-list)
+ (key (car key-list))
  (elt (assoc key alist)))
 (setq key-list (cdr key-list))
 (cond ((and (cdr elt) key-list)
@@ -157,7 +164,7 @@ keys."
   (elt (setcdr elt value))
   (t
(let ((new))
- (setq key-list (nreverse (cons key key-list)))
+ (setq key-list (reverse orig-key-list))
  (while key-list
(if new
(setq new (cons (car key-list) (cons new nil)))

[elpa] externals/vcard 6283103cc6 11/13: (vcard-hexstring-to-ascii): New macro.

[Stefan Monnier via]

branch: externals/vcard
commit 6283103cc6ff1324458212c55244222b9b49e54f
Author: Noah Friedman 
Commit: Noah Friedman 

(vcard-hexstring-to-ascii): New macro.
(vcard-region-decode-quoted-printable): Use it.
---
 vcard.el | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/vcard.el b/vcard.el
index 90014663fd..27eb3df643 100644
--- a/vcard.el
+++ b/vcard.el
@@ -7,7 +7,7 @@
 ;; Keywords: vcard, mail, news
 ;; Created: 1997-09-27
 
-;; $Id: vcard.el,v 1.10 2000/02/23 19:39:15 friedman Exp $
+;; $Id: vcard.el,v 1.11 2000/06/29 17:07:55 friedman Exp $
 
 ;; 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
@@ -468,6 +468,11 @@ US domestic telephone numbers are replaced with 
international format."
 
 ;;; Decoding methods.
 
+(defmacro vcard-hexstring-to-ascii (s)
+  (if (string-lessp emacs-version "20")
+  `(format "%c" (car (read-from-string (format "?\\x%s" ,s
+`(format "%c" (string-to-number ,s 16
+
 (defun vcard-region-decode-quoted-printable (&optional beg end)
   (save-excursion
 (save-restriction
@@ -479,7 +484,7 @@ US domestic telephone numbers are replaced with 
international format."
 (goto-char (point-min))
 (while (re-search-forward "=[0-9A-Za-z][0-9A-Za-z]" nil t)
   (let ((s (buffer-substring (1+ (match-beginning 0)) (match-end 0
-(replace-match (format "%c" (string-to-number s 16)) t t)))
+(replace-match (vcard-hexstring-to-ascii s) t t)))
 
 (defun vcard-region-decode-base64 (&optional beg end)
   (save-restriction

[elpa] externals/denote 08fa8b2239: Update to version 0.3.1 to fix an error in the manual

[ELPA Syncer]

branch: externals/denote
commit 08fa8b223926b6aee1549b87602d6bf3ac284d8b
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Update to version 0.3.1 to fix an error in the manual

Thanks to Sven Seebeck for reporting the error on the TMR mailing list:

.
---
 README.org| 2 +-
 denote-dired.el   | 2 +-
 denote-faces.el   | 2 +-
 denote-link.el| 2 +-
 denote-org-capture.el | 2 +-
 denote-retrieve.el| 2 +-
 denote.el | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.org b/README.org
index 3bf220c57b..1a35a3a757 100644
--- a/README.org
+++ b/README.org
@@ -1001,7 +1001,7 @@ The `tmr' command is part of the `tmr' package."
   (denote
(format-time-string "%A %e %B %Y")
'("journal"))
-  (tmr 10 "Practice writing in my journal")) ; set 10 minute timer with a 
description
+  (tmr "10" "Practice writing in my journal")) ; set 10 minute timer with a 
description
 #+end_src
 
 Once the timer elapses, stop writing and review your performance.
diff --git a/denote-dired.el b/denote-dired.el
index 886d067881..31f7884597 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Denote Development <~protesilaos/den...@lists.sr.ht>
 ;; URL: https://git.sr.ht/~protesilaos/denote
 ;; Mailing-List: https://lists.sr.ht/~protesilaos/denote
-;; Version: 0.3.0
+;; Version: 0.3.1
 ;; Package-Requires: ((emacs "27.2"))
 
 ;; This file is NOT part of GNU Emacs.
diff --git a/denote-faces.el b/denote-faces.el
index 54d509bb94..48e3f75f9e 100644
--- a/denote-faces.el
+++ b/denote-faces.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Denote Development <~protesilaos/den...@lists.sr.ht>
 ;; URL: https://git.sr.ht/~protesilaos/denote
 ;; Mailing-List: https://lists.sr.ht/~protesilaos/denote
-;; Version: 0.3.0
+;; Version: 0.3.1
 ;; Package-Requires: ((emacs "27.2"))
 
 ;; This file is NOT part of GNU Emacs.
diff --git a/denote-link.el b/denote-link.el
index 1b316b9bac..4dd0298dd1 100644
--- a/denote-link.el
+++ b/denote-link.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Denote Development <~protesilaos/den...@lists.sr.ht>
 ;; URL: https://git.sr.ht/~protesilaos/denote
 ;; Mailing-List: https://lists.sr.ht/~protesilaos/denote
-;; Version: 0.3.0
+;; Version: 0.3.1
 ;; Package-Requires: ((emacs "27.2"))
 
 ;; This file is NOT part of GNU Emacs.
diff --git a/denote-org-capture.el b/denote-org-capture.el
index 3f96d76aba..c62594fe51 100644
--- a/denote-org-capture.el
+++ b/denote-org-capture.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Denote Development <~protesilaos/den...@lists.sr.ht>
 ;; URL: https://git.sr.ht/~protesilaos/denote
 ;; Mailing-List: https://lists.sr.ht/~protesilaos/denote
-;; Version: 0.3.0
+;; Version: 0.3.1
 ;; Package-Requires: ((emacs "27.2"))
 
 ;; This file is NOT part of GNU Emacs.
diff --git a/denote-retrieve.el b/denote-retrieve.el
index 56a5f30c57..7b78b4046a 100644
--- a/denote-retrieve.el
+++ b/denote-retrieve.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Denote Development <~protesilaos/den...@lists.sr.ht>
 ;; URL: https://git.sr.ht/~protesilaos/denote
 ;; Mailing-List: https://lists.sr.ht/~protesilaos/denote
-;; Version: 0.3.0
+;; Version: 0.3.1
 ;; Package-Requires: ((emacs "27.2"))
 
 ;; This file is NOT part of GNU Emacs.
diff --git a/denote.el b/denote.el
index 6f1b7045d8..54ae621df4 100644
--- a/denote.el
+++ b/denote.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Denote Development <~protesilaos/den...@lists.sr.ht>
 ;; URL: https://git.sr.ht/~protesilaos/denote
 ;; Mailing-List: https://lists.sr.ht/~protesilaos/denote
-;; Version: 0.3.0
+;; Version: 0.3.1
 ;; Package-Requires: ((emacs "27.2"))
 
 ;; This file is NOT part of GNU Emacs.