[elpa] externals/doric-themes 3bbeb8f116 1/2: Make subset prompt use read-multiple-choice

[ELPA Syncer]

branch: externals/doric-themes
commit 3bbeb8f1161b5a298b10c8bd7f5acd82a8bc5077
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Make subset prompt use read-multiple-choice

This is how I do it for my other themes as well. It is the better
approach when there are only two options.
---
 doric-themes.el | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/doric-themes.el b/doric-themes.el
index a10452af65..06b3bd61fa 100644
--- a/doric-themes.el
+++ b/doric-themes.el
@@ -259,18 +259,17 @@ respectively."
 (delete current-theme themes)
   themes)))
 
-(defvar doric-themes-subset-history nil
-  "Minibuffer history for `doric-themes-subset-prompt'.")
+(make-obsolete-variable 'doric-themes-subset-history nil "0.2.0")
 
 (defun doric-themes-subset-prompt ()
   "Select `dark' or `light' and return it as a symbol."
-  (let ((default (car doric-themes-subset-history)))
-(intern
- (completing-read
-  (format-prompt "Select variant" default)
-  '("dark" "light")
-  nil :require-match nil
-  doric-themes-subset-history default
+  (intern
+   (cadr
+(read-multiple-choice
+ "Variant"
+ '((?d "dark" "Load a random dark theme")
+   (?l "light" "Load a random light theme"))
+ "Limit to the dark or light subset of the Ef themes collection."
 
 ;;;###autoload
 (defun doric-themes-load-random (&optional variant)

[elpa] externals/doric-themes 9c48c20c93 2/2: Make read-multiple-choice-face easier to notice

[ELPA Syncer]

branch: externals/doric-themes
commit 9c48c20c939c83bc1f057fb510ddac57eefe54aa
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Make read-multiple-choice-face easier to notice
---
 doric-themes.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doric-themes.el b/doric-themes.el
index 06b3bd61fa..f9483102af 100644
--- a/doric-themes.el
+++ b/doric-themes.el
@@ -319,7 +319,6 @@ Run `doric-themes-after-load-theme-hook' after loading a 
theme."
 org-dispatcher-highlight
 proced-marked
 pulse-highlight-start-face
-read-multiple-choice-face
 rectangle-preview
 speedbar-highlight-face
 tab-bar-tab-highlight
@@ -1301,7 +1300,7 @@ Run `doric-themes-after-load-theme-hook' after loading a 
theme."
 `(tty-menu-disabled-face ((t :background ,bg-accent :foreground 
,fg-shadow-subtle)))
 `(tty-menu-enabled-face ((t :background ,bg-accent :foreground 
,fg-main)))
 `(tty-menu-selected-face ((t :background ,fg-main :foreground 
,bg-main)))
-
+`(read-multiple-choice-face ((t :inherit bold-italic :background 
,fg-shadow-intense :foreground ,bg-main)))
 
 '(adoc-meta-face ((t :inherit fixed-pitch)))
 '(adoc-meta-hide-face ((t :inherit fixed-pitch)))

[nongnu] elpa/gnuplot 0b246cf306 04/19: Formatting

[ELPA Syncer]

branch: elpa/gnuplot
commit 0b246cf3062ad02121bc8ee390585ee18cac0891
Author: Daniel Mendler 
Commit: Daniel Mendler 

Formatting
---
 gnuplot-context.el   | 23 +--
 gnuplot-debug-context.el | 16 
 gnuplot-gui.el   | 32 ++--
 gnuplot-test-context.el  |  1 -
 gnuplot-tests.el | 12 ++--
 gnuplot.el   | 30 --
 6 files changed, 37 insertions(+), 77 deletions(-)

diff --git a/gnuplot-context.el b/gnuplot-context.el
index 47d995a37d..712ac9e88d 100644
--- a/gnuplot-context.el
+++ b/gnuplot-context.el
@@ -253,9 +253,9 @@
 (let ((str (match-string-no-properties 0)))
   (forward-char (length str))
   (gnuplot-context--token-make :id str
-  :type ',token-type
-  :start (match-beginning 0)
-  :end (match-end 0))
+   :type ',token-type
+   :start (match-beginning 0)
+   :end (match-end 0))
   rules
 
 (defun gnuplot-context--tokenize (&optional completing-p)
@@ -320,7 +320,6 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
 
 (nreverse tokens)))
 
-
 
  The pattern and grammar compiler
 ;;
@@ -410,7 +409,6 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
 ;;  for debugging purposes.
 ;;
 
-
 (eval-and-compile
   ;; Compile a single pattern into a list of instructions. Leaves
   ;; calls to other rules as symbolic instructions (call SYMBOL) and
@@ -503,7 +501,6 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
  (gnuplot-context--compile-pattern
   `(sequence ,@pat1 (many ,@pat1)
 
-
   ;; Optional (?)
   ((maybe)
(let* ((pat1 (cons 'sequence (cdr pat)))
@@ -1651,7 +1648,6 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
"zzeroaxis")
(maybe linestyle-spec)])
 
-
 ;;; Other commands
  (cd-command
   ["cd" string])
@@ -1715,7 +1711,6 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
 (defmacro gnuplot-context--trace (&rest _) "No-op." '(progn nil))
 (defmacro gnuplot-context--debug (&rest _) "No-op." '(progn nil
 
-
 
  Variables to be set via pattern matching
 (defvar gnuplot-context--completions nil
@@ -1754,7 +1749,7 @@ These have to be compiled from the Gnuplot source tree 
using
 
  The pattern matching machine
 (defun gnuplot-context--match-pattern (instructions tokens completing-p
-   &optional start-symbol)
+&optional start-symbol)
   "Parse TOKENS, setting completions, info and ElDoc information.
 
 This function parses TOKENS by simulating a stack machine with
@@ -1794,11 +1789,11 @@ there."
 gnuplot-context--captures nil)
 
   (cl-flet ((advance
-  ()
-  (pop tokens)
-  (if (and (null tokens) (not completing-p))
-  (gnuplot-context--scan-stack stack tokens)))
- (fail () (setq fail t)))
+  ()
+  (pop tokens)
+  (if (and (null tokens) (not completing-p))
+  (gnuplot-context--scan-stack stack tokens)))
+(fail () (setq fail t)))
 
 ;; Main loop
 (while t
diff --git a/gnuplot-debug-context.el b/gnuplot-debug-context.el
index 3c7815fa8d..f5a0f44c66 100644
--- a/gnuplot-debug-context.el
+++ b/gnuplot-debug-context.el
@@ -98,14 +98,14 @@
   (gnuplot-context--with-trace-buffer
(insert "\n-- * capture groups: * --\n")
(cl-loop for c on gnuplot-context--captures
- do
- (let ((name (caar c))
-   (gnuplot-context--captures c))
-   (insert (format "%s\t%s\n"
-   name
-   (mapconcat 'gnuplot-context--token-id
-  (gnuplot-context--capture-group name)
-  " ")
+do
+(let ((name (caar c))
+  (gnuplot-context--captures c))
+  (insert (format "%s\t%s\n"
+  name
+  (mapconcat 'gnuplot-context--token-id
+ (gnuplot-context--capture-group 
name)
+ " ")
(insert "-- end capture groups  --\n\n"
 
 (provide 'gnuplot-debug-context)
diff --git a/gnuplot-gui.el b/gnuplot-gui.el
index 0ce6f9df05..

[nongnu] elpa/gnuplot 53972e4ffc 15/19: Remove author tags

[ELPA Syncer]

branch: elpa/gnuplot
commit 53972e4ffcfaf15c8551657630bec1e3f7a480d3
Author: Daniel Mendler 
Commit: Daniel Mendler 

Remove author tags

Some are outdated and we can use the git history and git blame for that.
---
 gnuplot-gui.el |  4 ++--
 gnuplot.el | 21 +
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/gnuplot-gui.el b/gnuplot-gui.el
index 6a098148c9..b18ea7ae60 100644
--- a/gnuplot-gui.el
+++ b/gnuplot-gui.el
@@ -275,7 +275,7 @@ See the doc-string for `gnuplot-gui-all-types'.")
   '(("POINTSIZE"'number " ")
 ("LINEWIDTH"'number " ")
 ("INTERVAL "'number " ")))
-(cons "vgagl"   ; for pm3d patch (also persist, raise in x11) 

+(cons "vgagl"   ; for pm3d patch (also persist, raise in x11)
   '(("BACKGROUND"   'position  " " "background" 3)
 ("INTERPOLATION"'list " " "uniform" "interpolate")
 ("DUMP" 'file " ")
@@ -439,7 +439,7 @@ See the doc-string for `gnuplot-gui-all-types'.")
 (cons "mx2tics" gnuplot-gui-mtics-list)
 (cons "my2tics" gnuplot-gui-mtics-list)
 
-; pm3d additions 
+; pm3d additions
 (cons "mouse"
   '(("DOUBLECLICK" 'number " " "doubleclick")
 ("ZOOM"'list   " " "zoomcoordinates" 
"nozoomcoordinates")
diff --git a/gnuplot.el b/gnuplot.el
index bc0d4171ba..256437f3d2 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -503,7 +503,7 @@ create a `gnuplot-mode' buffer."
 ["logscale"   (gnuplot-insert "set logscale ")   t]
 ["multiplot"  (gnuplot-insert "set multiplot")   t]
 ["missing"(gnuplot-insert "set missing \"\"")t]
-["palette"(gnuplot-insert "set palette ")t] ; 
+["palette"(gnuplot-insert "set palette ")t]
 ["pm3d"   (gnuplot-insert "set pm3d ")   t]
 ["offsets"(gnuplot-insert "set offsets ")t]
 ["output" (gnuplot-insert "set output ") t]
@@ -865,7 +865,7 @@ These are highlighted using `font-lock-constant-face'.")
 
 ;; Set up colorization for gnuplot.
 (defvar gnuplot-font-lock-keywords
-  `(; stuff in brackets, sugg. by 
+  `(; stuff in brackets
 ("\\[\\([^]]+\\)\\]" (1 'font-lock-constant-face))
 
 ;; variable/function definitions
@@ -876,7 +876,7 @@ These are highlighted using `font-lock-constant-face'.")
 (,(gnuplot--make-regexp gnuplot-keywords-builtin-functions)
  (0 'font-lock-function-name-face))
 
-;; reserved words associated with plotting 
+;; reserved words associated with plotting
 (,(gnuplot--make-regexp gnuplot-keywords-plotting)
  (0 'font-lock-type-face))
 (,(gnuplot--make-regexp gnuplot-keywords-plotting-styles)
@@ -1096,7 +1096,7 @@ This sets `gnuplot-recently-sent' to `line'."
  (let (start end)
(save-excursion
  ;; go to start of continued command, or beginning of line
- ;; if this is not a continuation of a previous line 
+ ;; if this is not a continuation of a previous line
  (gnuplot--beginning-of-continuation)
  (setq start (point))
  (end-of-line)
@@ -1127,7 +1127,7 @@ NUM is optional arg."
 (while (> num 0)
   (setq end (gnuplot-send-line-to-gnuplot))
   (goto-char end)
-  (backward-char 1) ; 
+  (backward-char 1)
   (gnuplot-forward-script-line 1)
   (setq num (1- num)
 
@@ -1138,7 +1138,7 @@ NUM is optional arg."
   (gnuplot-send-line-to-gnuplot)
   (insert "\n"))
 
-(defun gnuplot-forward-script-line (&optional num) ; 
+(defun gnuplot-forward-script-line (&optional num)
   "Move forward my NUM script lines.
 Blank lines and commented lines are not included in the NUM count."
   (interactive "p")
@@ -1168,7 +1168,6 @@ This sets `gnuplot-recently-sent' to `file'."
 (gnuplot--make-comint-buffer)   ; make sure a gnuplot buffer exists
 (gnuplot-send-string-to-gnuplot string 'file)))
 
-;; suggested by 
 (defun gnuplot-plot-from-comint ()
   "Send the contents of a script to gnuplot from the process buffer.
 This inserts the contents of the most recently used gnuplot script
@@ -1344,7 +1343,7 @@ STRING is the text as originally inserted in the comint 
buffer."
 (defun gnuplot--close-down ()
   "Tidy up when deleting the gnuplot buffer."
   (if (and gnuplot-process
-   (eq (process-status gnuplot-process) 'run)) ; 
+   (eq (process-status gnuplot-process) 'run))
   (kill-process gnuplot-process))
   (setq gnuplot-process nil
 gnuplot-buffer nil))
@@ -1361,7 +1360,7 @@ This is very similar to `comint-delchar-or-maybe-eof'."
   "Kill the gnuplot process and its display buffers."
   (interactive)
   (if (a

[nongnu] elpa/gnuplot updated (993ff274dd -> 91995e982d)

[ELPA Syncer]

elpasync pushed a change to branch elpa/gnuplot.

  from  993ff274dd Try to load gnuplot-eldoc without an error for now
   new  e54c3d7feb Move gnuplot-token to private gnuplot-context namespace
   new  5566dee948 Update elpaignore and gitignore
   new  313cc4fb3f Cleanup autoloads
   new  0b246cf306 Formatting
   new  ef5bd75a02 Rename commands for clarity
   new  8ec2839fcf Unbind comment-region
   new  c6a19ec1e6 Unbind indent-for-tab-comamnd (default binding)
   new  7dd9346dce Remove gnuplot-prompt-face
   new  d05584d089 Remove severely outdated gpelcard
   new  ba4e8938d7 Update README
   new  e3dde0e24b Update outdated commentary
   new  be71817b43 Update changelog
   new  dad0462cd0 Version 0.9
   new  a950dcb53a Remove Local variables
   new  53972e4ffc Remove author tags
   new  6ab9c7d2c2 Commentary: Update acknowledgments
   new  7c801260cd Update acknowledgments
   new  7600721610 Drop obsoletions
   new  91995e982d Update README


Summary of changes:
 .elpaignore  |   3 +-
 .gitignore   |  11 +-
 CHANGELOG.org|  33 ++--
 README.org   | 107 +--
 gnuplot-context.el   |  62 +++
 gnuplot-debug-context.el |  20 +-
 gnuplot-gui.el   |  59 +++---
 gnuplot-test-context.el  |  14 +-
 gnuplot-tests.el |  16 +-
 gnuplot.el   | 214 +++--
 gpelcard.tex | 471 ---
 11 files changed, 207 insertions(+), 803 deletions(-)
 delete mode 100644 gpelcard.tex

[nongnu] elpa/gnuplot 91995e982d 19/19: Update README

[ELPA Syncer]

branch: elpa/gnuplot
commit 91995e982db3509ea77595359932f62608cb9acc
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update README
---
 README.org | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.org b/README.org
index f7e5de8295..c95f597704 100644
--- a/README.org
+++ b/README.org
@@ -20,13 +20,14 @@ using gnuplot version 5.0 or above.
 
 * Installation
 
-The easiest way to install =gnuplot-mode= is to directly get it from 
[[https://elpa.nongnu.org/][NonGNU ELPA]]
-or [[http://melpa.org][MELPA]]. After configuring Emacs to use MELPA, you 
should be able to install
-gnuplot-mode by typing
+The easiest way to install =gnuplot= is to directly get it from 
[[https://elpa.nongnu.org/][NonGNU ELPA]] or
+[[http://melpa.org][MELPA]]. After configuring Emacs to use MELPA, you should 
be able to install
+=gnuplot= by typing
 
 : M-x install-package RET gnuplot RET
 
-or do =M-x list-packages= and search for =gnuplot= in the list.
+or do =M-x list-packages= and search for =gnuplot= in the list. Note that 
there is
+an alternative =gnuplot-mode= package on MELPA which is less featureful.
 
 * Configuration
 

[nongnu] elpa/gnuplot ef5bd75a02 05/19: Rename commands for clarity

[ELPA Syncer]

branch: elpa/gnuplot
commit ef5bd75a02485b417cc5f683690ec4216ae55a99
Author: Daniel Mendler 
Commit: Daniel Mendler 

Rename commands for clarity
---
 README.org |  2 +-
 gnuplot.el | 43 +++
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/README.org b/README.org
index 72b726e8b6..d2e6a94930 100644
--- a/README.org
+++ b/README.org
@@ -58,7 +58,7 @@ When =gnuplot-mode= is on, the following keybindings are 
available:
 | C-c C-o   | set arguments for command at point   |
 | S-mouse-2 | set arguments for command under mouse cursor |
 | C-c C-d   | read the gnuplot info file   |
-| C-c C-e   | show-gnuplot-buffer  |
+| C-c C-e   | show gnuplot buffer  |
 | C-c C-k   | kill gnuplot process |
 | C-c C-z   | customize gnuplot-mode   |
 | M-tab | complete keyword before point|
diff --git a/gnuplot.el b/gnuplot.el
index 1a4308e494..ddf84e9fb2 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -107,7 +107,7 @@
   :group 'gnuplot-hooks
   :type 'hook)
 
-(defcustom gnuplot-after-plot-hook (list #'gnuplot-trim-gnuplot-buffer)
+(defcustom gnuplot-after-plot-hook (list #'gnuplot-trim-comint-buffer)
   "Hook run after gnuplot plots something.
 This is the last thing done by the functions for plotting a line, a
 region, a buffer, or a file."
@@ -346,12 +346,12 @@ non-nil."
 (define-key map "\C-c\C-b"#'gnuplot-send-buffer-to-gnuplot)
 (define-key map "\C-c\C-c"#'comment-region) ; 
 (define-key map "\C-c\C-o"#'gnuplot-gui-set-options-and-insert)
-(define-key map "\C-c\C-e"#'gnuplot-show-gnuplot-buffer)
+(define-key map "\C-c\C-e"#'gnuplot-show-comint-buffer)
 (define-key map "\C-c\C-f"#'gnuplot-send-file-to-gnuplot)
 (define-key map "\C-c\C-d"#'gnuplot-info-lookup-symbol)
 (define-key map "\C-c\C-i"#'gnuplot-insert-filename)
 (define-key map "\C-c\C-j"#'gnuplot-forward-script-line)
-(define-key map "\C-c\C-k"#'gnuplot-kill-gnuplot-buffer)
+(define-key map "\C-c\C-k"#'gnuplot-kill-comint-buffer)
 (define-key map "\C-c\C-l"#'gnuplot-send-line-to-gnuplot)
 (define-key map "\C-c\C-n"#'gnuplot-negate-option)
 (define-key map "\C-c\C-r"#'gnuplot-send-region-to-gnuplot)
@@ -414,13 +414,13 @@ non-nil."
 ["Info documentation on thing at point"
  gnuplot-info-at-point
  gnuplot-context-sensitive-mode]
-["Show gnuplot process buffer"  gnuplot-show-gnuplot-buffer t]
+["Show gnuplot process buffer"  gnuplot-show-comint-buffer t]
 ["Set arguments at point"   gnuplot-gui-set-options-and-insert t]
 ["Swap plot/splot/fit lists in GUI" gnuplot-gui-swap-simple-complete t]
 "---"
 ["Customize gnuplot"gnuplot-customize t]
 "---"
-["Kill gnuplot" gnuplot-kill-gnuplot-buffer t])
+["Kill gnuplot" gnuplot-kill-comint-buffer t])
   "Menu for `gnuplot-mode'.")
 
 
@@ -1042,7 +1042,7 @@ the type of text being sent to gnuplot and is typically 
one of
 nil, `line', `region', `buffer', or `file'.  TEXT may be useful for
 functions in `gnuplot-after-plot-hook'.  `gnuplot-after-plot-hook' is
 called by this function after all of STRING is sent to gnuplot."
-  (gnuplot--make-gnuplot-buffer) ; make sure a gnuplot buffer exists
+  (gnuplot--make-comint-buffer) ; make sure a gnuplot buffer exists
   (setq gnuplot-comint-recent-buffer (current-buffer))
 
   ;; Create a gnuplot frame if needed
@@ -1070,16 +1070,16 @@ called by this function after all of STRING is sent to 
gnuplot."
 (goto-char (point-max
 
 (cond ((equal gnuplot-display-process 'window)
-   (gnuplot--display-and-recenter-gnuplot-buffer))
+   (gnuplot--display-and-recenter-comint-buffer))
   ((equal gnuplot-display-process 'frame)
;;(raise-frame gnuplot-process-frame)
(with-selected-frame gnuplot-process-frame
- (gnuplot--display-and-recenter-gnuplot-buffer
+ (gnuplot--display-and-recenter-comint-buffer
 
 (setq gnuplot-recently-sent text)
 (run-hooks 'gnuplot-after-plot-hook)))
 
-(defun gnuplot--display-and-recenter-gnuplot-buffer ()
+(defun gnuplot--display-and-recenter-comint-buffer ()
   "Make sure the gnuplot comint buffer is displayed.
 Move point to the end if necessary."
   (save-selected-window
@@ -1183,7 +1183,7 @@ This sets `gnuplot-recently-sent' to `file'."
   (let ((string (read-file-name "Name of file to send to gnuplot > " nil nil 
t)))
 (setq string (concat "load '" (expand-file-name string) "'\n"))
 (message "%S" string)
-(gnuplot--make-gnuplot-buffer)   ; make sure a gnuplot buffer exists
+(gnuplot--make-comint-buffer)   ; make sure a gnuplot buffer exists

[nongnu] elpa/gnuplot d05584d089 09/19: Remove severely outdated gpelcard

[ELPA Syncer]

branch: elpa/gnuplot
commit d05584d089ec39e69efa0be45af9c92c0a684952
Author: Daniel Mendler 
Commit: Daniel Mendler 

Remove severely outdated gpelcard
---
 .elpaignore  |   3 +-
 .gitignore   |   4 -
 gpelcard.tex | 471 ---
 3 files changed, 1 insertion(+), 477 deletions(-)

diff --git a/.elpaignore b/.elpaignore
index 5fb3b1b6b2..bb49ef5f40 100644
--- a/.elpaignore
+++ b/.elpaignore
@@ -3,8 +3,7 @@
 .gitignore
 LICENSE
 Makefile
+doc2texi.el
 gnuplot-debug-context.el
 gnuplot-test-context.el
 gnuplot-tests.el
-gpelcard.tex
-doc2texi.el
diff --git a/.gitignore b/.gitignore
index 5703cbe19e..3cfc130a17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
-*.aux
-*.dvi
 *.elc
-*.log
-*.pdf
 *.tar.*
 *~
 \#*\#
diff --git a/gpelcard.tex b/gpelcard.tex
deleted file mode 100644
index 54415d7674..00
--- a/gpelcard.tex
+++ /dev/null
@@ -1,471 +0,0 @@
-%% Time-stamp: <2011-09-13 10:22:26 bruce>
-
-%% This document is copyright (C) 1998-2002, 2011 Bruce Ravel
-%% This page covers version 0.7.0 of gnuplot-mode.
-
-%% This document is distributed in the hope that it will be useful,
-%% but WITHOUT ANY WARRANTY; without even the implied warranty of
-%% properly describing the software it documents.
-
-%% Permission is granted to make and distribute copies of this
-%% document in electronic form provided the copyright notice and this
-%% permission are preserved on all copies.
-
-
-\documentclass[twocolumn]{article}
-\usepackage{fancybox}
-
-\setlength{\parindent}{0truecm}
-\setlength{\parskip}{1ex}
-\setlength{\hoffset}{-0.5truecm}
-\setlength{\voffset}{0truecm}
-\setlength{\topmargin}{-2.5truecm}
-\setlength{\marginparsep}{0truecm}
-\setlength{\marginparwidth}{0truecm}
-\setlength{\textheight}{25.5truecm}
-\setlength{\textwidth}{17truecm}
-\setlength{\oddsidemargin}{0truecm}
-\setlength{\evensidemargin}{1.2truecm}
-\setlength{\columnsep}{1.4truecm}
-
-\newenvironment{Boxedminipage}%
-{\begin{Sbox}\begin{minipage}}%
-  {\end{minipage}\end{Sbox}\Ovalbox{\TheSbox}}
-\newenvironment{SqBoxedminipage}%
-{\begin{Sbox}\begin{minipage}}%
-  {\end{minipage}\end{Sbox}\fbox{\TheSbox}}
-
-\def\version{{0.6.1}}
-\def\revised{{13 September, 2011}}
-\def\file#1{{\texttt{`#1'}}}
-\def\key#1{{\textrm \leavevmode\hbox{%
-  \raise0.4pt\hbox{$\langle$}\kern-.08em\vtop{%
-\vbox{\hrule\kern-0.4pt
- \hbox{\raise0.4pt\hbox{\vphantom{$\langle$}}#1}}%
-\kern-0.4pt\hrule}%
-  \kern-.06em\raise0.4pt\hbox{$\rangle$
-\def\variable#1#2#3{{
-\vspace{-0.2truecm}
-\begin{flushright}
-  \begin{minipage}[h]{0.97\linewidth}
-\vspace{-0.2truecm}
-\textbf{#1}\hfill[\texttt{#2}]
-\begin{flushright}
-  \begin{minipage}[h]{0.93\linewidth}
-\vspace{-0.2truecm}
-#3
-  \end{minipage}
-\end{flushright}
-  \end{minipage}
-\end{flushright}
-}}
-\def\command#1#2{{
-\vspace{-0.2truecm}
-\begin{flushright}
-  \begin{minipage}[h]{0.97\linewidth}
-\vspace{-0.2truecm}
-\textbf{#1}\hfill
-\begin{flushright}
-  \begin{minipage}[h]{0.93\linewidth}
-\vspace{-0.4truecm}
-#2
-  \end{minipage}
-\end{flushright}
-  \end{minipage}
-\end{flushright}
-}}
-\def\Star{{$\star$}}
-
-
-\begin{document}
-
-\small
-
-\thispagestyle{empty}
-
-\begin{center}
-  \begin{Boxedminipage}{0.75\linewidth}
-\begin{center}
-  \vspace{0.01\textheight}
-  {\Large Quick Reference for}\\
-  \vspace{0.007\textheight}
-  {\Large gnuplot-mode}
-  \vspace{0.01\textheight}
-\end{center}
-  \end{Boxedminipage}
-\end{center}
-
-\vspace{3ex}
-
-This card describes the features of gnuplot-mode for Emacs.
-Gnuplot-mode is intended for composing scripts for the
-\textsc{gnuplot} plotting program.  It offers functions for sending
-commands or entire scripts to the \textsc{gnuplot} program as well as
-various functions to aid in composing scripts.  It works with any
-version of \textsc{gnuplot} above 3.5.  See the comments in the
-file \file{gnuplot.el} for instructions on installing gnuplot-mode.
-
-\vspace{2ex}
-
-\begin{minipage}[h]{\linewidth}
-  \begin{center}
-\centerline{{\large\textbf{gnuplot-mode key sequences}}}
-\vspace{0.2ex}
-\begin{tabular}[h]{cl}
-  \hline \hline
-  \\[-1ex]
-  \multicolumn{2}{l}{~\quad\textbf{Gnuplot-mode buffer}}\\[0.5ex]
-  \textrm{key} & \quad description \\
-  \hline
-  \texttt{C-c C-l} & send a line to gnuplot \\
-  \texttt{C-c C-v} & send a line and move forward 1 line\\
-  \texttt{C-c C-r} & send the region to gnuplot \\
-  \texttt{C-c C-b} & send the buffer to gnuplot \\
-  \texttt{C-c C-f} & send a file to gnuplot \\
-  & \\[-1.5ex]
-  \texttt{M-\key{tab}} & complete keyword at point \\
-  \texttt{C-c C-i} & insert filename at point \\
-  \texttt{C-c C-j} & jump to next statement \\
-  \texttt{C-c C-n}

[nongnu] elpa/gnuplot ba4e8938d7 10/19: Update README

[ELPA Syncer]

branch: elpa/gnuplot
commit ba4e8938d75923fed9150cc7106b0db87ac1931f
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update README
---
 README.org | 96 --
 1 file changed, 44 insertions(+), 52 deletions(-)

diff --git a/README.org b/README.org
index d2e6a94930..f7e5de8295 100644
--- a/README.org
+++ b/README.org
@@ -6,8 +6,8 @@
 #+html: https://melpa.org/#/gnuplot";>https://melpa.org/packages/gnuplot-badge.svg"/>
 #+html: https://stable.melpa.org/#/gnuplot";>https://stable.melpa.org/packages/gnuplot-badge.svg"/>
 
-This package allows running [[http://www.gnuplot.info/][gnuplot]] files from 
within the [[https://www.gnu.org/software/emacs/][GNU Emacs]]
-editor. It features:
+This package allows running [[http://www.gnuplot.info/][gnuplot]] files from 
within the [[https://www.gnu.org/software/emacs/][GNU Emacs]] editor. It
+features:
 
 - Syntax highlighting and indentation for gnuplot scripts.
 - Pull-down menus for common gnuplot-related tasks.
@@ -64,10 +64,9 @@ When =gnuplot-mode= is on, the following keybindings are 
available:
 | M-tab | complete keyword before point|
 | tab   | indent current line  |
 
-
-With the exception of the commands for sending commands to Gnuplot,
-most of the above commands also work in the Gnuplot comint buffer, in
-addition to the following:
+With the exception of the commands for sending commands to Gnuplot, most of the
+above commands also work in the Gnuplot comint buffer, in addition to the
+following:
 
 | M-C-p   | plot the most recent script buffer line-by-line   |
 | M-C-f   | save the current script buffer and load that file |
@@ -75,56 +74,48 @@ addition to the following:
 
 ** Context-sensitive keyword completion
 
-By default gnuplot-mode will try to parse your commands as you type
-and suggest only relevant completion candidates on typing =M-TAB= or
-=TAB=. For example, with point after the =with= of a =plot= command,
-tab completion will suggest only plotting styles. This also enables
-more specific help topic lookup in the gnuplot info file.
+By default gnuplot-mode will try to parse your commands as you type and suggest
+only relevant completion candidates on typing =M-TAB= or =TAB=. For example, 
with
+point after the =with= of a =plot= command, tab completion will suggest only
+plotting styles. This also enables more specific help topic lookup in the
+gnuplot info file.
 
-If the context-sensitivity annoys you, you can get simple
-non-context-sensitive completion back by toggling
-=gnuplot-context-sensitive-mode=.
+If the context-sensitivity annoys you, you can get simple non-context-sensitive
+completion back by toggling =gnuplot-context-sensitive-mode=.
 
-By its nature, the completion code has to know a fair bit about the
-structure of the gnuplot language. If you use it with an old version
-of gnuplot (pre version 4) it will make mistakes. Most of gnuplot
-4.6's command language is parsed correctly except for the =set
-terminal= commands.
+By its nature, the completion code has to know a fair bit about the structure 
of
+the gnuplot language. If you use it with an old version of gnuplot (pre
+version 4) it will make mistakes. Most of gnuplot 4.6's command language is
+parsed correctly except for the =set terminal= commands.
 
 ** Eldoc mode
 
-~gnuplot-mode~ can show syntax hints in the modeline when ~eldoc-mode~
-is turned on and context sensitivity is enabled.
+~gnuplot-mode~ shows syntax hints in the modeline when ~eldoc-mode~ is turned 
on and
+context sensitivity is enabled. Both are enabled by default.
 
 ** Inline Images
 
-You can optionally have plots displayed inline in the Gnuplot comint
-process buffer. This is handy for trying things out without having to
-switch between Emacs and the Gnuplot display. Call
-=gnuplot-inline-display-mode= in a gnuplot-mode buffer to try it out. This
-feature is implemented using temporary =png= files, and is also somewhat
-experimental. It requires Gnuplot to have =png= support and a GNU Emacs
-with image support. Please report bugs.
-
-
+You can have plots displayed inline in the Gnuplot comint process buffer. This
+is handy for trying things out without having to switch between Emacs and the
+Gnuplot display. It requires Gnuplot to have =png= support and a GNU Emacs with
+image support. Call =gnuplot-external-display-mode= in a gnuplot-mode buffer to
+disable the feature.
 
 * FAQ / Remarks
 
 ** Usage on Windows
 
-Multiple users have reported issues when trying to work with
-=gnuplot.el= on Windows. Most notably, the gnuplot process hangs after
-sending a first line of input (this is a common Emacs issue on
-Windows, see 
[[https://www.gnu.org/software/emacs/manual/html_mono/efaq-w32.html#Sub_002dprocesses][here]]).
+Multiple users have reported issues when trying to work with =gnuplot.el= on
+Windows. Most notably, the gnuplot process hangs after sending a first line of
+inp

[nongnu] elpa/gnuplot e54c3d7feb 01/19: Move gnuplot-token to private gnuplot-context namespace

[ELPA Syncer]

branch: elpa/gnuplot
commit e54c3d7feb5763c2267cd17cbb3304b88462c92e
Author: Daniel Mendler 
Commit: Daniel Mendler 

Move gnuplot-token to private gnuplot-context namespace
---
 gnuplot-context.el   | 34 ++
 gnuplot-debug-context.el |  2 +-
 gnuplot-test-context.el  |  8 
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/gnuplot-context.el b/gnuplot-context.el
index 3cea606a19..834e9d9fb5 100644
--- a/gnuplot-context.el
+++ b/gnuplot-context.el
@@ -227,7 +227,9 @@
 
  The tokenizer.
 
-(cl-defstruct gnuplot-token
+(cl-defstruct (gnuplot-context--token
+   (:constructor gnuplot-context--token-make)
+   (:copier nil))
   start ; Buffer start position
   end   ; Buffer end position
   id; Text
@@ -250,7 +252,7 @@
   `((looking-at ,regexp)
 (let ((str (match-string-no-properties 0)))
   (forward-char (length str))
-  (make-gnuplot-token :id str
+  (gnuplot-context--token-make :id str
   :type ',token-type
   :start (match-beginning 0)
   :end (match-end 0))
@@ -258,7 +260,7 @@
 
 (defun gnuplot-context--tokenize (&optional completing-p)
   "Tokenize the Gnuplot command at point.
-Return a list of `gnuplot-token' objects.
+Return a list of `gnuplot-context--token' objects.
 
 If COMPLETING-P is non-nil, omits the token at point if it is a
 name; otherwise continues tokenizing up to the token at point.  FIXME."
@@ -294,7 +296,7 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
   (let* ((bounds (bounds-of-thing-at-point 'sexp))
  (to (or (cdr bounds) stop-point)))
 (goto-char to)
-(make-gnuplot-token
+(gnuplot-context--token-make
  :id (buffer-substring-no-properties from to)
  :type 'string
  :start from :end to)))
@@ -312,8 +314,8 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
 ;; in that position for completion.
 (if (and completing-p
  tokens
- (eq (gnuplot-token-type (car tokens)) 'name)
- (<= (point) (gnuplot-token-end (car tokens
+ (eq (gnuplot-context--token-type (car tokens)) 'name)
+ (<= (point) (gnuplot-context--token-end (car tokens
 (pop tokens))
 
 (nreverse tokens)))
@@ -333,15 +335,15 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
 ;;  Match any token (fails only at end of command).
 ;;
 ;;(literal LITERAL NO-COMPLETE)
-;;  Match token with `gnuplot-token-id' LITERAL or fail. If we
+;;  Match token with `gnuplot-context--token-id' LITERAL or fail. If we
 ;;  have reached the token before point, include LITERAL in the
 ;;  completion list unless NO-COMPLETE is non-`nil'.
 ;;
 ;;(token-type TYPE)
-;;  Match a token with `gnuplot-token-type' TYPE, or fail.
+;;  Match a token with `gnuplot-context--token-type' TYPE, or fail.
 ;;
 ;;(keyword REGEXP NAME)
-;;  Match any token whose `gnuplot-token-id' matches REGEXP. Use
+;;  Match any token whose `gnuplot-context--token-id' matches REGEXP. Use
 ;;  NAME for the completion list.
 ;;
 ;;(jump OFFSET FIXED)
@@ -1804,7 +1806,7 @@ there."
  (opcode (car inst))
  (token (car tokens))
  (end-of-tokens (null tokens)))
-(gnuplot-context--trace "%s\t%s\t%s\n" pc inst (and token 
(gnuplot-token-id token)))
+(gnuplot-context--trace "%s\t%s\t%s\n" pc inst (and token 
(gnuplot-context--token-id token)))
 
 (cl-case opcode
   ;; (literal LITERAL NO-COMPLETE)
@@ -1817,7 +1819,7 @@ there."
   (push expect gnuplot-context--completions))
 (fail))
 
-   ((not (equal (gnuplot-token-id token) expect))
+   ((not (equal (gnuplot-context--token-id token) expect))
 (fail))
 
;; otherwise succeed
@@ -1827,7 +1829,7 @@ there."
   ((token-type)
(let ((expect (cadr inst)))
  (if (or end-of-tokens
- (not (eq (gnuplot-token-type token) expect)))
+ (not (eq (gnuplot-context--token-type token) expect)))
  (fail)
(advance
 
@@ -1841,12 +1843,12 @@ there."
 (push name gnuplot-context--completions)
 (fail))
 
-   ((not (string-match-p regexp (gnuplot-token-id token)))
+   ((not (string-match-p regexp (gnuplot-context--token-id 
token)))

[nongnu] elpa/gnuplot be71817b43 12/19: Update changelog

[ELPA Syncer]

branch: elpa/gnuplot
commit be71817b43d9415311c8b0f80f6e791ec82be29e
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update changelog
---
 CHANGELOG.org | 33 ++---
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 05c4318ffa..fb75ce6109 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -1,6 +1,19 @@
 #+TITLE: Changelog for =gnuplot.el=
 
-* Version 8.1 (Feb 18th 2023)
+* Development
+
+- Enable ~gnuplot-inline-image-mode~ by default.
+- Enable Eldoc messages by default and provide ~gnuplot-eldoc.el~.
+- Made many functions and variables private to ease refactoring in the future.
+- Remove ~gnuplot-prompt-face~ since Comint highlights the prompt by default.
+- Remove ~gnuplot-tab-completion~ option. Set ~tab-always-indent~ to ~complete~
+  instead.
+- Remove ~gnuplot-eldoc-mode~ option. Toggle ~eldoc-mode~ locally instead.
+- Unbind ~C-c C-c~. Use the default binding ~M-;~ instead.
+- Unbind ~M-RET~ for tab completion. Use the default ~M-TAB~ instead.
+- Fix compatibility with Emacs 30 and newer.
+
+* Version 0.8.1 (Feb 18th 2023)
 
 List of changes for =gnuplot.el= version 0.8.0 ranging from January 2021
 to February 2023.
@@ -13,7 +26,7 @@ to February 2023.
 
 - Lexical scoping and linting
 
-* Version 8.0 (Jan 3rd 2021)
+* Version 0.8.0 (Jan 3rd 2021)
 
 List of changes for =gnuplot.el= version 0.8.0 ranging from March 2014
 to January 2021.
@@ -54,18 +67,17 @@ to January 2021.
 - =comint-process-echoes= is now buffer-local.
 
 
-
-* Version 7.0 (Oct 20th 2012)
+* Version 0.7.0 (Oct 20th 2012)
 
 - Contextual completion & help, inline plots, some other stuff.
 
-* Version 6.0 (Dec 13th 2011)
+* Version 0.6.0 (Dec 13th 2011)
 
 - Changed numbering scheme to accommodate gnuplot packaging
   requirements.
 - Moved to github, updated contact info.
 
-* Version 5.0 (Sep 16th 2002)
+* Version 0.5.0 (Sep 16th 2002)
 
 - Wrote initial draft of gnuplot-gui.el, included it in insertions
   menu and in =gnuplot-insert=. Negate option function, bound to =C-c
@@ -151,7 +163,7 @@ to January 2021.
 
 - Fixed a problem with =C-c C-v= jumping forward 2 lines at a time
 
-* Version 4.0 (Dec 14th 1998)
+* Version 0.4.0 (Dec 14th 1998)
 
 - Use info-look for info interface. No change to gnuplot-mode user
   interface, but cleaner code. With info-look, the help funcion works
@@ -190,8 +202,7 @@ to January 2021.
   =gnuplot-insertion-menu-flag=, intelligent Makefile knows which
   info-look to compile
 
-
-* Verison 3.0 (Sep 15th 1998)
+* Version 0.3.0 (Sep 15th 1998)
 
 - Include insertions menu.
 
@@ -206,7 +217,7 @@ to January 2021.
   =gnuplot-mark-active= which caused an error to be raised by (mark)
   when the mark was inactive. Some changes to font-lock rules.
 
-* Version 2.0 (Sep 11th 1998)
+* Version 0.2.0 (Sep 11th 1998)
 
 - Added filename insertion, indentation, and colorization/completion
   in comint buffer.
@@ -214,6 +225,6 @@ to January 2021.
 - Made =indent-line-function= buffer-local (whoops!) and fixed some
   stuff in the installation script
 
-* Version 1.0 (Jun 25th 1998)
+* Version 0.1.0 (Jun 25th 1998)
 
 - Finished with initial release.

[nongnu] elpa/gnuplot dad0462cd0 13/19: Version 0.9

[ELPA Syncer]

branch: elpa/gnuplot
commit dad0462cd04190da3ec2603fba601260fa5e8a72
Author: Daniel Mendler 
Commit: Daniel Mendler 

Version 0.9
---
 CHANGELOG.org | 2 +-
 gnuplot.el| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index fb75ce6109..886c753948 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -1,6 +1,6 @@
 #+TITLE: Changelog for =gnuplot.el=
 
-* Development
+* Version 0.9 (2025-05-30)
 
 - Enable ~gnuplot-inline-image-mode~ by default.
 - Enable Eldoc messages by default and provide ~gnuplot-eldoc.el~.
diff --git a/gnuplot.el b/gnuplot.el
index afdbfe2a6f..9067925358 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -5,7 +5,7 @@
 ;; Author:   Jon Oddie, Bruce Ravel, Phil Type
 ;; Maintainer:   Maxime Tréca , Daniel Mendler 

 ;; Created:  1998
-;; Version:  0.8.1
+;; Version:  0.9
 ;; Keywords: data gnuplot plotting
 ;; URL:  https://github.com/emacs-gnuplot/gnuplot
 ;; Package-Requires: ((emacs "25.1"))

[nongnu] elpa/gnuplot 6ab9c7d2c2 16/19: Commentary: Update acknowledgments

[ELPA Syncer]

branch: elpa/gnuplot
commit 6ab9c7d2c2ef5b5d002d46b456ada4730cd6ff87
Author: Daniel Mendler 
Commit: Daniel Mendler 

Commentary: Update acknowledgments
---
 gnuplot.el | 38 ++
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/gnuplot.el b/gnuplot.el
index 256437f3d2..008ca70ab4 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -42,26 +42,24 @@
 
 ;;
 ;;; Acknowledgements:
-;;David Batty(numerous corrections)
-;;Laurent Bonnaud(suggestions regarding font-lock rules)
-;;Markus Dickebohm   (suggested `gnuplot-send-line-and-forward')
-;;Stephen Eglan  (suggested the use of info-look,
-;;contributed a bug fix regarding shutting
-;;down the gnuplot process, improvement to
-;;`gnuplot-send-line-and-forward')
-;;Robert Fenk(suggested respecting continuation lines)
-;;Michael Karbach(suggested trimming the gnuplot process buffer)
-;;Alex Chan Libchen  (suggested font-lock for plotting words)
-;;Kuang-Yu Liu   (pointed out buggy dependence on font-lock)
-;;Hrvoje Niksic  (help with defcustom arguments for insertions)
-;;Andreas Rechtsteiner  (pointed out problem with C-c C-v)
-;;Michael Sanders(help with the info-look interface)
-;;Jinwei Shen(suggested functionality in comint buffer)
-;;Michael M. Tung(prompted me to add pm3d support)
-;;Holger Wenzel  (suggested using `gnuplot-keywords-when')
-;;Wolfgang Zocher(pointed out problem with gnuplot-mode + speedbar)
-;;Jon Oddie  (indentation, inline images, context mode)
-;;Maxime F. Treca(package update, XEmacs deprecation)
+;;David Batty  numerous corrections
+;;Laurent Bonnaud  suggestions regarding font-lock rules
+;;Markus Dickebohm suggested `gnuplot-send-line-and-forward'
+;;Stephen Eglansuggested the use of info-look and various fixes
+;;Robert Fenk  suggested respecting continuation lines
+;;Michael Karbach  suggested trimming the gnuplot process buffer
+;;Alex Chan Libchensuggested font-lock for plotting words
+;;Kuang-Yu Liu pointed out buggy dependence on font-lock
+;;Hrvoje Niksichelp with defcustom arguments for insertions
+;;Andreas Rechtsteiner pointed out problem with C-c C-v
+;;Michael Sanders  help with the info-look interface
+;;Jinwei Shen  suggested functionality in comint buffer
+;;Michael M. Tung  prompted me to add pm3d support
+;;Holger Wenzelsuggested using `gnuplot-keywords-when'
+;;Wolfgang Zocher  pointed out problem with gnuplot-mode + speedbar
+;;Jon Oddieindentation, inline images, context mode
+;;Maxime F. Treca  package update, XEmacs deprecation
+;;Daniel Mendler   package update, support for recent Emacs
 ;;
 ;;  and especially to Lars Hecking  for including gnuplot-mode
 ;;  with the gnuplot 3.7-beta distribution and for providing me with

[nongnu] elpa/gnuplot 313cc4fb3f 03/19: Cleanup autoloads

[ELPA Syncer]

branch: elpa/gnuplot
commit 313cc4fb3fb98ec0e25c0abd7b0902bce5d2d345
Author: Daniel Mendler 
Commit: Daniel Mendler 

Cleanup autoloads
---
 gnuplot-context.el |  2 --
 gnuplot-gui.el |  4 
 gnuplot.el | 27 +--
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/gnuplot-context.el b/gnuplot-context.el
index 834e9d9fb5..47d995a37d 100644
--- a/gnuplot-context.el
+++ b/gnuplot-context.el
@@ -2167,8 +2167,6 @@ command."
   ((looking-at "set\\s-+parametric") (throw 'result t
   nil)))
 
-
-;;;###autoload
 (define-minor-mode gnuplot-context-sensitive-mode
   "Use context-sensitive completion and help in `gnuplot-mode'.
 
diff --git a/gnuplot-gui.el b/gnuplot-gui.el
index 0ba3bffc4e..0ce6f9df05 100644
--- a/gnuplot-gui.el
+++ b/gnuplot-gui.el
@@ -804,8 +804,6 @@ This alist is formed at load time by appending together
 gnuplot-gui-plot-splot-fit
 gnuplot-gui-test-type))
 
-
-;;;###autoload
 (defun gnuplot-gui-swap-simple-complete ()
   (interactive)
   (setq gnuplot-gui-plot-splot-fit-style
@@ -833,7 +831,6 @@ This alist is formed at load time by appending together
 (defun gnuplot-gui-set-frame-param (param value)
   (setcdr (assoc param gnuplot-gui-frame-parameters) value))
 
-;;;###autoload
 (defun gnuplot-gui-set-options-and-insert (&optional event)
   "Insert arguments using a GUI interface.
 Determine contents of current line and set up the appropriate GUI
@@ -917,7 +914,6 @@ Note that \"cntrparam\" is not currently supported."
  (message
   "%S is not a gnuplot command which takes options" w 
 
-;;;###autoload
 (defun gnuplot-gui-toggle-popup ()
   (interactive)
   (setq gnuplot-gui-popup-flag (not gnuplot-gui-popup-flag))
diff --git a/gnuplot.el b/gnuplot.el
index b979c8c507..c7e6e61168 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -81,8 +81,6 @@
 (require 'info)
 (require 'info-look)
 
-(declare-function 'eldoc-add-command "eldoc")
-
 (defgroup gnuplot nil
   "Gnuplot-mode for Emacs."
   :prefix "gnuplot-"
@@ -251,6 +249,11 @@ beginning the continued command."
 These are set by `gnuplot--set-keywords-list' from the values in
 `info-lookup-cache'.")
 
+(autoload 'gnuplot-context-sensitive-mode "gnuplot-context")
+(autoload 'gnuplot-gui-set-options-and-insert "gnuplot-gui" nil t)
+(autoload 'gnuplot-gui-swap-simple-complete "gnuplot-gui" nil t)
+(autoload 'gnuplot-gui-toggle-popup "gnuplot-gui" nil t)
+
 (defcustom gnuplot-use-context-sensitive-completion t
   "Non-nil if `gnuplot-context-sensitive-mode' should be enabled by default.
 
@@ -263,15 +266,14 @@ suggestions."
  (set sym value)
  (cond
   (value
-   (add-hook 'gnuplot-mode-hook 'gnuplot-context-sensitive-mode nil 
nil)
-   (add-hook 'gnuplot-comint-mode-hook 'gnuplot-context-sensitive-mode 
nil nil))
+   (add-hook 'gnuplot-mode-hook #'gnuplot-context-sensitive-mode nil 
nil)
+   (add-hook 'gnuplot-comint-mode-hook 
#'gnuplot-context-sensitive-mode nil nil))
   (t
-   (remove-hook 'gnuplot-mode-hook 'gnuplot-context-sensitive-mode)
-   (remove-hook 'gnuplot-comint-mode-hook 
'gnuplot-context-sensitive-mode)))
+   (remove-hook 'gnuplot-mode-hook #'gnuplot-context-sensitive-mode)
+   (remove-hook 'gnuplot-comint-mode-hook 
#'gnuplot-context-sensitive-mode)))
  (dolist (buffer (buffer-list))
(with-current-buffer buffer
- (when (and (derived-mode-p 'gnuplot-mode 'gnuplot-comint-mode)
-(fboundp 'gnuplot-context-sensitive-mode))
+ (when (derived-mode-p 'gnuplot-mode 'gnuplot-comint-mode)
(gnuplot-context-sensitive-mode (if value 1 0))
   :link '(emacs-commentary-link "gnuplot-context"))
 
@@ -344,7 +346,7 @@ non-nil."
   (let ((map (make-sparse-keymap)))
 (define-key map "\C-c\C-b"#'gnuplot-send-buffer-to-gnuplot)
 (define-key map "\C-c\C-c"#'comment-region) ; 
-(define-key map "\C-c\C-o"'gnuplot-gui-set-options-and-insert)
+(define-key map "\C-c\C-o"#'gnuplot-gui-set-options-and-insert)
 (define-key map "\C-c\C-e"#'gnuplot-show-gnuplot-buffer)
 (define-key map "\C-c\C-f"#'gnuplot-send-file-to-gnuplot)
 (define-key map "\C-c\C-d"#'gnuplot-info-lookup-symbol)
@@ -360,7 +362,7 @@ non-nil."
 (define-key map "\C-i"#'indent-for-tab-command)
 (define-key map (kbd "}") #'gnuplot-electric-insert)
 (define-key map "\M-\t"   #'completion-at-point)
-(define-key map [S-mouse-2]   'gnuplot-gui-set-options-and-insert)
+(define-key map [S-mouse-2]   #'gnuplot-gui-set-options-and-insert)
 
 map))
 
@@ -1904,8 +1906,7 @@ shown."
   (setq topic (downcase (match-string 2 string))
 term(match-string 4 string))
   (if (string= topic "terminal") (setq topic (downcase term)

[nongnu] elpa/gnuplot e3dde0e24b 11/19: Update outdated commentary

[ELPA Syncer]

branch: elpa/gnuplot
commit e3dde0e24b0e54e599316dc47e70a416977cf373
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update outdated commentary
---
 gnuplot-gui.el | 3 ---
 gnuplot.el | 5 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/gnuplot-gui.el b/gnuplot-gui.el
index e0e23c5502..dc72a73d47 100644
--- a/gnuplot-gui.el
+++ b/gnuplot-gui.el
@@ -29,9 +29,6 @@
 ;; arguments appropriate the the item that was near point.  The goal
 ;; is to provide point-and-click functionality to gnuplot-mode.
 ;;
-;; gnuplot-gui.el was developed using GNU Emacs 25 and should be
-;; compatible with GNU Emacs 24.3 and above.
-;;
 ;;;
 ;;
 ;;; To do:
diff --git a/gnuplot.el b/gnuplot.el
index 85db15dc7c..afdbfe2a6f 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -32,10 +32,7 @@
 ;; versions (5.0 and up), but should also work fine with older
 ;; versions.
 ;;
-;; This version of gnuplot-mode has been tested mostly on GNU Emacs
-;; 25.
-;;
-;; Gnuplot-mode now includes context-sensitive support for keyword
+;; Gnuplot-mode includes context-sensitive support for keyword
 ;; completion and, optionally, eldoc-mode help text.  See the
 ;; commentary in gnuplot-context.el for more information.  If you
 ;; don't find it useful, it can be turned off by customizing

[nongnu] elpa/gnuplot 8ec2839fcf 06/19: Unbind comment-region

[ELPA Syncer]

branch: elpa/gnuplot
commit 8ec2839fcfb4d8e3d800f6e8eff8282af3a5f0b3
Author: Daniel Mendler 
Commit: Daniel Mendler 

Unbind comment-region

Use M-; instead
---
 gnuplot.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnuplot.el b/gnuplot.el
index ddf84e9fb2..9739c1c908 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -344,7 +344,6 @@ non-nil."
 (defvar gnuplot-mode-map
   (let ((map (make-sparse-keymap)))
 (define-key map "\C-c\C-b"#'gnuplot-send-buffer-to-gnuplot)
-(define-key map "\C-c\C-c"#'comment-region) ; 
 (define-key map "\C-c\C-o"#'gnuplot-gui-set-options-and-insert)
 (define-key map "\C-c\C-e"#'gnuplot-show-comint-buffer)
 (define-key map "\C-c\C-f"#'gnuplot-send-file-to-gnuplot)

[nongnu] elpa/gnuplot c6a19ec1e6 07/19: Unbind indent-for-tab-comamnd (default binding)

[ELPA Syncer]

branch: elpa/gnuplot
commit c6a19ec1e65f315749efc9f5ad88f0aa9f9bc08d
Author: Daniel Mendler 
Commit: Daniel Mendler 

Unbind indent-for-tab-comamnd (default binding)
---
 gnuplot.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnuplot.el b/gnuplot.el
index 9739c1c908..d7e0afa6a7 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -357,11 +357,9 @@ non-nil."
 (define-key map (kbd "C-M-x") #'gnuplot-send-line-to-gnuplot)
 (define-key map "\C-c\C-v"#'gnuplot-send-line-and-forward)
 (define-key map "\C-c\C-z"#'gnuplot-customize)
-(define-key map "\C-i"#'indent-for-tab-command)
-(define-key map (kbd "}") #'gnuplot-electric-insert)
+(define-key map "}"   #'gnuplot-electric-insert)
 (define-key map "\M-\t"   #'completion-at-point)
 (define-key map [S-mouse-2]   #'gnuplot-gui-set-options-and-insert)
-
 map))
 
 (defvar gnuplot-mode-menu nil)

[elpa] externals/beframe 7c6f0a824b 2/2: Make Xref history specific to the current frame

[ELPA Syncer]

branch: externals/beframe
commit 7c6f0a824bf27bade6cf8ebb2a0b292a91da9455
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Make Xref history specific to the current frame
---
 beframe.el | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/beframe.el b/beframe.el
index be7fa18575..b338634986 100644
--- a/beframe.el
+++ b/beframe.el
@@ -728,6 +728,22 @@ Meant to be assigned to a prefix key, like this:
 (define-key beframe-prefix-map (kbd "a s") 
#'beframe-assume-buffers-matching-regexp)
 (define-key beframe-prefix-map (kbd "u s") 
#'beframe-unassume-buffers-matching-regexp)
 
+(defvar xref-history-storage)
+
+(defvar beframe-xref-history-storage xref-history-storage
+  "Store the last known value of `xref-history-storage'.")
+
+(defun beframe-xref-frame-history (&optional new-value)
+  "Return frame-specific Xref history for the current frame.
+Override existing value with NEW-VALUE if NEW-VALUE is set.
+
+This function is based on `xref-window-local-history'."
+  (let ((frame (selected-frame)))
+(if new-value
+(set-frame-parameter frame 'xref--history new-value)
+  (or (frame-parameter frame 'xref--history)
+  (set-frame-parameter frame 'xref--history (cons nil nil))
+
 ;;;###autoload
 (define-minor-mode beframe-mode
   "Make all buffer prompts limit candidates per frame.
@@ -736,12 +752,14 @@ Also see the variable `beframe-prefix-map'."
   (if beframe-mode
   (progn
 (setq beframe--read-buffer-function read-buffer-function
-  read-buffer-function #'beframe-read-buffer)
+  read-buffer-function #'beframe-read-buffer
+  xref-history-storage #'beframe-xref-frame-history)
 (add-hook 'after-make-frame-functions #'beframe-setup-frame)
 (add-hook 'context-menu-functions #'beframe-context-menu)
 (beframe--functions-in-frames))
 (setq read-buffer-function beframe--read-buffer-function
-  beframe--read-buffer-function nil)
+  beframe--read-buffer-function nil
+  xref-history-storage beframe-xref-history-storage)
 (remove-hook 'after-make-frame-functions #'beframe-setup-frame)
 (remove-hook 'context-menu-functions #'beframe-context-menu)
 (beframe--functions-in-frames :disable)))

[elpa] externals/beframe 830d017a17 1/2: Remove needless comment

[ELPA Syncer]

branch: externals/beframe
commit 830d017a17293d790887aec058cf3c91b9534fda
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Remove needless comment
---
 beframe.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/beframe.el b/beframe.el
index 2903c3295f..be7fa18575 100644
--- a/beframe.el
+++ b/beframe.el
@@ -1001,7 +1001,6 @@ This function can be used as the :sort key of
   "Menu with all Beframe commands, each available in the right context."
   beframe--menu-contents)
 
-;; Add Beframe menu at the end of global-map after Tools
 (easy-menu-add-item global-map '(menu-bar "Buffers") beframe-global-menu)
 
 (defun beframe-context-menu (menu _click)

[elpa] externals/beframe updated (71d1575a7e -> 7c6f0a824b)

[ELPA Syncer]

elpasync pushed a change to branch externals/beframe.

  from  71d1575a7e Make stylistic changes to beframe--read-buffer-p
   new  830d017a17 Remove needless comment
   new  7c6f0a824b Make Xref history specific to the current frame


Summary of changes:
 beframe.el | 23 ---
 1 file changed, 20 insertions(+), 3 deletions(-)

[elpa] externals/tramp c37e5fa5f4: Tramp ELPA version 2.7.2.4 released

[ELPA Syncer]

branch: externals/tramp
commit c37e5fa5f4e60a19b38089672fbad377035a33a2
Author: Michael Albinus 
Commit: Michael Albinus 

Tramp ELPA version 2.7.2.4 released
---
 README   |  6 +++---
 test/tramp-tests.el  | 53 +++-
 texi/trampver.texi   |  2 +-
 tramp-integration.el |  8 +---
 tramp-sh.el  |  7 ++-
 tramp.el |  7 ---
 trampver.el  |  8 
 7 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/README b/README
index 0561aa4a0c..9b534ddf5f 100644
--- a/README
+++ b/README
@@ -32,11 +32,11 @@ Emacs 28 or older
 
• Remove all byte-compiled Tramp files
 
-  $ rm -f ~/.emacs.d/elpa/tramp-2.7.2.3.1/tramp*.elc
+  $ rm -f ~/.emacs.d/elpa/tramp-2.7.2.4/tramp*.elc
 
• Start Emacs with Tramp's source files
 
-  $ emacs -L ~/.emacs.d/elpa/tramp-2.7.2.3.1 -l tramp
+  $ emacs -L ~/.emacs.d/elpa/tramp-2.7.2.4 -l tramp
 
  This should not give you the error.
 
@@ -50,7 +50,7 @@ Mitigation of a bug in Emacs 29.1
 -
 
 Due to a bug in Emacs 29.1, you must apply the following change prior
-installation or upgrading Tramp 2.7.2.3.1 from GNU ELPA:
+installation or upgrading Tramp 2.7.2.4 from GNU ELPA:
 
  (when (string-equal emacs-version "29.1")
(with-current-buffer
diff --git a/test/tramp-tests.el b/test/tramp-tests.el
index e22f1afc18..4fe3fca0df 100644
--- a/test/tramp-tests.el
+++ b/test/tramp-tests.el
@@ -5083,14 +5083,20 @@ This tests also `make-symbolic-link', `file-truename' 
and `add-name-to-file'."
 ipv6-postfix tramp-postfix-host-format)))
 ;; The hop string fits only the initial syntax.
 (hop (and (eq tramp-syntax orig-syntax) hop))
+;; Needed for host name completion.
+(default-user
+ (file-remote-p
+  (concat tramp-prefix-format hop method-string 
host-string)
+  'user))
+(default-user-string
+ (unless (tramp-string-empty-or-nil-p default-user)
+   (concat default-user tramp-postfix-user-format)))
  test result completions)
 
(dolist
(test-and-result
 ;; These are triples of strings (TEST-STRING
-;; RESULT-CHECK COMPLETION-CHECK).  RESULT-CHECK
-;; could be not unique, in this case it is a list
-;; (RESULT1 RESULT2 ...).
+;; RESULT-CHECK COMPLETION-CHECK).
 (append
  ;; Complete method name.
  (unless (string-empty-p tramp-method-regexp)
@@ -5116,11 +5122,9 @@ This tests also `make-symbolic-link', `file-truename' 
and `add-name-to-file'."
 ipv6-prefix
 (substring-no-properties
  host 0 (min 2 (length host
-  (,(concat
- tramp-prefix-format hop method-string host-string)
-   ,(concat
- tramp-prefix-format hop method-string
- user-string host-string))
+  ,(concat
+tramp-prefix-format hop method-string
+default-user-string host-string)
   ,host-string)))
  ;; Complete user and host name.
  (unless (or (tramp-string-empty-or-nil-p user)
@@ -5161,14 +5165,7 @@ This tests also `make-symbolic-link', `file-truename' 
and `add-name-to-file'."
 ;; (tramp--test-message
 ;;  "syntax: %s style: %s test: %s result: %s"
 ;;  syntax style test result)
-   (if (stringp (cadr test-and-result))
-   (should
-(string-prefix-p (cadr test-and-result) result))
- (should
-  (let (res)
-(dolist (elem (cadr test-and-result) res)
-  (setq
-   res (or res (string-prefix-p elem result
+   (should (string-prefix-p (cadr test-and-result) 
result)))
 
 (with-current-buffer "*Completions*"
  ;; We must remove leading `default-directory'.
@@ -5401,6 +5398,12 @@ This tests also `make-symbolic-link', `file-truename' 
and `add-name-to-file'."
(with-timeout (10 (tramp--test-timeout-handler))
  (while (< (- (point-max) (point-min)) (length "foo"))
(while (accept-process-output proc 0 nil t
+;; Some `cat' implementations do not support the `cat -'
+;; ca

[nongnu] elpa/cider e81537bdc6: [docs] Update pretty-printing doc

[ELPA Syncer]

branch: elpa/cider
commit e81537bdc64d936fce278fe2be19a89745a86a32
Author: Oleksandr Yakushev 
Commit: Bozhidar Batsov 

[docs] Update pretty-printing doc
---
 doc/modules/ROOT/pages/usage/pretty_printing.adoc | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/doc/modules/ROOT/pages/usage/pretty_printing.adoc 
b/doc/modules/ROOT/pages/usage/pretty_printing.adoc
index 19acc5089b..a2cd6ebc69 100644
--- a/doc/modules/ROOT/pages/usage/pretty_printing.adoc
+++ b/doc/modules/ROOT/pages/usage/pretty_printing.adoc
@@ -2,8 +2,9 @@
 
 == Configuring a printing function
 
-NOTE: Pretty-printing was overhauled in CIDER 0.21 to leverage new features 
introduced in nREPL 0.6.
-Refer to https://nrepl.org/nrepl/usage/misc.html#_pretty_printing[nREPL's 
documentation] for details.
+NOTE: CIDER relies on nREPL's own value printing mechanism. Refer to
+https://nrepl.org/nrepl/usage/misc.html#pretty_printing[nREPL's documentation]
+for details.
 
 You can configure the function used by CIDER for pretty-printing evaluation
 results and other data using the option `cider-print-fn`, which can take the
@@ -15,14 +16,16 @@ equivalent of `clojure.core/pr`.
 * `pr` to use the equivalent of `clojure.core/pr`.
 * `pprint` to use the built-in `clojure.pprint/pprint` (this is the default).
 * `fipp` to use the https://github.com/brandonbloom/fipp[Fast Idiomatic
-Pretty-Printer]. This is approximately
-5-10x faster than `clojure.core/pprint`.
+Pretty-Printer]. This is approximately 5-10x faster than `clojure.core/pprint`.
 * `puget` to use https://github.com/greglook/puget[Puget], which provides
 https://github.com/greglook/puget#canonical-representation[canonical 
serialization]
 of data on top of fipp, but at a slight performance cost.
 * `zprint` to use https://github.com/kkinnear/zprint[zprint], a fast and
 flexible alternative to the libraries mentioned above.
 
+For `fipp`, `puget`, and `zprint` printers to work, you need to add a
+respective dependency into your project explicitly.
+
 Alternatively, `cider-print-fn` can be set to the namespace-qualified name of a
 Clojure var whose function takes three arguments: the object to print, the
 `java.io.PrintWriter` to print on, and a (possibly nil) map of options.
@@ -49,11 +52,6 @@ Here's one example:
   (apply pp/write value (mapcat identity (assoc options :stream writer
 
 
-IMPORTANT: Before Clojure 1.10.2, a
-https://clojure.atlassian.net/browse/CLJ-1445[bug] in `clojure.pprint` caused 
it
-to not work properly with `+*print-meta*+`. If you need to print the metadata
-you'll have to change the print function or disable pretty-printing.
-
 == Limiting printed output
 
 You can set `cider-print-quota` to limit the number of bytes that will be

[nongnu] elpa/gptel c94261a605 1/2: NEWS: Update

[ELPA Syncer]

branch: elpa/gptel
commit c94261a605325fcb2d763735cbca60cc12fd2c20
Author: Karthik Chikmagalur 
Commit: Karthik Chikmagalur 

NEWS: Update

NEWS: Mention new-ish features or edit descriptions.
---
 NEWS | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index cb25d8d8d0..7372684c68 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,10 @@
 
 ** New features and UI changes
 
+- gptel now supports handling reasoning/thinking blocks in responses from 
Gemini
+  models.  This is controlled by ~gptel-include-reasoning~, in the same way 
that
+  it handles other APIs.
+
 - The new option ~gptel-curl-extra-args~ can be used to specify extra
   arguments to the Curl command used for the request.  This is the
   global version of the gptel-backend-specific ~:curl-args~ slot,
@@ -39,6 +43,15 @@
 
 - Tools now run in the buffer from which the request originates.
 
+- gptel can access MCP server tools by integrating with the mcp.el package,
+  which is at https://github.com/lizqwerscott/mcp.el.  (mcp.el is not yet
+  available in a package archive.)  To help with the integration, two new
+  commands are provided: ~gptel-mcp-connect~ and ~gptel-mcp-disconnect~.  You
+  can use these to start MCP servers selectively and add tools to gptel.  These
+  commands are also available from gptel's tools menu.  These commands are
+  currently not autoloaded by gptel.  To access them, require the
+  ~gptel-integrations~ feature.
+
 - You can now define "presets", which are a bundle of gptel options, such as 
the
   backend, model, system message, included tools, temperature and so on.  This
   set of options can be applied together, making it easy to switch between
@@ -51,8 +64,8 @@
 - Links to plain-text files in chat buffers can be followed, and their contents
   included with the request.  Using Org or Markdown links is an easy, 
intuitive,
   persistent and buffer-local way to specify context.  To enable this behavior,
-  turn on ~gptel-track-media~, an existing option which also controls whether
-  image/document links are followed to send them (when the model supports it).
+  turn on ~gptel-track-media~, a pre-existing option which also controls 
whether
+  image/document links are followed and sent (when the model supports it).
 
 ** Notable Bug fixes
 

[nongnu] elpa/gptel c49675e1df 2/2: gptel-integrations: Always run server-callback

[ELPA Syncer]

branch: elpa/gptel
commit c49675e1df4456895309172cb8a7669a57148bac
Author: Karthik Chikmagalur 
Commit: Karthik Chikmagalur 

gptel-integrations: Always run server-callback

* gptel-integrations.el (gptel-mcp-connect): Always run the
server-callback after running this command, even if no new servers
are started.  This is because the callback may be needed to
continue a request chain, such as when `gptel-mcp-connect' runs in
`gptel-prompt-transform-functions'.
---
 gptel-integrations.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gptel-integrations.el b/gptel-integrations.el
index 4f0c712b1a..1da44a73b4 100644
--- a/gptel-integrations.el
+++ b/gptel-integrations.el
@@ -52,7 +52,7 @@ MCP servers are started if required.  If INTERACTIVE is 
non-nil (or
 called interactively), guide the user through setting up mcp, and query
 for servers to retrieve tools from.
 
-Call SERVER-CALLBACK after starting MCP servers, if starting them."
+Call SERVER-CALLBACK after starting MCP servers."
   (interactive (list t))
   (if (locate-library "mcp-hub")
   (unless (require 'mcp-hub nil t)
@@ -107,7 +107,8 @@ Call SERVER-CALLBACK after starting MCP servers, if 
starting them."
 (mcp-hub-start-all-server
  add-all-tools (mapcar #'car inactive-servers))
   (funcall add-all-tools)))
-(message "All MCP tools are already available to gptel!")
+(message "All MCP tools are already available to gptel!")
+(when (functionp server-callback) (funcall server-callback))
 
 (defun gptel-mcp-disconnect (&optional interactive)
   "Unregister gptel tools provided by MCP servers using the mcp package.

[nongnu] elpa/gptel updated (71d1c7ec8f -> c49675e1df)

[ELPA Syncer]

elpasync pushed a change to branch elpa/gptel.

  from  71d1c7ec8f gptel-gemini: Add support for reasoning blocks (#882)
   new  c94261a605 NEWS: Update
   new  c49675e1df gptel-integrations: Always run server-callback


Summary of changes:
 NEWS  | 17 +++--
 gptel-integrations.el |  5 +++--
 2 files changed, 18 insertions(+), 4 deletions(-)

[nongnu] elpa/gnuplot 7600721610 18/19: Drop obsoletions

[ELPA Syncer]

branch: elpa/gnuplot
commit 7600721610b616cb8559fd9ae6f1abe31a3e46c5
Author: Daniel Mendler 
Commit: Daniel Mendler 

Drop obsoletions
---
 gnuplot.el | 32 
 1 file changed, 32 deletions(-)

diff --git a/gnuplot.el b/gnuplot.el
index 2fa7f0e542..4e0c0c9b75 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -1974,37 +1974,5 @@ following in your .emacs file:
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.gp\\'" . gnuplot-mode))
 
-(define-obsolete-function-alias 'gnuplot-beginning-of-command 
#'gnuplot--beginning-of-command "0.8.1")
-(define-obsolete-function-alias 'gnuplot-beginning-of-continuation 
#'gnuplot--beginning-of-continuation "0.8.1")
-(define-obsolete-function-alias 'gnuplot-beginning-of-defun 
#'gnuplot--beginning-of-defun "0.8.1")
-(define-obsolete-function-alias 'gnuplot-close-down #'gnuplot--close-down 
"0.8.1")
-(define-obsolete-function-alias 'gnuplot-continuation-line-p 
#'gnuplot--continuation-line-p "0.8.1")
-(define-obsolete-function-alias 'gnuplot-discard-output 
#'gnuplot--discard-output "0.8.1")
-(define-obsolete-function-alias 'gnuplot-display-and-recenter-gnuplot-buffer 
#'gnuplot--display-and-recenter-comint-buffer "0.8.1")
-(define-obsolete-function-alias 'gnuplot-end-of-command 
#'gnuplot--end-of-command "0.8.1")
-(define-obsolete-function-alias 'gnuplot-end-of-continuation 
#'gnuplot--end-of-continuation "0.8.1")
-(define-obsolete-function-alias 'gnuplot-in-comment #'gnuplot--in-comment 
"0.8.1")
-(define-obsolete-function-alias 'gnuplot-in-string #'gnuplot--in-string 
"0.8.1")
-(define-obsolete-function-alias 'gnuplot-in-string-or-comment 
#'gnuplot--in-string-or-comment "0.8.1")
-(define-obsolete-function-alias 'gnuplot-inline-image-set-output 
#'gnuplot--inline-image-set-output "0.8.1")
-(define-obsolete-function-alias 'gnuplot-insert-inline-image-output 
#'gnuplot--insert-inline-image-output "0.8.1")
-(define-obsolete-function-alias 'gnuplot-kill-gnuplot-buffer 
#'gnuplot-kill-comint-buffer "0.8.1")
-(define-obsolete-function-alias 'gnuplot-make-gnuplot-buffer 
#'gnuplot--make-comint-buffer "0.8.1")
-(define-obsolete-function-alias 'gnuplot-point-at-beginning-of-command 
#'gnuplot--point-at-beginning-of-command "0.8.1")
-(define-obsolete-function-alias 'gnuplot-point-at-beginning-of-continuation 
#'gnuplot--point-at-beginning-of-continuation "0.8.1")
-(define-obsolete-function-alias 'gnuplot-point-at-end-of-command 
#'gnuplot--point-at-end-of-command "0.8.1")
-(define-obsolete-function-alias 'gnuplot-point-at-end-of-continuation 
#'gnuplot--point-at-end-of-continuation "0.8.1")
-(define-obsolete-function-alias 'gnuplot-protect-prompt-fn 
#'gnuplot--protect-prompt-fn "0.8.1")
-(define-obsolete-function-alias 'gnuplot-set-display-mode 
#'gnuplot--set-display-mode "0.8.1")
-(define-obsolete-function-alias 'gnuplot-set-keywords-list 
#'gnuplot--set-keywords-list "0.8.1")
-(define-obsolete-function-alias 'gnuplot-setup-comint-for-image-mode 
#'gnuplot--setup-comint-for-image-mode "0.8.1")
-(define-obsolete-function-alias 'gnuplot-setup-info-look 
#'gnuplot--setup-info-look "0.8.1")
-(define-obsolete-function-alias 'gnuplot-show-gnuplot-buffer 
#'gnuplot-show-comint-buffer "0.8.1")
-(define-obsolete-function-alias 'gnuplot-split-string #'gnuplot--split-string 
"0.8.1")
-(define-obsolete-function-alias 'gnuplot-syntax-propertize-extend-region 
#'gnuplot--syntax-propertize-extend-region "0.8.1")
-(define-obsolete-function-alias 'gnuplot-trim-gnuplot-buffer 
#'gnuplot-trim-comint-buffer "0.8.1")
-(make-obsolete-variable 'gnuplot-eldoc-mode "Toggle eldoc-mode" "0.8.1")
-(make-obsolete-variable 'gnuplot-tab-completion "Set tab-always-indent to 
'complete" "0.8.1")
-
 (provide 'gnuplot)
 ;;; gnuplot.el ends here

[nongnu] elpa/gnuplot 7dd9346dce 08/19: Remove gnuplot-prompt-face

[ELPA Syncer]

branch: elpa/gnuplot
commit 7dd9346dcec79bcc4bfdcdfd8ba80969ee667032
Author: Daniel Mendler 
Commit: Daniel Mendler 

Remove gnuplot-prompt-face

Emacs highlights the prompt with comint-highlight-prompt
---
 gnuplot-gui.el | 15 ++-
 gnuplot.el | 13 -
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/gnuplot-gui.el b/gnuplot-gui.el
index c4a607fc9b..e0e23c5502 100644
--- a/gnuplot-gui.el
+++ b/gnuplot-gui.el
@@ -1183,19 +1183,24 @@ into the buffer.  TYPE is the object whose arguments 
are being set."
   (gnuplot-gui-make-frame
option (cdr (assoc option gnuplot-gui-all-types)) save-frame) )
 
+(defgroup gnuplot-gui-faces nil
+  "Text faces used by `gnuplot-gui'."
+  :prefix "gnuplot-gui-"
+  :group 'gnuplot-gui)
+
 (defface gnuplot-gui-error-face 'class color) (background light))
(:foreground "grey30"))
   (((class color) (background dark))
(:foreground "grey70")))
   "Face used to display message about unknown widget types."
-  :group 'gnuplot-faces)
+  :group 'gnuplot-gui-faces)
 
 (defface gnuplot-gui-flat-text-face 'class color) (background light))
(:foreground "MediumBlue"))
   (((class color) (background dark))
(:foreground "LightSteelBlue")))
   "Face used to display message about unknown widget types."
-  :group 'gnuplot-faces)
+  :group 'gnuplot-gui-faces)
 
 (defun gnuplot-gui-make-frame (item alist &optional save-frame)
   "Open the frame and populate it with widgets.
@@ -1375,7 +1380,7 @@ SAVE-FRAME is non-nil when the widgets are being reset."
  (t
   (:italic t)))
   "Face used for menu-buttons."
-  :group 'gnuplot-faces)
+  :group 'gnuplot-gui-faces)
 (defface gnuplot-gui-button-face 'class color) (background light))
 (:bold t :foreground "sienna"))
(((class color) (background dark))
@@ -1383,7 +1388,7 @@ SAVE-FRAME is non-nil when the widgets are being reset."
(t
 (:italic t)))
   "Face used for push-buttons."
-  :group 'gnuplot-faces)
+  :group 'gnuplot-gui-faces)
 (defface gnuplot-gui-labels-face 'class color) (background light))
 (:bold t :foreground "darkslateblue"))
(((class color) (background dark))
@@ -1391,7 +1396,7 @@ SAVE-FRAME is non-nil when the widgets are being reset."
(t
 (:italic t)))
   "Face used for insert and delete button in the labels widget."
-  :group 'gnuplot-faces)
+  :group 'gnuplot-gui-faces)
 
 (defun gnuplot-gui-menu-choice (item default list &optional starred)
   "Create a menu widget for the Gnuplot GUI.
diff --git a/gnuplot.el b/gnuplot.el
index d7e0afa6a7..85db15dc7c 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -326,18 +326,6 @@ non-nil."
   :initialize #'custom-initialize-default
   :set #'gnuplot--set-display-mode)
 
-(defgroup gnuplot-faces nil
-  "Text faces used by `gnuplot-mode'."
-  :prefix "gnuplot-"
-  :group 'gnuplot)
-
-(defface gnuplot-prompt-face 'class color))
-(:foreground "firebrick"))
-   (t
-(:bold t :underline t)))
-  "Face used for the prompt in the gnuplot process buffer."
-  :group 'gnuplot-faces)
-
 
 ;;; --- key bindings and menus
 
@@ -1353,7 +1341,6 @@ STRING is the text as originally inserted in the comint 
buffer."
 (setq e (point))
 (put-text-property b e 'rear-nonsticky '(read-only intangible 
face))
 (put-text-property b e 'intangible t)
-(put-text-property b e 'face 'gnuplot-prompt-face)
 ;;(put-text-property b e 'read-only t)
 )
 

[elpa] externals/auctex 33f9eb0709: Fix TeX macro end detection in some edge cases

[ELPA Syncer]

branch: externals/auctex
commit 33f9eb0709a47480ccd14342b983ded2cfa1c1ce
Author: Paul Nelson 
Commit: Arash Esbati 

Fix TeX macro end detection in some edge cases

* tex.el (TeX-find-macro-end-helper): Use
`TeX-search-syntax-table' with square brackets when calling
`forward-sexp'.  This fixes parsing of optional arguments
containing other unmatched delimiters, such as
\begin{enumerate}[a)], where the search would stop at ')'
instead of ']'.  We take further care to treat examples like
\begin{enumerate}[a{]}].  (bug#78587)

* tests/latex/latex-test.el
(TeX-find-macro-end-with-complicated-optional-args): New test
concerning the above issue.
---
 tests/latex/latex-test.el | 13 +
 tex.el| 15 ---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/tests/latex/latex-test.el b/tests/latex/latex-test.el
index b68ea3b879..92b7c53063 100644
--- a/tests/latex/latex-test.el
+++ b/tests/latex/latex-test.el
@@ -761,4 +761,17 @@ check the indentation for optional argument of 
\\usepackage."
(buffer-string)
"sab\n")
 
+(ert-deftest TeX-find-macro-end-with-complicated-optional-args ()
+  "Check that end of macro is determined correctly."
+  ;; (bug#78587)
+  (dolist (str '("\begin{enumerate}[a]"
+ "\begin{enumerate}[(a)]"
+ "\begin{enumerate}[a)]"
+ "\begin{enumerate}[a{]}]"))
+(with-temp-buffer
+  (insert str)
+  (LaTeX-mode)
+  (should (equal (point-max)
+ (TeX-find-macro-end-helper (point-min)))
+
 ;;; latex-test.el ends here
diff --git a/tex.el b/tex.el
index e90252d830..5a3345aeb2 100644
--- a/tex.el
+++ b/tex.el
@@ -5866,9 +5866,18 @@ those will be considered part of it."
(forward-line 1)
(looking-at "[ \t]*\\(\\[\\)"
 (goto-char (match-beginning 1))
-(condition-case nil
-(forward-sexp)
-  (scan-error (throw 'found (point)
+;; Imitate `font-latex-find-matching-close', motivated by
+;; examples like \begin{enumerate}[a{]}].
+(let ((syntax (TeX-search-syntax-table ?\[ ?\]))
+  (parse-sexp-ignore-comments
+   (not (derived-mode-p 'docTeX-mode
+  (modify-syntax-entry ?\{ "|" syntax)
+  (modify-syntax-entry ?\} "|" syntax)
+  (modify-syntax-entry ?\\ "/" syntax)
+  (condition-case nil
+  (with-syntax-table syntax
+(forward-sexp))
+(scan-error (throw 'found (point))
;; Skip over pairs of curly braces
((or (looking-at "[ \t]*\n?[ \t]*{") ; Be conservative: Consider
 ; only consecutive lines.

[nongnu] elpa/gnuplot 2a77249284 3/5: Simplify handling of gnuplot info keywords

[ELPA Syncer]

branch: elpa/gnuplot
commit 2a772492845d353d79fc2b224a09eaae5e848ccb
Author: Daniel Mendler 
Commit: Daniel Mendler 

Simplify handling of gnuplot info keywords
---
 gnuplot-gui.el |  4 ++--
 gnuplot.el | 70 --
 2 files changed, 26 insertions(+), 48 deletions(-)

diff --git a/gnuplot-gui.el b/gnuplot-gui.el
index 3fa79aa7aa..0ba3bffc4e 100644
--- a/gnuplot-gui.el
+++ b/gnuplot-gui.el
@@ -1645,8 +1645,8 @@ is non-nil if this is a \\='range widget."
   "A link to an info file for the Gnuplot GUI."
   :action '(lambda (widget &optional event)
  (let ((gnuplot-info-display 'frame))
-   (if gnuplot-keywords-pending ; 
-   (gnuplot-setup-info-look))
+   (when (eq gnuplot--info-keywords 'pending)
+ (gnuplot--setup-info-look))
(gnuplot-info-lookup-symbol (widget-value widget)
'gnuplot-mode
 
diff --git a/gnuplot.el b/gnuplot.el
index ba52663f28..3ac042d274 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -246,20 +246,10 @@ beginning the continued command."
 ;; with info-look, there is no need to carry this list around -- it
 ;; can be generated on the fly appropriate to the currently installed
 ;; version of gnuplot.info
-(defvar gnuplot-keywords nil
+(defvar gnuplot--info-keywords 'pending
   "A list of keywords used in GNUPLOT.
 These are set by `gnuplot--set-keywords-list' from the values in
 `info-lookup-cache'.")
-(defvar gnuplot-keywords-pending t  ;; 
-  "A boolean which gets toggled when the info file is probed.")
-(defcustom gnuplot-keywords-when 'deferred ;; 'immediately
-  "This variable controls when the info file is parsed.
-The choices are immediately upon starting `gnuplot-mode' or the first
-time that data is needed."
-  :group 'gnuplot
-  :type
-  '(radio (const :tag "Parse info file when gnuplot-mode starts"
immediately)
-  (const :tag "Parse info file the first time it is needed" deferred)))
 
 (defcustom gnuplot-use-context-sensitive-completion t
   "Non-nil if `gnuplot-context-sensitive-mode' should be enabled by default.
@@ -432,8 +422,7 @@ non-nil."
 "---"
 ["Insert filename at point" gnuplot-insert-filename t]
 ["Negate set option"gnuplot-negate-option t]
-["Keyword help" gnuplot-info-lookup-symbol
- (or gnuplot-keywords gnuplot-keywords-pending)]
+["Keyword help" gnuplot-info-lookup-symbol]
 ["Quick help for thing at point"gnuplot-help-function
  gnuplot-context-sensitive-mode]
 ["Info documentation on thing at point"
@@ -1305,8 +1294,7 @@ this function is attached to `gnuplot-after-plot-hook'"
 "---"
 ["Insert filename at point" 
gnuplot-insert-filename t]
 ["Negate set option"gnuplot-negate-option t]
-["Keyword help" gnuplot-info-lookup-symbol
- (or gnuplot-keywords gnuplot-keywords-pending)]
+["Keyword help" gnuplot-info-lookup-symbol]
 ["Quick help for thing at point"gnuplot-help-function
  gnuplot-context-sensitive-mode]
 ["Info documentation on thing at point"
@@ -1788,13 +1776,9 @@ Negatable options are defined in 
`gnuplot-keywords-negatable-options'."
 
 ;; set up stuff for info-look (as suggested by )
 ;; modified with suggestion from 
-(defun gnuplot-setup-info-look ()
+(defun gnuplot--setup-info-look ()
   "Setup info-look in the gnuplot buffer.
-
-Also set the variable `gnuplot-keywords' and do something sensible if
-info-look was not available."
-  (interactive)
-  (setq gnuplot-keywords-pending nil)
+Also set the variable `gnuplot--info-keywords'."
   ;; TODO Update info layout
   (let ((doc-spec
  '(("(gnuplot)Command_Index"   nil "[_a-zA-Z0-9]+")
@@ -1817,10 +1801,10 @@ info-look was not available."
 ;; user will not want them lying around
 (and (get-buffer "info dir")(kill-buffer "info dir"))
 (and (get-buffer "info dir<2>") (kill-buffer "info dir<2>")))
-  (setq gnuplot-keywords (gnuplot--set-keywords-list)))
+  (setq gnuplot--info-keywords (gnuplot--set-keywords-list)))
 
 (defun gnuplot--set-keywords-list ()
-  "Set `gnuplot-keywords' from `info-lookup-cache'.
+  "Set `gnuplot--info-keywords' from `info-lookup-cache'.
 Return a list of keywords."
   (let* ((list (cdr (assoc 'symbol info-lookup-cache)))
  (list (cdr (cdr (assoc 'gnuplot-mode list
@@ -1856,16 +1840,16 @@ Return a list of keywords."
   "Return completions of keyword preceding point.
 
 Uses the cache of keywords generated by `info-lookup'.  See
-`gnuplot-setup-info-look'.  If non-nil, the return value is in the form
+`gnuplot--setup-info-look'.  If non-nil, the return value is in the form
 \(BEGIN END COMPLETIONS) where BEGIN and END are buffer
 positions and COMPLETIONS is a list."
 
-  (if gnuplot-keywords-pen

[elpa] externals/matlab-mode updated (3e1d826e3a -> 4af89e8496)

[ELPA Syncer]

elpasync pushed a change to branch externals/matlab-mode.

  from  3e1d826e3a matlab.el: matlab--imenu-index optimization
   new  e6bd1df9b8 doc/matlab-language-server-lsp-mode.org - add find 
references
   new  ccec38979a doc/matlab-language-server-lsp-mode.org: add title
   new  04e22322f3 README.org: move lsp content ino 
doc/matlab-language-server-lsp-mode.org
   new  ef6f75e86d doc/matlab-language-server-lsp-mode.org: update internal 
links
   new  07199c6e8f doc/matlab-language-server-lsp-mode.org: remove internal 
org links
   new  ec0b1080e3 doc/matlab-language-server-lsp-mode.org: remove the 
internal targets for links
   new  4af89e8496 doc/matlab-language-server-lsp-mode.org: fix a couple 
typos


Summary of changes:
 README.org |  24 ++-
 .../lsp-mode-annotated-pictures.pptx   | Bin 159572 -> 230890 bytes
 .../lspExample.m   |   2 -
 .../lspExample2.m  |   7 +++
 .../matlab-and-lsp-mode-find-references.png| Bin 0 -> 193622 bytes
 doc/matlab-language-server-lsp-mode.org|  70 +
 6 files changed, 57 insertions(+), 46 deletions(-)
 create mode 100644 doc/matlab-language-server-lsp-mode-files/lspExample2.m
 create mode 100644 
doc/matlab-language-server-lsp-mode-files/matlab-and-lsp-mode-find-references.png

[elpa] externals/matlab-mode ef6f75e86d 4/7: doc/matlab-language-server-lsp-mode.org: update internal links

[ELPA Syncer]

branch: externals/matlab-mode
commit ef6f75e86dd3a40df20463c26d34b878df1ef42d
Author: John Ciolfi 
Commit: John Ciolfi 

doc/matlab-language-server-lsp-mode.org: update internal links

The search-based links to heading don't work when the org file is viewed on 
github, thus try using
dedicate internal target links.
---
 doc/matlab-language-server-lsp-mode.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/matlab-language-server-lsp-mode.org 
b/doc/matlab-language-server-lsp-mode.org
index 5a174bd5ba..c060cbafac 100644
--- a/doc/matlab-language-server-lsp-mode.org
+++ b/doc/matlab-language-server-lsp-mode.org
@@ -29,7 +29,7 @@
 
 The [[https://github.com/mathworks/MATLAB-language-server][MATLAB Language 
Server]], matlabls, is used for code navigation, code completion,
 go to definition, find references, and more. To use matlabls, see 
[[Installation][installation]] below.
-matlabls also works with [[Windows Emacs with LSP][Emacs on Windows]].
+matlabls also works with [[Windows-Emacs-LSP][Emacs on Windows]].
 
 matlabls is a separate special MATLAB process that Emacs communicates with. 
For example, when you
 ask Emacs to jump to the definition of a function via =M-.= or =M-x 
xref-find-definitions=, Emacs
@@ -67,7 +67,7 @@ type =M-,= to jump back.
 
 [[file:matlab-language-server-lsp-mode-files/matlab-and-lsp-ui-imenu.png]]
 
-* Installation
+* Installation <>
 
 1. Install lsp-mode from MELPA
 
@@ -140,7 +140,7 @@ type =M-,= to jump back.
: M-?   Find references to the identifier at point (xref-find-references)
: M-,   Go back to the previous position in xref history (xref-go-back)
 
-** Windows Emacs with LSP
+** Windows Emacs with LSP <>
 
 The examples below were created on Windows 11 using Emacs 30.1.  The setup I 
used (May-29-2025):
 

[elpa] externals/matlab-mode 04e22322f3 3/7: README.org: move lsp content ino doc/matlab-language-server-lsp-mode.org

[ELPA Syncer]

branch: externals/matlab-mode
commit 04e22322f3bd21c608d6a1d9e255c4842eaafb86
Author: John Ciolfi 
Commit: John Ciolfi 

README.org: move lsp content ino doc/matlab-language-server-lsp-mode.org
---
 README.org  | 24 +---
 doc/matlab-language-server-lsp-mode.org | 18 +++---
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/README.org b/README.org
index bff86eff89..782c7bcb6e 100644
--- a/README.org
+++ b/README.org
@@ -14,25 +14,11 @@
 
 2. *Code navigation and more*
 
-   - The [[https://github.com/mathworks/MATLAB-language-server][MATLAB 
Language Server]], matlabls, for code navigation, code completion, go to 
definition,
- find references, and more. matlabls is a separate special MATLAB process 
that Emacs
- communicates with. For example, when you ask Emacs to jump to the 
definition of a function via
- =M-.= or =M-x xref-find-definitions=, Emacs will ask the matlabls process 
where the function is
- located and use it's response to jump to the definition.
-
- #+begin_example
-   +---+++
-   |   |||
-   |   Emacs   |<==>|  matlabls  |
-   |   |||
-   +---+++
- #+end_example
-
- You need to install and setup the MATLAB Language Server to use it.
- See 
[[file:doc/matlab-language-server-lsp-mode.org][doc/matlab-language-server-lsp-mode.org]].
-
-   - Imenu support for quickly jumping to function declarations in the current 
~*.m~ file.
- See [[file:doc/matlab-imenu.org][doc/matlab-imenu.org]].
+   - The [[file:doc/matlab-language-server-lsp-mode.org][MATLAB Language 
Server with Emacs]], matlabls, provides code navigation, code completion, go
+ to definition, find references, and more.
+
+   - Imenu support for quickly jumping to function declarations in the current 
~*.m~ or ~*.tlc~
+ file.  See [[file:doc/matlab-imenu.org][doc/matlab-imenu.org]].
 
 3. *M-x matlab-shell* for running and debugging MATLAB within Emacs (Unix 
only).
 
diff --git a/doc/matlab-language-server-lsp-mode.org 
b/doc/matlab-language-server-lsp-mode.org
index a3fc29f15d..5a174bd5ba 100644
--- a/doc/matlab-language-server-lsp-mode.org
+++ b/doc/matlab-language-server-lsp-mode.org
@@ -29,7 +29,20 @@
 
 The [[https://github.com/mathworks/MATLAB-language-server][MATLAB Language 
Server]], matlabls, is used for code navigation, code completion,
 go to definition, find references, and more. To use matlabls, see 
[[Installation][installation]] below.
-It also works with Emacs on Windows as show below.
+matlabls also works with [[Windows Emacs with LSP][Emacs on Windows]].
+
+matlabls is a separate special MATLAB process that Emacs communicates with. 
For example, when you
+ask Emacs to jump to the definition of a function via =M-.= or =M-x 
xref-find-definitions=, Emacs
+will ask the matlabls process where the function is located and use it's 
response to jump to the
+definition.
+
+#+begin_example
+  +---+++
+  |   |||
+  |   Emacs   |<==>|  matlabls  |
+  |   |||
+  +---+++
+#+end_example
 
 * Code Navigation - Jump to Definition and Back
 
@@ -92,7 +105,7 @@ type =M-,= to jump back.
 #+end_src
 
 In Emacs:
-
+
 : M-: (require 'lsp-matlab)
 : M-x customize-variable RET lsp-clients-matlab-server RET
 
@@ -138,4 +151,3 @@ The examples below were created on Windows 11 using Emacs 
30.1.  The setup I use
PATH before the gpg from MSYS2.
 4. Install the Emacs packages listed above.
 5. Install the MATLAB Lanugage Server as shown above.
-

[elpa] externals/matlab-mode 4af89e8496 7/7: doc/matlab-language-server-lsp-mode.org: fix a couple typos

[ELPA Syncer]

branch: externals/matlab-mode
commit 4af89e8496785416146521f5c57cfaf42f201634
Author: John Ciolfi 
Commit: John Ciolfi 

doc/matlab-language-server-lsp-mode.org: fix a couple typos
---
 doc/matlab-language-server-lsp-mode.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/matlab-language-server-lsp-mode.org 
b/doc/matlab-language-server-lsp-mode.org
index 4b641dad2c..9b9b8d0aef 100644
--- a/doc/matlab-language-server-lsp-mode.org
+++ b/doc/matlab-language-server-lsp-mode.org
@@ -32,7 +32,7 @@ go to definition, find references, and more. To use matlabls, 
see the Installati
 
 matlabls is a separate special MATLAB process that Emacs communicates with. 
For example, when you
 ask Emacs to jump to the definition of a function via =M-.= or =M-x 
xref-find-definitions=, Emacs
-will ask the matlabls process where the function is located and use it's 
response to jump to the
+will ask the matlabls process where the function is located and use its 
response to jump to the
 definition.
 
 #+begin_example
@@ -141,7 +141,7 @@ type =M-,= to jump back.
 
 ** Windows Emacs with LSP
 
-The examples below were created on Windows 11 using Emacs 30.1.  The setup I 
used (May-29-2025):
+The examples above were created on Windows 11 using Emacs 30.1.  The setup I 
used (May-29-2025):
 
 1. Install Emacs from [[https://www.gnu.org/software/emacs/download.html]]
 2. Install MSYS2 from [[https://www.msys2.org/]]
@@ -149,4 +149,4 @@ The examples below were created on Windows 11 using Emacs 
30.1.  The setup I use
not work with the Emacs package manager. Therefore, install gpg4win and 
place that gpg on the
PATH before the gpg from MSYS2.
 4. Install the Emacs packages listed above.
-5. Install the MATLAB Lanugage Server as shown above.
+5. Install the MATLAB Language Server as shown above.

[elpa] externals/matlab-mode e6bd1df9b8 1/7: doc/matlab-language-server-lsp-mode.org - add find references

[ELPA Syncer]

branch: externals/matlab-mode
commit e6bd1df9b8210532a28b5e17675017968721edf8
Author: John Ciolfi 
Commit: John Ciolfi 

doc/matlab-language-server-lsp-mode.org - add find references
---
 .../lsp-mode-annotated-pictures.pptx   | Bin 159572 -> 230890 bytes
 .../lspExample.m   |   2 -
 .../lspExample2.m  |   7 +++
 .../matlab-and-lsp-mode-find-references.png| Bin 0 -> 193622 bytes
 doc/matlab-language-server-lsp-mode.org|  49 -
 5 files changed, 35 insertions(+), 23 deletions(-)

diff --git 
a/doc/matlab-language-server-lsp-mode-files/lsp-mode-annotated-pictures.pptx 
b/doc/matlab-language-server-lsp-mode-files/lsp-mode-annotated-pictures.pptx
index 4826c0fd7b..ed60654935 100644
Binary files 
a/doc/matlab-language-server-lsp-mode-files/lsp-mode-annotated-pictures.pptx 
and 
b/doc/matlab-language-server-lsp-mode-files/lsp-mode-annotated-pictures.pptx 
differ
diff --git a/doc/matlab-language-server-lsp-mode-files/lspExample.m 
b/doc/matlab-language-server-lsp-mode-files/lspExample.m
index 89489b1867..4856c40f25 100644
--- a/doc/matlab-language-server-lsp-mode-files/lspExample.m
+++ b/doc/matlab-language-server-lsp-mode-files/lspExample.m
@@ -1,7 +1,5 @@
 function out = lspExample(a, b)
 % LSPEXAMPLE - Language Server Protocol example
-%
-%
 
 f1 = func1(a);
 f2 = func2(b);
diff --git a/doc/matlab-language-server-lsp-mode-files/lspExample2.m 
b/doc/matlab-language-server-lsp-mode-files/lspExample2.m
new file mode 100644
index 00..90804c4fb6
--- /dev/null
+++ b/doc/matlab-language-server-lsp-mode-files/lspExample2.m
@@ -0,0 +1,7 @@
+function out = lspExample2(a, b)
+% LSPEXAMPLE2 - Language Server Protocol example2
+
+x = func3(a);
+y = func3(b);
+out = x + y;
+end
diff --git 
a/doc/matlab-language-server-lsp-mode-files/matlab-and-lsp-mode-find-references.png
 
b/doc/matlab-language-server-lsp-mode-files/matlab-and-lsp-mode-find-references.png
new file mode 100644
index 00..b77c193369
Binary files /dev/null and 
b/doc/matlab-language-server-lsp-mode-files/matlab-and-lsp-mode-find-references.png
 differ
diff --git a/doc/matlab-language-server-lsp-mode.org 
b/doc/matlab-language-server-lsp-mode.org
index d8d57f46d2..b395ac427e 100644
--- a/doc/matlab-language-server-lsp-mode.org
+++ b/doc/matlab-language-server-lsp-mode.org
@@ -26,7 +26,33 @@
 #+options: toc:nil
 
 The [[https://github.com/mathworks/MATLAB-language-server][MATLAB Language 
Server]], matlabls, is used for code navigation, code completion,
-go to definition, find references, and more. To use matlabls,
+go to definition, find references, and more. To use matlabls, see 
[[Installation][installation]] below.
+It also works with Emacs on Windows as show below.
+
+* Code Navigation - Jump to Definition and Back
+
+Below we are in =lspExample.m= and then type =M-.= to jump to the definition 
in =func3.m=. We then
+type =M-,= to jump back.
+
+[[file:matlab-language-server-lsp-mode-files/matlab-lsp-mode-jump-to-definition.gif]]
+
+* Code Navigation - Find References
+
+[[file:matlab-language-server-lsp-mode-files/matlab-and-lsp-mode-find-references.png]]
+
+* Viewing Issues Without the lsp-ui Package
+
+[[file:matlab-language-server-lsp-mode-files/matlab-and-lsp-mode-flycheck.png]]
+
+* Viewing Issues With the lsp-ui Package
+
+[[file:matlab-language-server-lsp-mode-files/matlab-and-lsp-ui-sideline-mode.png]]
+
+* Navigation with lsp-ui-imenu
+
+[[file:matlab-language-server-lsp-mode-files/matlab-and-lsp-ui-imenu.png]]
+
+* Installation
 
 1. Install lsp-mode from MELPA
 
@@ -99,7 +125,7 @@ go to definition, find references, and more. To use matlabls,
: M-?   Find references to the identifier at point (xref-find-references)
: M-,   Go back to the previous position in xref history (xref-go-back)
 
-* Windows Emacs with LSP
+** Windows Emacs with LSP
 
 The examples below were created on Windows 11 using Emacs 30.1.  The setup I 
used (May-29-2025):
 
@@ -111,22 +137,3 @@ The examples below were created on Windows 11 using Emacs 
30.1.  The setup I use
 4. Install the Emacs packages listed above.
 5. Install the MATLAB Lanugage Server as shown above.
 
-* Code Navigation - Jump to Definition and Back
-
-Below we are in =lspExample.m= and then type =M-.= to jump to the definition 
in =func3.m=. We then
-type =M-,= to jump back.
-
-[[file:matlab-language-server-lsp-mode-files/matlab-lsp-mode-jump-to-definition.gif]]
-
-
-* Viewing Issues Without the lsp-ui Package
-
-[[file:matlab-language-server-lsp-mode-files/matlab-and-lsp-mode-flycheck.png]]
-
-* Viewing Issues With the lsp-ui Package
-
-[[file:matlab-language-server-lsp-mode-files/matlab-and-lsp-ui-sideline-mode.png]]
-
-* Navigation with lsp-ui-imenu
-
-[[file:matlab-language-server-lsp-mode-files/matlab-and-lsp-ui-imenu.png]]

[elpa] externals/matlab-mode ccec38979a 2/7: doc/matlab-language-server-lsp-mode.org: add title

[ELPA Syncer]

branch: externals/matlab-mode
commit ccec38979a815d7a077ecef8eafd50252f5c040a
Author: John Ciolfi 
Commit: John Ciolfi 

doc/matlab-language-server-lsp-mode.org: add title
---
 doc/matlab-language-server-lsp-mode.org | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/matlab-language-server-lsp-mode.org 
b/doc/matlab-language-server-lsp-mode.org
index b395ac427e..a3fc29f15d 100644
--- a/doc/matlab-language-server-lsp-mode.org
+++ b/doc/matlab-language-server-lsp-mode.org
@@ -25,6 +25,8 @@
 #+startup: inlineimages   //  C-c C-x C-v to toggle, C-c C-x C-M-v to 
redisplay
 #+options: toc:nil
 
+#+title: MATLAB Language Server and Emacs
+
 The [[https://github.com/mathworks/MATLAB-language-server][MATLAB Language 
Server]], matlabls, is used for code navigation, code completion,
 go to definition, find references, and more. To use matlabls, see 
[[Installation][installation]] below.
 It also works with Emacs on Windows as show below.

[nongnu] elpa/gnuplot 54bfa2ee89: Update README

[ELPA Syncer]

branch: elpa/gnuplot
commit 54bfa2ee894a751232557320bd227e01b965c11d
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update README
---
 README.org | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.org b/README.org
index c95f597704..eca5f93250 100644
--- a/README.org
+++ b/README.org
@@ -102,7 +102,7 @@ Gnuplot display. It requires Gnuplot to have =png= support 
and a GNU Emacs with
 image support. Call =gnuplot-external-display-mode= in a gnuplot-mode buffer to
 disable the feature.
 
-* FAQ / Remarks
+* Common issues
 
 ** Usage on Windows
 
@@ -150,7 +150,9 @@ this fix.
 
 * Maintenance
 
-Regenerate gnuplot.texi and gnuplot-eldoc.el from the Gnuplot source.
+Regenerate ~gnuplot.texi~ and ~gnuplot-eldoc.el~ from the Gnuplot source.
 
-1. ~emacs -batch -l doc2texi.el -f d2t-doc-to-texi~ inside the gnuplot-*/docs/ 
directory
-2. ~makeinfo --no-split gnuplot.texi~ and ensure that it compiles cleanly
+1. Run ~emacs -batch -l doc2texi.el -f d2t-doc-to-texi~ inside the 
~gnuplot-*/docs/~
+   source directory.
+2. Run ~makeinfo --no-split gnuplot.texi~ and ensure that it compiles cleanly.
+3. Copy ~gnuplot-eldoc.el~ and ~gnuplot.texi~ to the package source.

[elpa] externals/matlab-mode 07199c6e8f 5/7: doc/matlab-language-server-lsp-mode.org: remove internal org links

[ELPA Syncer]

branch: externals/matlab-mode
commit 07199c6e8fc1f06b70ad3fe9426bad2c0fd6db78
Author: John Ciolfi 
Commit: John Ciolfi 

doc/matlab-language-server-lsp-mode.org: remove internal org links

The internal org links don't work on github, so remove them.
---
 doc/matlab-language-server-lsp-mode.org | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/matlab-language-server-lsp-mode.org 
b/doc/matlab-language-server-lsp-mode.org
index c060cbafac..fc391fe6a9 100644
--- a/doc/matlab-language-server-lsp-mode.org
+++ b/doc/matlab-language-server-lsp-mode.org
@@ -28,8 +28,7 @@
 #+title: MATLAB Language Server and Emacs
 
 The [[https://github.com/mathworks/MATLAB-language-server][MATLAB Language 
Server]], matlabls, is used for code navigation, code completion,
-go to definition, find references, and more. To use matlabls, see 
[[Installation][installation]] below.
-matlabls also works with [[Windows-Emacs-LSP][Emacs on Windows]].
+go to definition, find references, and more. To use matlabls, see the 
Installation section below.
 
 matlabls is a separate special MATLAB process that Emacs communicates with. 
For example, when you
 ask Emacs to jump to the definition of a function via =M-.= or =M-x 
xref-find-definitions=, Emacs

[elpa] externals/matlab-mode ec0b1080e3 6/7: doc/matlab-language-server-lsp-mode.org: remove the internal targets for links

[ELPA Syncer]

branch: externals/matlab-mode
commit ec0b1080e30d360486a7ae5d9bd6a0bf8d10510e
Author: John Ciolfi 
Commit: John Ciolfi 

doc/matlab-language-server-lsp-mode.org: remove the internal targets for 
links
---
 doc/matlab-language-server-lsp-mode.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/matlab-language-server-lsp-mode.org 
b/doc/matlab-language-server-lsp-mode.org
index fc391fe6a9..4b641dad2c 100644
--- a/doc/matlab-language-server-lsp-mode.org
+++ b/doc/matlab-language-server-lsp-mode.org
@@ -66,7 +66,7 @@ type =M-,= to jump back.
 
 [[file:matlab-language-server-lsp-mode-files/matlab-and-lsp-ui-imenu.png]]
 
-* Installation <>
+* Installation
 
 1. Install lsp-mode from MELPA
 
@@ -139,7 +139,7 @@ type =M-,= to jump back.
: M-?   Find references to the identifier at point (xref-find-references)
: M-,   Go back to the previous position in xref history (xref-go-back)
 
-** Windows Emacs with LSP <>
+** Windows Emacs with LSP
 
 The examples below were created on Windows 11 using Emacs 30.1.  The setup I 
used (May-29-2025):
 

[nongnu] elpa/gnuplot b0de983c55 2/5: Remove dysfunctional gnuplot-comint-setup-hook

[ELPA Syncer]

branch: elpa/gnuplot
commit b0de983c556c145c5a3068238d9b2101f5ce2933
Author: Daniel Mendler 
Commit: Daniel Mendler 

Remove dysfunctional gnuplot-comint-setup-hook
---
 gnuplot.el | 11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnuplot.el b/gnuplot.el
index 5f358d132f..ba52663f28 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -117,17 +117,8 @@ region, a buffer, or a file."
   :group 'gnuplot-hooks
   :type 'hook)
 
-;; comint hook suggested by 
-(defcustom gnuplot-comint-setup-hook nil
-  "Hook run after setting up the gnuplot buffer in comint mode.
-So the configuration can be customised by the user."
-  :group 'gnuplot-hooks
-  :type 'hook)
-
 (defcustom gnuplot-comint-mode-hook nil
-  "Hook run after setting up the gnuplot buffer in `gnuplot-comint-mode'.
-By default this runs the hook named `gnuplot-comint-setup-hook',
-for backward compatibility."
+  "Hook run after setting up the gnuplot buffer in `gnuplot-comint-mode'."
   :group 'gnuplot-hooks
   :type 'hook)
 

[nongnu] elpa/gnuplot e86106983a 4/5: Drop variable gnuplot-eldoc-mode and gnuplot-tab-completion

[ELPA Syncer]

branch: elpa/gnuplot
commit e86106983a03a3ccad5620b698e469b976cf6a0b
Author: Daniel Mendler 
Commit: Daniel Mendler 

Drop variable gnuplot-eldoc-mode and gnuplot-tab-completion

Toggle the local eldoc-mode instead. Set tab-always-indent to 'complete 
instead.
---
 README.org |  3 +--
 gnuplot-context.el | 43 +++
 gnuplot.el | 17 ++---
 3 files changed, 14 insertions(+), 49 deletions(-)

diff --git a/README.org b/README.org
index 71fd6c257d..72b726e8b6 100644
--- a/README.org
+++ b/README.org
@@ -83,8 +83,7 @@ more specific help topic lookup in the gnuplot info file.
 
 If the context-sensitivity annoys you, you can get simple
 non-context-sensitive completion back by toggling
-=gnuplot-context-sensitive-mode=. See also the variable
-=gnuplot-tab-completion=.
+=gnuplot-context-sensitive-mode=.
 
 By its nature, the completion code has to know a fair bit about the
 structure of the gnuplot language. If you use it with an old version
diff --git a/gnuplot-context.el b/gnuplot-context.el
index 7953567510..3a8113b478 100644
--- a/gnuplot-context.el
+++ b/gnuplot-context.el
@@ -41,10 +41,9 @@
 ;;
 ;; Gnuplot's context sensitive mode is best controlled using Customize
 ;; (M-x customize-group gnuplot): simply enable the
-;; `gnuplot-context-sensitive-mode' setting.  You may also want to turn
-;; on `gnuplot-tab-completion' so that the TAB key does auto-completion
-;; on lines which are already indented.  (This just sets the Emacs
-;; variable `tab-always-indent' to `complete' in Gnuplot buffers).
+;; `gnuplot-context-sensitive-mode' setting.  You may also want to set
+;; the Emacs variable `tab-always-indent' to `complete' so that the
+;; TAB key does auto-completion on lines which are already indented.
 ;;
 ;; If you need to turn context sensitivity on or off from Lisp code
 ;; for some reason, call the function
@@ -53,18 +52,9 @@
 ;; With `eldoc-mode' support, gnuplot-mode will show one-line syntax
 ;; hints automatically in the echo area.  Whether eldoc-mode is active
 ;; or not, you can always pop up a longer description of syntax using
-;; `gnuplot-help-function' (C-c C-/ or C-c M-h).  ElDoc support also
-;; requires an additional file of help strings, `gnuplot-eldoc.el',
-;; which should be included in recent Gnuplot releases.  If it didn't
-;; come with your Gnuplot installation, you'll need to grab a recent
-;; source distribution of Gnuplot from http://gnuplot.info, and use
-;; the `doc2texi.el' program in the docs/ directory to create it.  So
-;; long as the file is on your Emacs load path somewhere it will be
-;; loaded automatically when needed.
-;;
-;; You can customize gnuplot-mode to turn on eldoc mode automatically
-;; using variable `gnuplot-eldoc-mode'.  Simply calling `eldoc-mode'
-;; will also work.
+;; `gnuplot-help-function' (C-c C-/ or C-c M-h).  ElDoc uses an additional
+;; file of help strings, `gnuplot-eldoc.el', which is provided with this
+;; package.
 ;;
 ;; Internal details
 ;; 
@@ -231,7 +221,6 @@
 
 (require 'cl-lib)
 (require 'gnuplot)
-(require 'eldoc)
 (require 'info)
 (require 'info-look)
 
@@ -2193,9 +2182,7 @@ Key bindings:
 
 \\[completion-at-point] will complete the keyword at point based
 on its context in the command. To make keyword completion work on
-pressing TAB, set `tab-always-indent' to `complete', or customize
-`gnuplot-tab-completion' to make this automatic in gnuplot-mode
-buffers.
+pressing TAB, set `tab-always-indent' to `complete'.
 
 \\[gnuplot-info-at-point] will try to find the most relevant
 Gnuplot info node for the construction at point, prompting for a
@@ -2204,7 +2191,7 @@ node name if nothing is found.
 \\[gnuplot-help-function] will pop up a brief summary of the
 syntax at point in the minibuffer. To have one-line syntax
 summaries appear in the echo area as you type, toggle
-`eldoc-mode' or customize `gnuplot-eldoc-mode'.
+`eldoc-mode'.
 
 To choose whether to use this mode by default in Gnuplot buffers,
 customize the variable
@@ -2223,18 +2210,10 @@ distribution. See gnuplot-context.el for details."
   ;; Turn on
   (progn
 (setq gnuplot-completion-at-point-function 
#'gnuplot-context-completion-at-point)
-
-;; Setup Eldoc
+;; Setup Eldoc and try to load Eldoc strings
 (add-hook 'eldoc-documentation-functions #'gnuplot-eldoc-function nil 
'local)
-(eldoc-add-command 'completion-at-point) ; Check for eldoc after 
completion
-
-;; Try to load Eldoc strings
-(when (and gnuplot-eldoc-mode (not gnuplot-eldoc-hash))
-  (load "gnuplot-eldoc" nil t))
-
-;; Set up tab-to-complete
-(when gnuplot-tab-completion
-  (setq-local tab-always-indent 'complete)))
+(unless gnuplot-eldoc-hash
+  (load "gnuplot-eldoc" nil t)))
 
 ;; Turn off
 (setq gnuplot-completion-at-point-function 
#'gnuplot-completion-at-point-info-look)
diff --git a/gnuplot.el b

[nongnu] elpa/gnuplot d2f59458df 1/5: Update .gitignore

[ELPA Syncer]

branch: elpa/gnuplot
commit d2f59458df7670450aea819870dfdfcc31816fb8
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update .gitignore
---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a9b1d846d8..dbf5c52652 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,3 @@
 /*-pkg.el
 /gnuplot-*.*.*/
 /gpelcard.ps
-/hacks.el
-/info-look.el
\ No newline at end of file

[nongnu] elpa/gnuplot updated (b1a93044d2 -> 993ff274dd)

[ELPA Syncer]

elpasync pushed a change to branch elpa/gnuplot.

  from  b1a93044d2 gnuplot-eldoc.el: Add lexical-binding cookie
   new  d2f59458df Update .gitignore
   new  b0de983c55 Remove dysfunctional gnuplot-comint-setup-hook
   new  2a77249284 Simplify handling of gnuplot info keywords
   new  e86106983a Drop variable gnuplot-eldoc-mode and 
gnuplot-tab-completion
   new  993ff274dd Try to load gnuplot-eldoc without an error for now


Summary of changes:
 .gitignore |  2 --
 README.org |  3 +-
 gnuplot-context.el | 43 ++--
 gnuplot-gui.el |  4 +--
 gnuplot.el | 98 +++---
 5 files changed, 41 insertions(+), 109 deletions(-)

[nongnu] elpa/cider 9b002c0b31: [Docs] Tweak some markup

[ELPA Syncer]

branch: elpa/cider
commit 9b002c0b311a180afd2f11d3de60ef0d6dbdb9bb
Author: Bozhidar Batsov 
Commit: Bozhidar Batsov 

[Docs] Tweak some markup
---
 doc/modules/ROOT/pages/usage/pretty_printing.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/modules/ROOT/pages/usage/pretty_printing.adoc 
b/doc/modules/ROOT/pages/usage/pretty_printing.adoc
index a2cd6ebc69..aaa322d831 100644
--- a/doc/modules/ROOT/pages/usage/pretty_printing.adoc
+++ b/doc/modules/ROOT/pages/usage/pretty_printing.adoc
@@ -23,8 +23,8 @@ of data on top of fipp, but at a slight performance cost.
 * `zprint` to use https://github.com/kkinnear/zprint[zprint], a fast and
 flexible alternative to the libraries mentioned above.
 
-For `fipp`, `puget`, and `zprint` printers to work, you need to add a
-respective dependency into your project explicitly.
+IMPORTANT: For `fipp`, `puget`, and `zprint` printers to work, you need to add 
a
+respective dependency in your project explicitly.
 
 Alternatively, `cider-print-fn` can be set to the namespace-qualified name of a
 Clojure var whose function takes three arguments: the object to print, the

[nongnu] elpa/gnuplot 993ff274dd 5/5: Try to load gnuplot-eldoc without an error for now

[ELPA Syncer]

branch: elpa/gnuplot
commit 993ff274ddba0fa62ded20292b1cd88c3d520baf
Author: Daniel Mendler 
Commit: Daniel Mendler 

Try to load gnuplot-eldoc without an error for now
---
 gnuplot-context.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnuplot-context.el b/gnuplot-context.el
index 3a8113b478..3cea606a19 100644
--- a/gnuplot-context.el
+++ b/gnuplot-context.el
@@ -2213,7 +2213,7 @@ distribution. See gnuplot-context.el for details."
 ;; Setup Eldoc and try to load Eldoc strings
 (add-hook 'eldoc-documentation-functions #'gnuplot-eldoc-function nil 
'local)
 (unless gnuplot-eldoc-hash
-  (load "gnuplot-eldoc" nil t)))
+  (load "gnuplot-eldoc" t t)))
 
 ;; Turn off
 (setq gnuplot-completion-at-point-function 
#'gnuplot-completion-at-point-info-look)

[nongnu] elpa/gnuplot 5566dee948 02/19: Update elpaignore and gitignore

[ELPA Syncer]

branch: elpa/gnuplot
commit 5566dee9486572ece70e2b7bce859914162b634b
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update elpaignore and gitignore
---
 .elpaignore | 2 +-
 .gitignore  | 7 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.elpaignore b/.elpaignore
index 4516fc0bf4..5fb3b1b6b2 100644
--- a/.elpaignore
+++ b/.elpaignore
@@ -7,4 +7,4 @@ gnuplot-debug-context.el
 gnuplot-test-context.el
 gnuplot-tests.el
 gpelcard.tex
-doc2texi.el
\ No newline at end of file
+doc2texi.el
diff --git a/.gitignore b/.gitignore
index dbf5c52652..5703cbe19e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,12 +3,9 @@
 *.elc
 *.log
 *.pdf
-*.tar.gz
-*.tar.xz
-*/#*#
+*.tar.*
 *~
-.#*
-/#*#
+\#*\#
 /*-autoloads.el
 /*-pkg.el
 /gnuplot-*.*.*/

[elpa] externals/embark 926f1028df 1/2: Add embark-target-buffer-at-point

[ELPA Syncer]

branch: externals/embark
commit 926f1028dff0ca0dc4adcc24436124f579fc0ec3
Author: Daniel Mendler 
Commit: Daniel Mendler 

Add embark-target-buffer-at-point

Works in ibuffer-mode and Buffer-menu-mode.

As discussed in #753
---
 embark.el | 9 +
 1 file changed, 9 insertions(+)

diff --git a/embark.el b/embark.el
index 913f8bdd5c..61350d68cf 100644
--- a/embark.el
+++ b/embark.el
@@ -176,6 +176,7 @@ or a list of such symbols."
 embark-target-email-at-point
 embark-target-url-at-point
 embark-target-file-at-point
+embark-target-buffer-at-point
 embark-target-custom-variable-at-point
 embark-target-identifier-at-point
 embark-target-guess-file-at-point
@@ -756,6 +757,14 @@ following exceptions:
 (when file
   `(file ,(abbreviate-file-name (expand-file-name file)) ,@bounds
 
+(defun embark-target-buffer-at-point ()
+  "Target buffer at point in Ibuffer or the buffer menu."
+  (when-let ((bol (pos-bol))
+ (buf (or (car (get-text-property bol 'ibuffer-properties))
+  (get-text-property bol 'tabulated-list-id)))
+ ((buffer-live-p buf)))
+`(buffer ,(buffer-name buf) ,bol . ,(pos-eol
+
 (defun embark-target-package-at-point ()
   "Target the package on the current line in a packages buffer."
   (when (derived-mode-p 'package-menu-mode)

[elpa] externals/embark 2941f2ea36 2/2: Merge pull request #757 from minad/buffer-at-point

[ELPA Syncer]

branch: externals/embark
commit 2941f2ea36d61c1a84c3f79ebe47d604c9a92b5d
Merge: 923d0ec52e 926f1028df
Author: Omar Antolín Camarena 
Commit: GitHub 

Merge pull request #757 from minad/buffer-at-point

Add embark-target-buffer-at-point
---
 embark.el | 9 +
 1 file changed, 9 insertions(+)

diff --git a/embark.el b/embark.el
index 913f8bdd5c..61350d68cf 100644
--- a/embark.el
+++ b/embark.el
@@ -176,6 +176,7 @@ or a list of such symbols."
 embark-target-email-at-point
 embark-target-url-at-point
 embark-target-file-at-point
+embark-target-buffer-at-point
 embark-target-custom-variable-at-point
 embark-target-identifier-at-point
 embark-target-guess-file-at-point
@@ -756,6 +757,14 @@ following exceptions:
 (when file
   `(file ,(abbreviate-file-name (expand-file-name file)) ,@bounds
 
+(defun embark-target-buffer-at-point ()
+  "Target buffer at point in Ibuffer or the buffer menu."
+  (when-let ((bol (pos-bol))
+ (buf (or (car (get-text-property bol 'ibuffer-properties))
+  (get-text-property bol 'tabulated-list-id)))
+ ((buffer-live-p buf)))
+`(buffer ,(buffer-name buf) ,bol . ,(pos-eol
+
 (defun embark-target-package-at-point ()
   "Target the package on the current line in a packages buffer."
   (when (derived-mode-p 'package-menu-mode)

[nongnu] elpa/gnuplot 47861d31d2 1/3: Update README

[ELPA Syncer]

branch: elpa/gnuplot
commit 47861d31d284b862e83cbf4844af5ee1577acb74
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update README
---
 README.org | 78 ++
 1 file changed, 32 insertions(+), 46 deletions(-)

diff --git a/README.org b/README.org
index eca5f93250..38eb02d288 100644
--- a/README.org
+++ b/README.org
@@ -6,17 +6,17 @@
 #+html: https://melpa.org/#/gnuplot";>https://melpa.org/packages/gnuplot-badge.svg"/>
 #+html: https://stable.melpa.org/#/gnuplot";>https://stable.melpa.org/packages/gnuplot-badge.svg"/>
 
-This package allows running [[http://www.gnuplot.info/][gnuplot]] files from 
within the [[https://www.gnu.org/software/emacs/][GNU Emacs]] editor. It
+This package allows running [[http://www.gnuplot.info/][Gnuplot]] files from 
within the [[https://www.gnu.org/software/emacs/][GNU Emacs]] editor. It
 features:
 
-- Syntax highlighting and indentation for gnuplot scripts.
-- Pull-down menus for common gnuplot-related tasks.
-- Interactive gnuplot sessions using =comint=.
+- Syntax highlighting and indentation for Gnuplot scripts.
+- Pull-down menus for common Gnuplot-related tasks.
+- Interactive Gnuplot sessions using =comint=.
 - Context-sensitive completion.
-- Inline display of gnuplot plots.
+- Inline display of Gnuplot plots.
 
-It is recommended to run =gnuplot-mode= on GNU Emacs 25 or above,
-using gnuplot version 5.0 or above.
+It is recommended to use GNU Emacs 25 or above, and Gnuplot version 5.0 or
+above.
 
 * Installation
 
@@ -26,23 +26,18 @@ The easiest way to install =gnuplot= is to directly get it 
from [[https://elpa.n
 
 : M-x install-package RET gnuplot RET
 
-or do =M-x list-packages= and search for =gnuplot= in the list. Note that 
there is
-an alternative =gnuplot-mode= package on MELPA which is less featureful.
-
-* Configuration
-
-=gnuplot-mode= is enabled automatically for =*.gp= files. The function
-=gnuplot-info-lookup-symbol= looks at the Gnuplot info file.
+or do =M-x list-packages= and search for =gnuplot= in the list. Note that 
there is a
+different [[https://github.com/mkmcc/gnuplot-mode][gnuplot-mode]] package on 
MELPA which is less featureful.
 
 * Usage
 
-Apart from enabling =gnuplot-mode= automatically for =*.gp= files, these 
functions
-are useful for starting up gnuplot-mode:
+=gnuplot-mode= is enabled automatically for =*.gp= files. These functions are 
useful
+as entry points:
 
-- =M-x run-gnuplot= : start gnuplot repl
-- =M-x gnuplot-mode= : start gnuplot-mode in the current buffer
-- =M-x gnuplot-make-buffer= : open a new buffer (which is not visiting
-  a file) and start gnuplot-mode in that buffer
+- =M-x run-gnuplot= - start =gnuplot-comint-mode= REPL.
+- =M-x gnuplot-mode= - switch to =gnuplot-mode= in the current buffer
+- =M-x gnuplot-make-buffer= - open a new buffer, which is not visiting a file, 
and
+  start =gnuplot-mode= in that buffer.
 
 ** Bindings
 
@@ -58,7 +53,7 @@ When =gnuplot-mode= is on, the following keybindings are 
available:
 | C-c C-c   | comment region   |
 | C-c C-o   | set arguments for command at point   |
 | S-mouse-2 | set arguments for command under mouse cursor |
-| C-c C-d   | read the gnuplot info file   |
+| C-c C-d   | read the gnuplot info manual |
 | C-c C-e   | show gnuplot buffer  |
 | C-c C-k   | kill gnuplot process |
 | C-c C-z   | customize gnuplot-mode   |
@@ -75,11 +70,11 @@ following:
 
 ** Context-sensitive keyword completion
 
-By default gnuplot-mode will try to parse your commands as you type and suggest
+By default =gnuplot-mode= will try to parse your commands as you type and 
suggest
 only relevant completion candidates on typing =M-TAB= or =TAB=. For example, 
with
 point after the =with= of a =plot= command, tab completion will suggest only
 plotting styles. This also enables more specific help topic lookup in the
-gnuplot info file.
+Gnuplot info manual.
 
 If the context-sensitivity annoys you, you can get simple non-context-sensitive
 completion back by toggling =gnuplot-context-sensitive-mode=.
@@ -96,46 +91,37 @@ context sensitivity is enabled. Both are enabled by default.
 
 ** Inline Images
 
-You can have plots displayed inline in the Gnuplot comint process buffer. This
+You can have plots displayed inline in the Gnuplot Comint process buffer. This
 is handy for trying things out without having to switch between Emacs and the
-Gnuplot display. It requires Gnuplot to have =png= support and a GNU Emacs with
-image support. Call =gnuplot-external-display-mode= in a gnuplot-mode buffer to
-disable the feature.
+Gnuplot display. It requires Gnuplot and Emacs to have =png= support. Call
+=gnuplot-external-display-mode= in a gnuplot-mode buffer to disable the 
feature.
 
 * Common issues
 
 ** Usage on Windows
 
 Multiple user

[nongnu] elpa/gnuplot updated (54bfa2ee89 -> 5e04cef90f)

[ELPA Syncer]

elpasync pushed a change to branch elpa/gnuplot.

  from  54bfa2ee89 Update README
   new  47861d31d2 Update README
   new  f779e6bfab Minor simplification
   new  5e04cef90f Do not require preloaded features


Summary of changes:
 README.org | 78 --
 gnuplot-gui.el |  1 -
 gnuplot.el | 13 +++---
 3 files changed, 36 insertions(+), 56 deletions(-)

[nongnu] elpa/gnuplot 5e04cef90f 3/3: Do not require preloaded features

[ELPA Syncer]

branch: elpa/gnuplot
commit 5e04cef90f2b78b31d3f06387b5ffc0cbb7c9d2b
Author: Daniel Mendler 
Commit: Daniel Mendler 

Do not require preloaded features
---
 gnuplot-gui.el | 1 -
 gnuplot.el | 8 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/gnuplot-gui.el b/gnuplot-gui.el
index b18ea7ae60..61d148e777 100644
--- a/gnuplot-gui.el
+++ b/gnuplot-gui.el
@@ -55,7 +55,6 @@
 ;;; Code:
 
 (require 'gnuplot)
-(require 'widget)
 (require 'wid-edit)
 (require 'cl-lib)
 
diff --git a/gnuplot.el b/gnuplot.el
index e9c299cacd..727b4a34f4 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -67,8 +67,6 @@
 
 (require 'cl-lib)
 (require 'comint)
-(require 'custom)
-(require 'easymenu)
 (require 'info)
 (require 'info-look)
 
@@ -77,11 +75,9 @@
   :prefix "gnuplot-"
   :group 'processes
   :group 'applications
-  :group 'local
   :link '(emacs-library-link :tag "Lisp File" "gnuplot.el")
-  :link '(url-link :tag "Homepage"
-   "https://github.com/emacs-gnuplot/gnuplot/";)
-  :link '(custom-manual "(gnuplot)Top")
+  :link '(url-link :tag "Homepage" "https://github.com/emacs-gnuplot/gnuplot/";)
+  :link '(info-link :tag "Info Manual" "(gnuplot)")
   :link '(emacs-commentary-link :tag "Commentary" "gnuplot.el"))
 
 (defgroup gnuplot-insertions nil

[nongnu] elpa/gnuplot f779e6bfab 2/3: Minor simplification

[ELPA Syncer]

branch: elpa/gnuplot
commit f779e6bfab79ec33760a7886f155040d33e7119b
Author: Daniel Mendler 
Commit: Daniel Mendler 

Minor simplification
---
 gnuplot.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnuplot.el b/gnuplot.el
index 4e0c0c9b75..e9c299cacd 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -1303,7 +1303,7 @@ buffer."
 (defun gnuplot--make-comint-buffer ()
   "Switch to the gnuplot program buffer or create one if none exists."
   (unless (and gnuplot-process (eq (process-status gnuplot-process) 'run)
-   gnuplot-buffer (buffer-live-p gnuplot-buffer))
+   (buffer-live-p gnuplot-buffer))
 (setq gnuplot-buffer (apply #'make-comint gnuplot-process-name 
gnuplot-program nil
 (and gnuplot-program-args (split-string 
gnuplot-program-args)))
   gnuplot-process (get-buffer-process gnuplot-buffer))
@@ -1417,8 +1417,7 @@ gnuplot process buffer will be displayed in a window."
 
 (defun gnuplot--setup-comint-for-image-mode ()
   "Setup comint for image."
-  (when (and gnuplot-buffer (buffer-live-p gnuplot-buffer)
- (get-buffer-process gnuplot-buffer))
+  (when (and (buffer-live-p gnuplot-buffer) (get-buffer-process 
gnuplot-buffer))
 (with-current-buffer gnuplot-buffer
   (if gnuplot-inline-image-mode
   (progn

[nongnu] elpa/gnuplot a950dcb53a 14/19: Remove Local variables

[ELPA Syncer]

branch: elpa/gnuplot
commit a950dcb53a7d446dc1a7b5b870676085d601d36a
Author: Daniel Mendler 
Commit: Daniel Mendler 

Remove Local variables
---
 gnuplot-context.el   | 3 ---
 gnuplot-debug-context.el | 4 
 gnuplot-gui.el   | 3 ---
 gnuplot-test-context.el  | 5 -
 gnuplot-tests.el | 4 
 gnuplot.el   | 3 ---
 6 files changed, 22 deletions(-)

diff --git a/gnuplot-context.el b/gnuplot-context.el
index 712ac9e88d..03b598d03e 100644
--- a/gnuplot-context.el
+++ b/gnuplot-context.el
@@ -2215,7 +2215,4 @@ distribution. See gnuplot-context.el for details."
 (remove-hook 'eldoc-documentation-functions #'gnuplot-eldoc-function 
'local)))
 
 (provide 'gnuplot-context)
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
 ;;; gnuplot-context.el ends here
diff --git a/gnuplot-debug-context.el b/gnuplot-debug-context.el
index f5a0f44c66..37a79ee5f3 100644
--- a/gnuplot-debug-context.el
+++ b/gnuplot-debug-context.el
@@ -112,8 +112,4 @@
 
 (gnuplot-debug-on)
 
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-
 ;;; gnuplot-debug-context.el ends here
diff --git a/gnuplot-gui.el b/gnuplot-gui.el
index dc72a73d47..6a098148c9 100644
--- a/gnuplot-gui.el
+++ b/gnuplot-gui.el
@@ -1637,7 +1637,4 @@ is non-nil if this is a \\='range widget."
'gnuplot-mode
 
 (provide 'gnuplot-gui)
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
 ;;; gnuplot-gui.el ends here
diff --git a/gnuplot-test-context.el b/gnuplot-test-context.el
index 210cb59e39..29076a0cd0 100644
--- a/gnuplot-test-context.el
+++ b/gnuplot-test-context.el
@@ -440,9 +440,4 @@
   (add-to-list 'compilation-error-regexp-alist 'gnuplot-test-errors))
 
 (provide 'gnuplot-test-context)
-
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-
 ;;; gnuplot-test-context.el ends here
diff --git a/gnuplot-tests.el b/gnuplot-tests.el
index 6fd7c57a3c..8020791995 100644
--- a/gnuplot-tests.el
+++ b/gnuplot-tests.el
@@ -249,8 +249,4 @@ mutliple # lines #")
 'comment' \
 \"containing strings\"")
 
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-
 ;;; gnuplot-tests.el ends here
diff --git a/gnuplot.el b/gnuplot.el
index 9067925358..bc0d4171ba 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -2015,7 +2015,4 @@ following in your .emacs file:
 (make-obsolete-variable 'gnuplot-tab-completion "Set tab-always-indent to 
'complete" "0.8.1")
 
 (provide 'gnuplot)
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
 ;;; gnuplot.el ends here

[nongnu] elpa/gnuplot 7c801260cd 17/19: Update acknowledgments

[ELPA Syncer]

branch: elpa/gnuplot
commit 7c801260cd332d8f67b528c100def1af14e560a4
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update acknowledgments
---
 gnuplot.el | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gnuplot.el b/gnuplot.el
index 008ca70ab4..2fa7f0e542 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -58,12 +58,9 @@
 ;;Holger Wenzelsuggested using `gnuplot-keywords-when'
 ;;Wolfgang Zocher  pointed out problem with gnuplot-mode + speedbar
 ;;Jon Oddieindentation, inline images, context mode
+;;Lars Hecking gnuplot distribution and installation materials
 ;;Maxime F. Treca  package update, XEmacs deprecation
 ;;Daniel Mendler   package update, support for recent Emacs
-;;
-;;  and especially to Lars Hecking  for including gnuplot-mode
-;;  with the gnuplot 3.7-beta distribution and for providing me with
-;;  installation materials
 ;;
 
 ;;; Code:

[elpa] externals/consult 98baed11ef: Revert "consult--directory-prompt: Don't use initial input"

[ELPA Syncer]

branch: externals/consult
commit 98baed11ef55146dace07abbba4388c40a8023aa
Author: Daniel Mendler 
Commit: Daniel Mendler 

Revert "consult--directory-prompt: Don't use initial input"

This reverts commit ec93a8a787bc0420838e4f201a996958fa3b9557.
---
 CHANGELOG.org | 2 --
 consult.el| 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 0972a652e6..311dbfbba6 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -5,8 +5,6 @@
 * Development
 
 - ~consult--source-buffer-register~: New source for buffer registers.
-- ~consult--directory-prompt~: Use current directory as default, no initial 
input
-  such that multiple files or directories can be selected more easily.
 - ~consult-compile-error~: Add prefix argument to jump to error message in the
   compilation buffer instead of error location.
 
diff --git a/consult.el b/consult.el
index d97bc2884f..dba6b46f90 100644
--- a/consult.el
+++ b/consult.el
@@ -830,6 +830,7 @@ asked for the directories or files to search via
   ;; Preserve this-command across 
`completing-read-multiple' call,
   ;; such that `consult-customize' continues to work.
   (let ((this-command this-command)
+(def (abbreviate-file-name default-directory))
 ;; bug#75910: category instead of 
`minibuffer-completing-file-name'
 (minibuffer-completing-file-name t)
 (ignore-case 
read-file-name-completion-ignore-case))
@@ -837,9 +838,9 @@ asked for the directories or files to search via
 (lambda ()
   (setq-local completion-ignore-case ignore-case)
   (set-syntax-table 
minibuffer-local-filename-syntax))
-  (completing-read-multiple (format-prompt "Dirs or 
files" "./")
+  (completing-read-multiple "Directories or files: "
 
#'completion-file-name-table
-nil t nil 
'consult--path-history ""
+nil t def 
'consult--path-history def
((and `(,p) (guard (file-directory-p p))) p)
(ps (setq paths (mapcar (lambda (p)
  (file-relative-name (expand-file-name 
p)))

[elpa] externals/doric-themes updated (214f84c12e -> 9c48c20c93)

[ELPA Syncer]

elpasync pushed a change to branch externals/doric-themes.

  from  214f84c12e Add support for the dictionary faces
   new  3bbeb8f116 Make subset prompt use read-multiple-choice
   new  9c48c20c93 Make read-multiple-choice-face easier to notice


Summary of changes:
 doric-themes.el | 20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

[nongnu] elpa/clojure-ts-mode a16c6b46f7: [#23] Support syntax highlighting for embedded JS and C++

[ELPA Syncer]

branch: elpa/clojure-ts-mode
commit a16c6b46f7af693b19f4b9ac712134fcf738fbf3
Author: Roman Rudakov 
Commit: Bozhidar Batsov 

[#23] Support syntax highlighting for embedded JS and C++
---
 CHANGELOG.md |   5 ++
 README.md|   8 
 clojure-ts-mode.el   | 120 +--
 test/samples/embed.cljs  |  12 +
 test/samples/native.jank |   6 ++-
 5 files changed, 145 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aca43c6b81..85455994d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,11 @@
 - [#99](https://github.com/clojure-emacs/clojure-ts-mode/pull/99): Fix bug in 
`clojure-ts-align` when nested form has extra spaces.
 - [#99](https://github.com/clojure-emacs/clojure-ts-mode/pull/99): Fix bug in 
`clojure-ts-unwind` when there is only one expression after
   threading symbol.
+- Introduce `clojure-ts-jank-use-cpp-parser` customization which allows
+  highlighting C++ syntax in Jank `native/raw` forms.
+- Introduce `clojure-ts-clojurescript-use-js-parser` customization which allows
+  highlighting JS syntax in ClojureScript `js*` forms.
+
 
 ## 0.4.0 (2025-05-15)
 
diff --git a/README.md b/README.md
index 7bc21afa09..f165b7c22f 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,14 @@ Once installed, evaluate `clojure-ts-mode.el` and you 
should be ready to go.
 - 
[tree-sitter-regex](https://github.com/tree-sitter/tree-sitter-regex/releases/tag/v0.24.3),
 which will be used for regex literals if available and if
   `clojure-ts-use-regex-parser` is not `nil`.
 
+`clojure-ts-clojurescript-mode` can optionally use `tree-sitter-javascript` 
grammar
+to highlight JS syntax in `js*` forms.  This is enabled by default and can be
+turned off by setting `clojure-ts-clojurescript-use-js-parser` to `nil`.
+
+`clojure-ts-jank-mode` can optionally use `tree-sitter-cpp` grammar to 
highlight C++
+syntax in `native/raw` forms.  This is enabled by default and can be turned 
off by
+setting `clojure-ts-jank-use-cpp-parser` to `nil`.
+
 If you have `git` and a C compiler (`cc`) available on your system's `PATH`,
 `clojure-ts-mode` will install the
 grammars when you first open a Clojure file and `clojure-ts-ensure-grammars` is
diff --git a/clojure-ts-mode.el b/clojure-ts-mode.el
index abf54f1f16..746062f8ab 100644
--- a/clojure-ts-mode.el
+++ b/clojure-ts-mode.el
@@ -128,6 +128,18 @@ double quotes on the third column."
   :safe #'booleanp
   :package-version '(clojure-ts-mode . "0.4"))
 
+(defcustom clojure-ts-clojurescript-use-js-parser t
+  "When non-nil, use JS grammar to highlight syntax in js* forms."
+  :type 'boolean
+  :safe #'booleanp
+  :package-version '(clojure-ts-mode . "0.5"))
+
+(defcustom clojure-ts-jank-use-cpp-parser t
+  "When non-nil, use C++ grammar to highlight syntax in native/raw forms."
+  :type 'boolean
+  :safe #'booleanp
+  :package-version '(clojure-ts-mode . "0.5"))
+
 (defcustom clojure-ts-auto-remap t
   "When non-nil, redirect all `clojure-mode' buffers to `clojure-ts-mode'."
   :safe #'booleanp
@@ -489,6 +501,34 @@ When USE-REGEX is non-nil, include range settings for 
regex parser."
   :local t
   '((regex_content) @capture)
 
+(defun clojure-ts--fontify-string (node override _start _end &optional _rest)
+  "Fontify string content NODE with `font-lock-string-face'.
+
+In order to support embedded syntax highlighting for JS in ClojureScript
+and C++ in Jank we need to avoid fontifying string content in some
+special forms, such as native/raw in Jank and js* in ClojureScript,
+otherwise string face will interfere with embedded parser's faces.
+
+This function respects OVERRIDE argument by passing it to
+`treesit-fontify-with-override'.
+
+START and END arguments that are passed to this function are not start
+and end of the NODE, so we ignore them."
+  (let* ((prev (treesit-node-prev-sibling (treesit-node-parent node)))
+ (jank-native-p (and (derived-mode-p 'clojure-ts-jank-mode)
+ clojure-ts-jank-use-cpp-parser
+ (clojure-ts--symbol-node-p prev)
+ (string= (treesit-node-text prev) "native/raw")))
+ (js-interop-p (and (derived-mode-p 'clojure-ts-clojurescript-mode)
+clojure-ts-clojurescript-use-js-parser
+(clojure-ts--symbol-node-p prev)
+(string= (treesit-node-text prev) "js*"
+(when (not (or jank-native-p js-interop-p))
+  (treesit-fontify-with-override (treesit-node-start node)
+ (treesit-node-end node)
+ 'font-lock-string-face
+ override
+
 (defun clojure-ts--font-lock-settings (markdown-available regex-available)
   "Return font lock settings suitable for use in `treesit-font-lock-settings'.
 
@@ -501,7 +541,9 @@ literals with regex grammar."
(treesit-font

[elpa] externals/consult efad758b85: consult--directory-prompt: Shorten prompt

[ELPA Syncer]

branch: externals/consult
commit efad758b85b9b8af6d92e8c8d896eaba0623b8c3
Author: Daniel Mendler 
Commit: Daniel Mendler 

consult--directory-prompt: Shorten prompt
---
 consult.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/consult.el b/consult.el
index dba6b46f90..2aea1327a8 100644
--- a/consult.el
+++ b/consult.el
@@ -838,7 +838,7 @@ asked for the directories or files to search via
 (lambda ()
   (setq-local completion-ignore-case ignore-case)
   (set-syntax-table 
minibuffer-local-filename-syntax))
-  (completing-read-multiple "Directories or files: "
+  (completing-read-multiple "Dirs or files: "
 
#'completion-file-name-table
 nil t def 
'consult--path-history def
((and `(,p) (guard (file-directory-p p))) p)

[nongnu] elpa/gnuplot 0623dee9a1 7/8: Simplify completion setup

[ELPA Syncer]

branch: elpa/gnuplot
commit 0623dee9a1de4ad56fb3372fbc49d48b9ea92c0a
Author: Daniel Mendler 
Commit: Daniel Mendler 

Simplify completion setup
---
 gnuplot-context.el | 12 +---
 gnuplot.el | 16 +++-
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/gnuplot-context.el b/gnuplot-context.el
index 2c799420cd..66436c05db 100644
--- a/gnuplot-context.el
+++ b/gnuplot-context.el
@@ -2197,17 +2197,15 @@ customize the variable
 (message "Gnuplot context-sensitive mode works only in Gnuplot-mode 
buffers")
 (setq gnuplot-context-sensitive-mode nil))
   (if gnuplot-context-sensitive-mode
-  ;; Turn on
   (progn
-(setq gnuplot-completion-at-point-function 
#'gnuplot-context-completion-at-point)
-;; Setup Eldoc and try to load Eldoc strings
+(remove-hook 'completion-at-point-functions 
#'gnuplot-completion-at-point-info-look t)
+(add-hook 'completion-at-point-functions 
#'gnuplot-context-completion-at-point nil t)
 (add-hook 'eldoc-documentation-functions #'gnuplot-eldoc-function nil 
'local)
 (unless gnuplot-eldoc-hash
   (load "gnuplot-eldoc" t t)))
-
-;; Turn off
-(setq gnuplot-completion-at-point-function 
#'gnuplot-completion-at-point-info-look)
-(remove-hook 'eldoc-documentation-functions #'gnuplot-eldoc-function 
'local)))
+(add-hook 'completion-at-point-functions 
#'gnuplot-completion-at-point-info-look nil t)
+(remove-hook 'completion-at-point-functions 
#'gnuplot-context-completion-at-point t)
+(remove-hook 'eldoc-documentation-functions #'gnuplot-eldoc-function t)))
 
 (provide 'gnuplot-context)
 ;;; gnuplot-context.el ends here
diff --git a/gnuplot.el b/gnuplot.el
index 67c1fb4852..57ef625645 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -237,6 +237,7 @@ This is used when `gnuplot-display-process' is equal to 
`frame'.")
 These are set by `gnuplot--set-keywords-list' from the values in
 `info-lookup-cache'.")
 
+(defvar gnuplot-context-sensitive-mode nil)
 (autoload 'gnuplot-context-sensitive-mode "gnuplot-context")
 (autoload 'gnuplot-gui-set-options-and-insert "gnuplot-gui" nil t)
 (autoload 'gnuplot-gui-swap-simple-complete "gnuplot-gui" nil t)
@@ -1272,8 +1273,7 @@ buffer."
 #'gnuplot--protect-prompt-fn
 nil t)
 
-  ;; Set up completion, using completion-at-point
-  (add-hook 'completion-at-point-functions #'gnuplot-completion-at-point nil t)
+  (add-hook 'completion-at-point-functions 
#'gnuplot-completion-at-point-info-look nil t)
 
   ;; Set up menu (see below)
   (easy-menu-define
@@ -1752,16 +1752,6 @@ Return a list of keywords."
 ;; one using info-look and the new one (enabled by default) which
 ;; parses the command line to provide smarter completions.
 
-;; `gnuplot-completion-at-point-function' defines which one is
-;; used. `gnuplot-context-sensitive-mode' toggles between the two.
-
-(defvar gnuplot-completion-at-point-function 
#'gnuplot-completion-at-point-info-look
-  "Function to call to perform completion in Gnuplot buffers.")
-
-(defun gnuplot-completion-at-point ()
-  "Perform completion in Gnuplot buffers."
-  (funcall gnuplot-completion-at-point-function))
-
 ;; Older completion method using info-look
 (defun gnuplot-completion-at-point-info-look ()
   "Return completions of keyword preceding point.
@@ -1909,7 +1899,7 @@ a list:
   (setq-local beginning-of-defun-function #'gnuplot--beginning-of-defun)
   (setq-local end-of-defun-function #'gnuplot--end-of-continuation)
 
-  (add-hook 'completion-at-point-functions #'gnuplot-completion-at-point nil t)
+  (add-hook 'completion-at-point-functions 
#'gnuplot-completion-at-point-info-look nil t)
 
   (set-syntax-table gnuplot-mode-syntax-table)
 

[nongnu] elpa/gnuplot updated (5e04cef90f -> f78da5b339)

[ELPA Syncer]

elpasync pushed a change to branch elpa/gnuplot.

  from  5e04cef90f Do not require preloaded features
   new  3e1fd16fac use when instead of if+progn
   new  50c92c11ca Use equal instead of string=
   new  85bd75c513 Update docstrings
   new  bd343d4b02 Update changelog
   new  26d733deef Package header formatting
   new  e3c67b159e Make gnuplot frame variables private
   new  0623dee9a1 Simplify completion setup
   new  f78da5b339 Rename eldoc function


Summary of changes:
 CHANGELOG.org  |  80 --
 README.org |   5 +-
 gnuplot-context.el |  67 --
 gnuplot-gui.el |  55 ---
 gnuplot-tests.el   |   4 +-
 gnuplot.el | 198 +++--
 6 files changed, 160 insertions(+), 249 deletions(-)

[nongnu] elpa/gnuplot 3e1fd16fac 1/8: use when instead of if+progn

[ELPA Syncer]

branch: elpa/gnuplot
commit 3e1fd16fac1bd00adc55e12cade6b37c62959338
Author: Daniel Mendler 
Commit: Daniel Mendler 

use when instead of if+progn
---
 gnuplot-gui.el |   2 +-
 gnuplot.el | 133 +++--
 2 files changed, 63 insertions(+), 72 deletions(-)

diff --git a/gnuplot-gui.el b/gnuplot-gui.el
index 61d148e777..6bc174309e 100644
--- a/gnuplot-gui.el
+++ b/gnuplot-gui.el
@@ -1207,7 +1207,7 @@ SAVE-FRAME is non-nil when the widgets are being reset."
 (setq gnuplot-gui-current-frame (selected-frame)
   gnuplot-gui-current-buffer (current-buffer)
   gnuplot-gui-current-buffer-point (point-marker))
-(unless (and gnuplot-gui-frame (frame-live-p gnuplot-gui-frame))
+(unless (frame-live-p gnuplot-gui-frame)
   (setq gnuplot-gui-frame (make-frame gnuplot-gui-frame-parameters)))
 (select-frame gnuplot-gui-frame)
 ;;(set-frame-position gnuplot-gui-frame 150 150) ;; so herky-jerky
diff --git a/gnuplot.el b/gnuplot.el
index 727b4a34f4..a0d79b48cd 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -722,28 +722,27 @@ opening an argument-setting popup.")
 
 (defun gnuplot--setup-menubar ()
   "Initial setup of gnuplot and insertions menus."
-  (if gnuplot-insertions-menu-flag  ; set up insertions menu
-  (progn
-(setq gnuplot-insertions-top
-  '("insert set expression" "---"))
-(setq gnuplot-insertions-menu
-  (append (list "Insertions")
-  gnuplot-insertions-top
-  (list gnuplot-insertions-adornments)
-  (list gnuplot-insertions-plot-options)
-  (list gnuplot-insertions-terminal)
-  (list gnuplot-insertions-x-axis)
-  (list gnuplot-insertions-y-axis)
-  (list gnuplot-insertions-z-axis)
-  (list gnuplot-insertions-x2-axis)
-  (list gnuplot-insertions-y2-axis)
-  (list gnuplot-insertions-parametric-plots)
-  (list gnuplot-insertions-polar-plots)
-  (list gnuplot-insertions-surface-plots)
-  gnuplot-insertions-bottom))
-(easy-menu-define gnuplot-mode-insertions-menu gnuplot-mode-map
-  "Insertions menu used in Gnuplot-mode"
-  gnuplot-insertions-menu)))
+  (when gnuplot-insertions-menu-flag
+(setq gnuplot-insertions-top
+  '("insert set expression" "---"))
+(setq gnuplot-insertions-menu
+  (append (list "Insertions")
+  gnuplot-insertions-top
+  (list gnuplot-insertions-adornments)
+  (list gnuplot-insertions-plot-options)
+  (list gnuplot-insertions-terminal)
+  (list gnuplot-insertions-x-axis)
+  (list gnuplot-insertions-y-axis)
+  (list gnuplot-insertions-z-axis)
+  (list gnuplot-insertions-x2-axis)
+  (list gnuplot-insertions-y2-axis)
+  (list gnuplot-insertions-parametric-plots)
+  (list gnuplot-insertions-polar-plots)
+  (list gnuplot-insertions-surface-plots)
+  gnuplot-insertions-bottom))
+(easy-menu-define gnuplot-mode-insertions-menu gnuplot-mode-map
+  "Insertions menu used in Gnuplot-mode"
+  gnuplot-insertions-menu))
   (easy-menu-define ; set up gnuplot menu
 gnuplot-mode-menu gnuplot-mode-map "Menu used in gnuplot-mode"
 gnuplot-menu))
@@ -1019,15 +1018,14 @@ called by this function after all of STRING is sent to 
gnuplot."
   (setq gnuplot-comint-recent-buffer (current-buffer))
 
   ;; Create a gnuplot frame if needed
-  (if (equal gnuplot-display-process 'frame)
-  (or (and gnuplot-process-frame
-   (frame-live-p gnuplot-process-frame))
-  (let ((frame (selected-frame)))
-(setq gnuplot-process-frame (make-frame))
-(select-frame gnuplot-process-frame)
-(switch-to-buffer gnuplot-buffer)
-(delete-other-windows)
-(select-frame frame
+  (when (and (equal gnuplot-display-process 'frame)
+ (not (frame-live-p gnuplot-process-frame)))
+(let ((frame (selected-frame)))
+  (setq gnuplot-process-frame (make-frame))
+  (select-frame gnuplot-process-frame)
+  (switch-to-buffer gnuplot-buffer)
+  (delete-other-windows)
+  (select-frame frame)))
 
   (let ((list (gnuplot--split-string string)))
 (with-current-buffer (get-buffer gnuplot-buffer)
@@ -1071,7 +1069,7 @@ useful for function in `gnuplot-after-plot-hook'."
   (let (string (txt (or text 'region)))
 (cond ((equal major-mode 'gnuplot-mode)
(setq string (buffer-substring-no-properties begin end))
-   (if (string= (substring string -1) "\n") ()
+   (unless (equal (substring string -1) "\n")
  (setq string (concat s

[nongnu] elpa/gnuplot e3c67b159e 6/8: Make gnuplot frame variables private

[ELPA Syncer]

branch: elpa/gnuplot
commit e3c67b159ec00592faa21358da42076797778080
Author: Daniel Mendler 
Commit: Daniel Mendler 

Make gnuplot frame variables private
---
 gnuplot.el | 37 +++--
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/gnuplot.el b/gnuplot.el
index c6cb98c74a..67c1fb4852 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -133,10 +133,6 @@ useful for functions included in 
`gnuplot-after-plot-hook'.")
 (defvar gnuplot-process nil
   "Variable holding the process handle.")
 
-(defvar gnuplot-process-frame nil
-  "The frame for displaying the gnuplot process.
-This is used when `gnuplot-display-process' is equal to `frame'.")
-
 (defvar gnuplot-comint-recent-buffer nil
   "The most recently plotted gnuplot script buffer.
 This is used by the function that plot from the comint buffer.  It is
@@ -216,6 +212,7 @@ to the empty string."
   :type '(radio (const :tag "double quote"  "\"")
 (const :tag "single quote"  "\'")
 (const :tag "none"  ""  )))
+
 (defcustom gnuplot-basic-offset 4
   "Number of columns to indent lines inside a do- or if-else-block.
 
@@ -226,7 +223,11 @@ beginning the continued command."
   :group 'gnuplot
   :type 'integer)
 
-(defvar gnuplot-info-frame nil)
+(defvar gnuplot--process-frame nil
+  "The frame for displaying the gnuplot process.
+This is used when `gnuplot-display-process' is equal to `frame'.")
+
+(defvar gnuplot--info-frame nil)
 
 ;; with info-look, there is no need to carry this list around -- it
 ;; can be generated on the fly appropriate to the currently installed
@@ -1019,10 +1020,10 @@ called by this function after all of STRING is sent to 
gnuplot."
 
   ;; Create a gnuplot frame if needed
   (when (and (equal gnuplot-display-process 'frame)
- (not (frame-live-p gnuplot-process-frame)))
+ (not (frame-live-p gnuplot--process-frame)))
 (let ((frame (selected-frame)))
-  (setq gnuplot-process-frame (make-frame))
-  (select-frame gnuplot-process-frame)
+  (setq gnuplot--process-frame (make-frame))
+  (select-frame gnuplot--process-frame)
   (switch-to-buffer gnuplot-buffer)
   (delete-other-windows)
   (select-frame frame)))
@@ -1043,8 +1044,8 @@ called by this function after all of STRING is sent to 
gnuplot."
 (cond ((equal gnuplot-display-process 'window)
(gnuplot--display-and-recenter-comint-buffer))
   ((equal gnuplot-display-process 'frame)
-   ;;(raise-frame gnuplot-process-frame)
-   (with-selected-frame gnuplot-process-frame
+   ;;(raise-frame gnuplot--process-frame)
+   (with-selected-frame gnuplot--process-frame
  (gnuplot--display-and-recenter-comint-buffer
 
 (setq gnuplot-recently-sent text)
@@ -1366,10 +1367,10 @@ gnuplot process buffer will be displayed in a window."
   (cond ((equal gnuplot-display-process 'window)
  (switch-to-buffer-other-window gnuplot-buffer))
 ((equal gnuplot-display-process 'frame)
- (or (frame-live-p gnuplot-process-frame)
- (setq gnuplot-process-frame (make-frame)))
- (raise-frame gnuplot-process-frame)
- (select-frame gnuplot-process-frame)
+ (or (frame-live-p gnuplot--process-frame)
+ (setq gnuplot--process-frame (make-frame)))
+ (raise-frame gnuplot--process-frame)
+ (select-frame gnuplot--process-frame)
  (switch-to-buffer gnuplot-buffer))
 (t
  (switch-to-buffer gnuplot-buffer
@@ -1819,10 +1820,10 @@ called."
(- (/ (frame-height) 2) (window-height)))
 
 (frame
- (unless (frame-live-p gnuplot-info-frame)
-   (setq gnuplot-info-frame (make-frame)))
- (select-frame gnuplot-info-frame)
- (raise-frame gnuplot-info-frame)
+ (unless (frame-live-p gnuplot--info-frame)
+   (setq gnuplot--info-frame (make-frame)))
+ (select-frame gnuplot--info-frame)
+ (raise-frame gnuplot--info-frame)
  (switch-to-buffer "*info*"))
 
 (t

[nongnu] elpa/gnuplot 50c92c11ca 2/8: Use equal instead of string=

[ELPA Syncer]

branch: elpa/gnuplot
commit 50c92c11ca774dd19b622b1de599a3306eb8f275
Author: Daniel Mendler 
Commit: Daniel Mendler 

Use equal instead of string=
---
 gnuplot-gui.el   | 50 +-
 gnuplot-tests.el |  4 ++--
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/gnuplot-gui.el b/gnuplot-gui.el
index 6bc174309e..9ba7672a86 100644
--- a/gnuplot-gui.el
+++ b/gnuplot-gui.el
@@ -835,9 +835,9 @@ Note that \"cntrparam\" is not currently supported."
   (set nil) (term nil))
   (save-excursion
 ;; there can be more then one command per line
-(if (re-search-forward termin end "to_limit")
-(progn (backward-char (length (match-string 1)))
-   (setq end (point-marker
+(when (re-search-forward termin end "to_limit")
+  (backward-char (length (match-string 1)))
+  (setq end (point-marker)))
 (goto-char begin)
 (skip-syntax-forward "-" end)
 ;; various constructions are recognized here. at the end of this
@@ -882,7 +882,7 @@ Note that \"cntrparam\" is not currently supported."
(when (or
   (and (equal gnuplot-gui-plot-splot-fit-style 
'complete)
(cl-member word '("plot" "splot" "fit")
-  :test 'string=))
+  :test 'equal))
   (equal word "test"))
  (gnuplot-gui-set-frame-param 'height 32)
  (gnuplot-gui-set-frame-param 'top50))
@@ -890,7 +890,7 @@ Note that \"cntrparam\" is not currently supported."
(when (or
   (and (equal gnuplot-gui-plot-splot-fit-style 
'complete)
(cl-member word '("plot" "splot" "fit")
-  :test 'string=))
+  :test 'equal))
   (equal word "test"))
  (gnuplot-gui-set-frame-param 'height old-height)
  (gnuplot-gui-set-frame-param 'topold-top)) ))
@@ -956,21 +956,21 @@ bounding single quotes with double quotes, since double 
quotes are
 used in `gnuplot-gui-all-types'."
   (let (fixed-list quote quoted); remove blanks
 (setq list (cl-remove "\\s-+" list :test 'string-match)
-  list (cl-remove ""  list :test 'string=))
+  list (cl-remove ""  list :test 'equal))
 (while list ; concatinate parts of quoted string
   (if (not (string-match "^\\([\]\[()'\"]\\)" (car list)))
   (setq fixed-list (append fixed-list (list (car list
 (setq quote (match-string 1 (car list))
   quoted (car list))
-(if (string= quote "[") (setq quote "]"))
-(if (string= quote "(") (setq quote ")"))
+(if (equal quote "[") (setq quote "]"))
+(if (equal quote "(") (setq quote ")"))
 (while (and list
 (or (equal (length quoted) 1)
 (not (string-match (concat (regexp-quote quote) "$")
quoted
   (setq quoted (concat quoted " " (cadr list))
 list (cdr list)))
-(if (string= quote "'")
+(if (equal quote "'")
 (setq quoted (concat "\"" (substring quoted 1))
   quoted (concat (substring quoted 0 -1) "\"")))
 (setq fixed-list (append fixed-list (list quoted
@@ -1012,10 +1012,10 @@ arguments."
(match-cons (cl-member (concat "^" (car temp-list))
   values :test 'string-match)))
   (if (and (car match-cons) ; " " may be first elem. of list
-   (not (string= " " (car match-cons
+   (not (equal " " (car match-cons
   (setq this-cons (cons tag (car match-cons))
 arg-list (cl-remove (car temp-list) arg-list
-:test 'string= :count 1)
+:test 'equal :count 1)
 temp-list nil)
 (setq temp-list (cdr temp-list)
;;  tag (first number in list)
@@ -1032,26 +1032,26 @@ arguments."
   (setq temp-list (cdr temp-list))) )
;;  number with prefix
((equal symbol 'number)
-(cond ((and (string= prefix (car temp-list))
+(cond ((and (equal prefix (car temp-list))
 (string-match "^[-0-9.]+$" (cadr temp-list)))
(setq this-cons (cons tag (cadr temp-list))
  arg-list (cl-remove (car temp-list) arg-list
- :test 'string= :count 1)
+ 

[nongnu] elpa/gnuplot f78da5b339 8/8: Rename eldoc function

[ELPA Syncer]

branch: elpa/gnuplot
commit f78da5b3394439f8f4f30a4aa30637eaf2bec63b
Author: Daniel Mendler 
Commit: Daniel Mendler 

Rename eldoc function
---
 gnuplot-context.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnuplot-context.el b/gnuplot-context.el
index 66436c05db..d47dd9bce2 100644
--- a/gnuplot-context.el
+++ b/gnuplot-context.el
@@ -2046,7 +2046,7 @@ there."
 (gnuplot-context--completions)))
 
 ;; Eldoc help
-(defun gnuplot-eldoc-function (&rest _)
+(defun gnuplot-context-eldoc-function (&rest _)
   "Return the ElDoc string for the Gnuplot construction at point."
   (gnuplot-context--parse-at-point nil)
   gnuplot-context--eldoc)
@@ -2200,12 +2200,12 @@ customize the variable
   (progn
 (remove-hook 'completion-at-point-functions 
#'gnuplot-completion-at-point-info-look t)
 (add-hook 'completion-at-point-functions 
#'gnuplot-context-completion-at-point nil t)
-(add-hook 'eldoc-documentation-functions #'gnuplot-eldoc-function nil 
'local)
+(add-hook 'eldoc-documentation-functions 
#'gnuplot-context-eldoc-function nil 'local)
 (unless gnuplot-eldoc-hash
   (load "gnuplot-eldoc" t t)))
 (add-hook 'completion-at-point-functions 
#'gnuplot-completion-at-point-info-look nil t)
 (remove-hook 'completion-at-point-functions 
#'gnuplot-context-completion-at-point t)
-(remove-hook 'eldoc-documentation-functions #'gnuplot-eldoc-function t)))
+(remove-hook 'eldoc-documentation-functions 
#'gnuplot-context-eldoc-function t)))
 
 (provide 'gnuplot-context)
 ;;; gnuplot-context.el ends here

[nongnu] elpa/gnuplot 85bd75c513 3/8: Update docstrings

[ELPA Syncer]

branch: elpa/gnuplot
commit 85bd75c513f9a9eb35c6c10a5400ffd8af9e6192
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update docstrings
---
 gnuplot-context.el | 16 +---
 gnuplot.el | 22 ++
 2 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/gnuplot-context.el b/gnuplot-context.el
index 03b598d03e..4b003d3435 100644
--- a/gnuplot-context.el
+++ b/gnuplot-context.el
@@ -49,12 +49,10 @@
 ;; for some reason, call the function
 ;; `gnuplot-context-sensitive-mode', which behaves like a minor mode.
 ;;
-;; With `eldoc-mode' support, gnuplot-mode will show one-line syntax
-;; hints automatically in the echo area.  Whether eldoc-mode is active
-;; or not, you can always pop up a longer description of syntax using
-;; `gnuplot-help-function' (C-c C-/ or C-c M-h).  ElDoc uses an additional
-;; file of help strings, `gnuplot-eldoc.el', which is provided with this
-;; package.
+;; With `eldoc-mode' support, `gnuplot-mode' will show one-line syntax
+;; hints automatically in the echo area.  Whether `eldoc-mode' is
+;; active or not, you can always pop up a longer description of syntax
+;; using `gnuplot-help-function' (C-c C-/ or C-c M-h).
 ;;
 ;; Internal details
 ;; 
@@ -2190,11 +2188,7 @@ summaries appear in the echo area as you type, toggle
 
 To choose whether to use this mode by default in Gnuplot buffers,
 customize the variable
-`gnuplot-use-context-sensitive-completion'.
-
-Note: help strings for eldoc-mode and \\[gnuplot-help-function]
-need to be provided in an Emacs-readable form by the Gnuplot
-distribution. See gnuplot-context.el for details."
+`gnuplot-use-context-sensitive-completion'."
   :keymap
   `((,(kbd "C-c C-/") . gnuplot-help-function)
 (,(kbd "C-c C-d") . gnuplot-info-at-point))
diff --git a/gnuplot.el b/gnuplot.el
index a0d79b48cd..c6cb98c74a 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -1871,22 +1871,12 @@ Report bugs at 
https://github.com/emacs-gnuplot/gnuplot/issues
 
 --O--
 
-Gnuplot-mode includes two different systems for keyword
-completion and documentation lookup: a newer one,
-`gnuplot-context-sensitive-mode' (enabled by default), and a
-older one which extracts keywords from gnuplot's Info file.  Both
-systems allow looking up documentation in the Info file.  The
-older system also depends having the info file properly installed
-to make a list of keywords.
-
-The info file should be installed by default with the Gnuplot
-distribution, or is available at the `gnuplot-mode' web page:
-https://github.com/emacs-gnuplot/gnuplot/
-
-With the new context-sensitive mode active, `gnuplot-mode' can also
-provide function/`eldoc-mode' syntax hints as you type.  This requires a
-separate file of strings, `gnuplot-eldoc.el', which is also
-provided by recent Gnuplot distributions.
+Gnuplot-mode includes two different systems for keyword completion and
+documentation lookup: a newer one, `gnuplot-context-sensitive-mode'
+(enabled by default), and a older one which extracts keywords from
+gnuplot's Info file.  Both systems allow looking up documentation in the
+Info file.  With the context-sensitive mode active, `gnuplot-mode' can
+also provide Eldoc syntax hints as you type.
 
 --O--
 

[nongnu] elpa/gnuplot 26d733deef 5/8: Package header formatting

[ELPA Syncer]

branch: elpa/gnuplot
commit 26d733deef1e94777c7f86db8393a2f4543ff39b
Author: Daniel Mendler 
Commit: Daniel Mendler 

Package header formatting
---
 gnuplot-context.el | 35 ++-
 gnuplot-gui.el |  3 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/gnuplot-context.el b/gnuplot-context.el
index 4b003d3435..2c799420cd 100644
--- a/gnuplot-context.el
+++ b/gnuplot-context.el
@@ -2,8 +2,7 @@
 
 ;; Copyright (C) 2012-2013 Jon Oddie 
 
-;; Author: Jon Oddie 
-;; URL:https://github.com/emacs-gnuplot/gnuplot
+;; Author: Jon Oddie 
 
 ;; This file is not part of GNU Emacs.
 
@@ -62,20 +61,22 @@
 ;; features was to do a complete parse of the command line.  So that's
 ;; what this package does.  Instead of building a parse tree, it
 ;; matches up until the token at point, and then either makes a list
-;; of possible completions, or sets the variables `gnuplot-context--eldoc' and
-;; `gnuplot-context--info-at-point' based on where it is in the grammar at that
-;; point.
+;; of possible completions, or sets the variables
+;; `gnuplot-context--eldoc' and `gnuplot-context--info-at-point' based
+;; on where it is in the grammar at that point.
 ;;
 ;; The parsing/matching process happens in two phases: tokenizing
-;; (`gnuplot-context--tokenize') and matching 
(`gnuplot-context--match-pattern').  In
-;; order to be able to construct a full list of possible completions
-;; via backtracking, the matching algorithm simulates a simple stack
-;; machine with continuations.  At byte-compile time, the PEG-like
-;; grammar in S-expression notation (`gnuplot-grammar') is compiled
-;; down into a vector of "machine code" for the parsing machine (see
-;; `gnuplot-context--compile-pattern', `gnuplot-context--compile-grammar' and
-;; `gnuplot-context--compiled-grammar').  This is complicated, but it seems to
-;; work well enough, and it saves on the Emacs call stack.
+;; (`gnuplot-context--tokenize') and matching
+;; (`gnuplot-context--match-pattern').  In order to be able to
+;; construct a full list of possible completions via backtracking, the
+;; matching algorithm simulates a simple stack machine with
+;; continuations.  At byte-compile time, the PEG-like grammar in
+;; S-expression notation (`gnuplot-grammar') is compiled down into a
+;; vector of "machine code" for the parsing machine (see
+;; `gnuplot-context--compile-pattern',
+;; `gnuplot-context--compile-grammar' and
+;; `gnuplot-context--compiled-grammar').  This is complicated, but it
+;; seems to work well enough, and it saves on the Emacs call stack.
 ;;
 ;; Compiling the grammar does require increasing `max-lisp-eval-depth'
 ;; modestly.  This shouldn't cause any problems on modern machines, and
@@ -88,9 +89,9 @@
 ;; The pattern-matching language
 ;; =
 ;;
-;; The gnuplot-mode grammar (see `gnuplot-context--compiled-grammar') is a list
-;; of rules (RULE PATTERN), with each pattern written in S-expression
-;; notation as follows:
+;; The gnuplot-mode grammar (see `gnuplot-context--compiled-grammar')
+;; is a list of rules (RULE PATTERN), with each pattern written in
+;; S-expression notation as follows:
 ;;
 ;;any
 ;;  Match any token
diff --git a/gnuplot-gui.el b/gnuplot-gui.el
index 9ba7672a86..80c6a27a07 100644
--- a/gnuplot-gui.el
+++ b/gnuplot-gui.el
@@ -2,8 +2,7 @@
 
 ;; Copyright (C) 1998-2000 Bruce Ravel
 
-;; Author: Bruce Ravel 
-;; URL:https://github.com/emacs-gnuplot/gnuplot
+;; Author: Bruce Ravel 
 
 ;; This file is not part of GNU Emacs.
 

[nongnu] elpa/gnuplot bd343d4b02 4/8: Update changelog

[ELPA Syncer]

branch: elpa/gnuplot
commit bd343d4b02006a0dc28ea9a575ff55d1e1dff39b
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update changelog
---
 CHANGELOG.org | 80 +++
 README.org|  5 ++--
 2 files changed, 16 insertions(+), 69 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 886c753948..56bced0656 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -1,5 +1,10 @@
 #+TITLE: Changelog for =gnuplot.el=
 
+* Development
+
+- Minor code cleanup and updates.
+- Removed deprecated functions.
+
 * Version 0.9 (2025-05-30)
 
 - Enable ~gnuplot-inline-image-mode~ by default.
@@ -13,202 +18,146 @@
 - Unbind ~M-RET~ for tab completion. Use the default ~M-TAB~ instead.
 - Fix compatibility with Emacs 30 and newer.
 
-* Version 0.8.1 (Feb 18th 2023)
-
-List of changes for =gnuplot.el= version 0.8.0 ranging from January 2021
-to February 2023.
+* Version 0.8.1 (2023-02-18)
 
 - Fixed the =completion-at-point= function
-
 - Improve lazy loading of the gnuplot-gui library
-
 - Remove legacy code
-
 - Lexical scoping and linting
 
-* Version 0.8.0 (Jan 3rd 2021)
-
-List of changes for =gnuplot.el= version 0.8.0 ranging from March 2014
-to January 2021.
+* Version 0.8.0 (2021-01-03)
 
 - Changed project license to GPLv3.
-
 - Greatly simplify the compilation process.
-
 - Fix deprecated calls to the =cl= library.
-
 - Deprecated XEmacs support. Bump minimal GNU Emacs version to 24.3.
-
 - Add a =gnuplot-program-args= variable for passing additional
   arguments to the gnuplot program binary.
-
 - The =gnuplot-inline-image-mode= can now take three values: =nil=,
 =inline=, =dedicated=.
-
 - Add the =gnuplot-use-context-sensitive-completion= configuration
   option.
-
 - Removed the =gnuplot-bug-report= function.
-
 - The provided =gnuplot.info= manual file has been updated for gnuplot
   version 5.2.6.
-
 - Add the =gnuplot-program-args= customization option to pass
   additional arguments to the gnuplot process.
-
 - Use =syntax-proprietize-rules= in gnuplot buffers.
-
 - =gnuplot-context-sensitive-mode= is now a normal minor mode.
-
 - Enable =completion-at-point= in gnuplot =comint= buffers.
-
 - Remove the unused =dotemacs.el= file.
-
 - =comint-process-echoes= is now buffer-local.
 
-
-* Version 0.7.0 (Oct 20th 2012)
+* Version 0.7.0 (2021-10-20)
 
 - Contextual completion & help, inline plots, some other stuff.
 
-* Version 0.6.0 (Dec 13th 2011)
+* Version 0.6.0 (2011-12-13)
 
 - Changed numbering scheme to accommodate gnuplot packaging
   requirements.
 - Moved to github, updated contact info.
 
-* Version 0.5.0 (Sep 16th 2002)
+* Version 0.5.0 (2002-09-16)
 
 - Wrote initial draft of gnuplot-gui.el, included it in insertions
   menu and in =gnuplot-insert=. Negate option function, bound to =C-c
   C-n=.
-
 - =C-c C-h= with no response goes to Commands menu. Transparent toolbar
   icons. Replace kw-compl with a simple completion function. Put
   gnuplot-toolbar code in gnuplot.el.
-
 - Send file uses the load command. add =gnuplot-plot-from-comint= and
   =gnuplot-save-and-plot-from-comint= and keybindings in the comint
   buffer. do =(process-kill-without-query gnuplot-process nil)=.
   =gnuplot-negate-option= checks if set option has a negated form.
-
 - =gnuplot-kill-gnuplot-buffer= made more robust. fixed a bug in
   =gnuplot-plot-from-comint=. fixed description of gnuplot-faces
   group.
-
 - Update copyright information, update gpelcard
-
 - Change installation materials. Add some support for hidden3d. Use
   constants in types alists in gui. Various other minor improvements
   to the types alists.
-
 - Removed =gnuplot-which-highlight= variable and revamped how
   colorization gets turned on. This is a bit tricky since I want it to
   work with font-lock under emacs and xemacs and with hilit19.
-
 - Insert space at end of unique completion. add a few GUI types,
   rewrite some stuff in the GUI interface. primitive support for plot,
   splot, and fit. Fixed completion in file widget.
-
 - Add =pgnuplot.c= and Win9x install instructions to the distribution.
   Fixed a defface bug. Added =gnuplot-keywords-when= allowing deferral
   of parsing the info file.
-
 - Fixed font-locking of strings and comments. Figure out
   =gnuplot-version= number from startup message and set
   =gnuplot-echo-command-line-flag= accordingly. Added
   =gnuplot-program-version= variable. Check that font-lock is actually
   a feature.
-
 - Added =gnuplot-determine-gnuplot-version= so that the gnuplot
   version number and =comint-process-echos= actually get set
   correctly. Actually, the first time something is plotted, the
   echoing might not work, but the second time it will.
-
 - Once again changed how =comint-process-echos= gets set. Maybe I got
   it right this time? Also fixed certain situations where the info
   file did notget properly loaded (insertion with info toggle on and
   info button in GUI).
-
 - Do a more robust check for the gnuplot process before k

[nongnu] elpa/gptel 45814df5dc: gptel-gh: Send vision-request header only when tracking media (#878)

[ELPA Syncer]

branch: elpa/gptel
commit 45814df5dca127cc2b0ec6d4e3daa1b7e57d8a5b
Author: kiennq 
Commit: GitHub 

gptel-gh: Send vision-request header only when tracking media (#878)

gptel-gh (gptel-make-gh-copilot): Only send the header requesting
vision support when the model supports it and it is explicitly
requested (via `gptel-track-media').
---
 gptel-gh.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gptel-gh.el b/gptel-gh.el
index 5b8527b934..5caef32a74 100644
--- a/gptel-gh.el
+++ b/gptel-gh.el
@@ -289,7 +289,9 @@ Then we need a session token."
   ("x-request-id" . ,(gptel--gh-uuid))
   ("vscode-sessionid" . ,(or (gptel--gh-sessionid 
gptel-backend) ""))
   ("vscode-machineid" . ,(or (gptel--gh-machineid 
gptel-backend) ""))
-  ("copilot-vision-request" . "true")
+  ,@(when (and gptel-track-media
+   (gptel--model-capable-p 'media))
+  `(("copilot-vision-request" . "true")))
   ("copilot-integration-id" . "vscode-chat"
   (host "api.githubcopilot.com")
   (protocol "https")

[elpa] externals/doric-themes 8a9951e919: Use the appropriate style for magit diff highlight faces

[ELPA Syncer]

branch: externals/doric-themes
commit 8a9951e9199e16204b3c175e408b845951eb9b3b
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Use the appropriate style for magit diff highlight faces
---
 doric-themes.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doric-themes.el b/doric-themes.el
index f9483102af..8ddaf47596 100644
--- a/doric-themes.el
+++ b/doric-themes.el
@@ -1203,6 +1203,7 @@ Run `doric-themes-after-load-theme-hook' after loading a 
theme."
 diff-indicator-added
 ediff-current-diff-B
 magit-diff-added
+magit-diff-added-highlight
 magit-diffstat-added
 smerge-lower
 ztreep-diff-model-add-face))
@@ -1210,7 +1211,6 @@ Run `doric-themes-after-load-theme-hook' after loading a 
theme."
 (defconst doric-themes-diff-added-refine-faces
   '(diff-refine-added
 ediff-fine-diff-B
-magit-diff-added-highlight
 smerge-refined-added))
 
 (defconst doric-themes-diff-changed-faces
@@ -1219,12 +1219,12 @@ Run `doric-themes-after-load-theme-hook' after loading 
a theme."
 diff-indicator-changed
 ediff-current-diff-C
 magit-diff-base
+magit-diff-base-highlight
 smerge-base))
 
 (defconst doric-themes-diff-changed-refine-faces
   '(diff-refine-changed
 ediff-fine-diff-C
-magit-diff-base-highlight
 smerge-refined-changed))
 
 (defconst doric-themes-diff-removed-faces
@@ -1233,6 +1233,7 @@ Run `doric-themes-after-load-theme-hook' after loading a 
theme."
 diff-indicator-removed
 ediff-current-diff-A
 magit-diff-removed
+magit-diff-removed-highlight
 magit-diffstat-removed
 smerge-upper
 ztreep-diff-model-diff-face))
@@ -1240,7 +1241,6 @@ Run `doric-themes-after-load-theme-hook' after loading a 
theme."
 (defconst doric-themes-diff-removed-refine-faces
   '(diff-refine-removed
 ediff-fine-diff-A
-magit-diff-removed-highlight
 smerge-refined-removed))
 
 (defconst doric-themes-error-foreground-only-faces

[nongnu] elpa/gptel 47519254b0 7/7: gptel-bedrock: Linting and byte-compilation

[ELPA Syncer]

branch: elpa/gptel
commit 47519254b08fa45e3169346b26e597c7c390a128
Author: Karthik Chikmagalur 
Commit: Karthik Chikmagalur 

gptel-bedrock: Linting and byte-compilation
---
 gptel-bedrock.el | 46 ++
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/gptel-bedrock.el b/gptel-bedrock.el
index 3f8b858bb1..2dfc3c8d4c 100644
--- a/gptel-bedrock.el
+++ b/gptel-bedrock.el
@@ -25,15 +25,18 @@
 ;; * 
https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_ConverseStream.html
 
 ;;; Code:
-(require 'cl-generic)
+(require 'cl-lib)
 (require 'map)
 (require 'gptel)
 (require 'mail-parse)
 
+(declare-function gptel-context--collect-media "gptel-context")
+(declare-function gptel-context--wrap "gptel-context")
+
 (cl-defstruct (gptel-bedrock (:constructor gptel--make-bedrock)
  (:copier nil)
  (:include gptel-backend))
- model-region)
+  model-region)
 
 (defconst gptel-bedrock--prompt-type
   ;; For documentation purposes only -- this describes the type of prompt 
objects that get passed
@@ -55,7 +58,7 @@
 :content (array (plist :text 
string
 
 (cl-defmethod gptel--request-data ((backend gptel-bedrock) prompts)
-  "Prepare request data for AWS Bedrock in converse format from PROMPTS."
+  "Prepare request data for AWS Bedrock BACKEND from PROMPTS."
   (nconc
`(:messages [,@prompts] :inferenceConfig (:maxTokens ,(or gptel-max-tokens 
500)))
(when gptel--system-message `(:system [(:text ,gptel--system-message)]))
@@ -70,7 +73,7 @@
 TOOLS is a list of `gptel-tool' structs, which see."
;; 
https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_ToolSpecification.html
(let ((default-outputs (cl-call-next-method))) ;; use openai tool-parse
- (map 'vector
+ (cl-map 'vector
   (lambda (tool spec)
 (list :toolSpec
   (list
@@ -484,26 +487,20 @@ conversation."
 (defvar gptel-bedrock--aws-profile-cache nil
   "Cache for AWS profile credentials in the form of (PROFILE . CREDS).")
 
-(defmacro gptel-bedrock--alist-get! (key alist &optional default force-updatep 
testfn)
-  (let ((key-sym (gensym "key")))
-(gv-letplace (getter setter) alist
-  `(let ((,key-sym ,key))
-(or (and (not ,force-updatep) (cdr (assoc ,key-sym ,getter ,@(if 
testfn `(,testfn)
-,@(when default
-`((let ((new-val ,default))
-,(funcall setter `(cons (cons ,key-sym new-val) ,getter))
-new-val
-
-(defun gptel-bedrock--fetch-aws-profile-credentials (profile &optional 
clear-cachep)
-  "Fetch & cache AWS credentials for PROFILE using aws-cli."
+(defun gptel-bedrock--fetch-aws-profile-credentials (profile &optional 
clear-cache)
+  "Fetch & cache AWS credentials for PROFILE using aws-cli.
+
+Non-nil CLEAR-CACHE will refresh credentials."
   (let* ((creds-json
-  (gptel-bedrock--alist-get! profile gptel-bedrock--aws-profile-cache
- (with-temp-buffer
- (unless (zerop (call-process "aws" nil t nil "configure" 
"export-credentials"
-  (format "--profile=%s" profile)))
-   (user-error "Failed to get AWS credentials from profile"))
-   (json-parse-string (buffer-string)))
- clear-cachep #'string=))
+   (let ((cell (or (assoc profile gptel-bedrock--aws-profile-cache 
#'string=)
+   (car (push (cons profile nil) 
gptel-bedrock--aws-profile-cache)
+ (or (and (not clear-cache) (cdr cell))
+ (setf (cdr cell)
+   (with-temp-buffer
+  (unless (zerop (call-process "aws" nil t nil 
"configure" "export-credentials"
+   (format "--profile=%s" 
profile)))
+(user-error "Failed to get AWS credentials from 
profile"))
+(json-parse-string (buffer-string)))
 (expiration (if-let (exp (gethash "Expiration" creds-json))
 (date-to-time exp
 (cond
@@ -512,7 +509,7 @@ conversation."
 (secret-key (gethash "SecretAccessKey" creds-json))
 (session-token (gethash "SessionToken" creds-json)))
 (cl-values access-key secret-key session-token)))
-  ((not clear-cachep)
+  ((not clear-cache)
(gptel-bedrock--fetch-aws-profile-credentials profile t))
   (t (user-error "AWS credentials expired for profile: %s" profile)
 
@@ -594,6 +591,7 @@ REGION is one of apac, eu or us."
(list (format "-Hx-amz-security-token: %s" token))
 
 (defun gptel-bedrock--curl-version ()
+  "Check Curl version required for gptel-bedrock."
   (let* ((output (shell-command-to-string "curl --version"))
  (version (and (string-match "^curl \\([

[nongnu] elpa/gptel updated (45814df5dc -> 47519254b0)

[ELPA Syncer]

elpasync pushed a change to branch elpa/gptel.

  from  45814df5dc gptel-gh: Send vision-request header only when tracking 
media (#878)
   new  404cf337b7 gptel-bedrock: Add gptel-bedrock.el backend for AWS 
Bedrock
   new  bcdf203827 gptel-bedrock: Get secret/token from AWS profile
   new  83915299d6 gptel-bedrock: Add Curl check in backend
   new  7acccf8a2d gptel-bedrock: Remove Curl stdout option in windows
   new  223b9ac6fb README: Add instructions for AWS Bedrock
   new  67111b43ab gptel-bedrock: Add Claude Sonnet/Opus 4 models
   new  47519254b0 gptel-bedrock: Linting and byte-compilation


Summary of changes:
 README.org   |  43 
 gptel-bedrock.el | 643 +++
 2 files changed, 686 insertions(+)
 create mode 100644 gptel-bedrock.el

[nongnu] elpa/gptel bcdf203827 2/7: gptel-bedrock: Get secret/token from AWS profile

[ELPA Syncer]

branch: elpa/gptel
commit bcdf2038271a2744b52ec009873a7ea314c15b27
Author: akṣaya śrīnivāsan 
Commit: Karthik Chikmagalur 

gptel-bedrock: Get secret/token from AWS profile

* gptel-bedrock.el (gptel-bedrock)
(gptel-bedrock--aws-profile-cache)
(gptel-bedrock--fetch-aws-profile-credentials)
(gptel-bedrock--get-credentials, gptel-bedrock--get-model-id)
(gptel-make-bedrock):
- Add caching of AWS profile creds
- Handle AWS model-region for provisioned models
- Use token-expiration for caching
---
 gptel-bedrock.el | 68 +++-
 1 file changed, 57 insertions(+), 11 deletions(-)

diff --git a/gptel-bedrock.el b/gptel-bedrock.el
index 3fab6d3ead..570ac2a0c4 100644
--- a/gptel-bedrock.el
+++ b/gptel-bedrock.el
@@ -33,7 +33,8 @@
 
 (cl-defstruct (gptel-bedrock (:constructor gptel--make-bedrock)
  (:copier nil)
- (:include gptel-backend)))
+ (:include gptel-backend))
+ model-region)
 
 (defconst gptel-bedrock--prompt-type
   ;; For documentation purposes only -- this describes the type of prompt 
objects that get passed
@@ -481,6 +482,41 @@ conversation."
   :content [(:text ,(plist-get tool-call :result))])))
  tool-use-requests
 
+(defvar gptel-bedrock--aws-profile-cache nil
+  "Cache for AWS profile credentials in the form of (PROFILE . CREDS).")
+
+(defmacro gptel-bedrock--alist-get! (key alist &optional default force-updatep 
testfn)
+  (let ((key-sym (gensym "key")))
+(gv-letplace (getter setter) alist
+  `(let ((,key-sym ,key))
+(or (and (not ,force-updatep) (cdr (assoc ,key-sym ,getter ,@(if 
testfn `(,testfn)
+,@(when default
+`((let ((new-val ,default))
+,(funcall setter `(cons (cons ,key-sym new-val) ,getter))
+new-val
+
+(defun gptel-bedrock--fetch-aws-profile-credentials (profile &optional 
clear-cachep)
+  "Fetch & cache AWS credentials for PROFILE using aws-cli."
+  (let* ((creds-json
+  (gptel-bedrock--alist-get! profile gptel-bedrock--aws-profile-cache
+ (with-temp-buffer
+ (unless (zerop (call-process "aws" nil t nil "configure" 
"export-credentials"
+  (format "--profile=%s" profile)))
+   (user-error "Failed to get AWS credentials from profile"))
+   (json-parse-string (buffer-string)))
+ clear-cachep #'string=))
+(expiration (if-let (exp (gethash "Expiration" creds-json))
+(date-to-time exp
+(cond
+  ((time-less-p (current-time) expiration)
+   (let ((access-key (gethash "AccessKeyId" creds-json))
+(secret-key (gethash "SecretAccessKey" creds-json))
+(session-token (gethash "SessionToken" creds-json)))
+(cl-values access-key secret-key session-token)))
+  ((not clear-cachep)
+   (gptel-bedrock--fetch-aws-profile-credentials profile t))
+  (t (user-error "AWS credentials expired for profile: %s" profile)
+
 (defun gptel-bedrock--get-credentials ()
   "Return the AWS credentials to use for the request.
 
@@ -491,12 +527,12 @@ AWS_SESSION_TOKEN).
 Convenient to use with `cl-multiple-value-bind'"
   (let ((key-id (getenv "AWS_ACCESS_KEY_ID"))
 (secret-key (getenv "AWS_SECRET_ACCESS_KEY"))
-(token (getenv "AWS_SESSION_TOKEN")))
+(token (getenv "AWS_SESSION_TOKEN"))
+   (profile (getenv "AWS_PROFILE")))
 (cond
- ((and key-id secret-key token) (cl-values key-id secret-key token))
- ((and key-id secret-key) (cl-values key-id secret-key))
- ;; TODO: Add support for more credential sources
- (t (user-error "Missing AWS credentials; currently only environment 
variables are supported")
+  ((and key-id secret-key) (cl-values key-id secret-key token))
+  ((and profile) (gptel-bedrock--fetch-aws-profile-credentials profile))
+  (t (user-error "Missing AWS credentials; currently only environment 
variables are supported")
 
 (defvar gptel-bedrock--model-ids
   ;; https://docs.aws.amazon.com/bedrock/latest/userguide/models-supported.html
@@ -531,10 +567,17 @@ IDs can be added or replaced by calling
 (cl-remove-if-not (lambda (model) (memq (car model) known-ids)) 
gptel--anthropic-models))
   "List of available AWS Bedrock models and associated properties.")
 
-(defun gptel-bedrock--get-model-id (model)
-  "Return the Bedrock model ID for MODEL."
-  (or (alist-get model gptel-bedrock--model-ids nil nil #'eq)
-  (error "Unknown Bedrock model: %s" model)))
+(defun gptel-bedrock--get-model-id (model &optional region)
+  "Return the Bedrock model ID for MODEL.
+
+REGION is one of apac, eu or us."
+  (concat
+   (when region
+ (or (member region '(apac eu us))
+(error "Unknown Bedrock region %s" region))
+ (

[nongnu] elpa/gptel 7acccf8a2d 4/7: gptel-bedrock: Remove Curl stdout option in windows

[ELPA Syncer]

branch: elpa/gptel
commit 7acccf8a2d6f113b6ba3686d3b791a784f0d4554
Author: akṣaya śrīnivāsan 
Commit: Karthik Chikmagalur 

gptel-bedrock: Remove Curl stdout option in windows

* gptel-bedrock.el (gptel-bedrock--curl-args): Don't output from
Curl to stdout when using Windows, as this causes issues (#867).
---
 gptel-bedrock.el | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gptel-bedrock.el b/gptel-bedrock.el
index 63829583bc..411cdb7838 100644
--- a/gptel-bedrock.el
+++ b/gptel-bedrock.el
@@ -586,8 +586,10 @@ REGION is one of apac, eu or us."
 (nconc
  (list
   "--user" (format "%s:%s" key-id secret)
-  "--aws-sigv4" (format "aws:amz:%s:bedrock" region)
-  "--output" "/dev/stdout") ;; Without this curl swallows the output
+  "--aws-sigv4" (format "aws:amz:%s:bedrock" region))
+ (unless (memq system-type '(windows-nt ms-dos))
+   ;; Without this curl swallows the output
+   (list "--output" "/dev/stdout"))
  (when token
(list (format "-Hx-amz-security-token: %s" token))
 

[nongnu] elpa/gptel 223b9ac6fb 5/7: README: Add instructions for AWS Bedrock

[ELPA Syncer]

branch: elpa/gptel
commit 223b9ac6fb83e588abdaed8f7df7bbeaebd7d0a5
Author: Karthik Chikmagalur 
Commit: Karthik Chikmagalur 

README: Add instructions for AWS Bedrock
---
 README.org | 43 +++
 1 file changed, 43 insertions(+)

diff --git a/README.org b/README.org
index 54c6bab295..98713aafb7 100644
--- a/README.org
+++ b/README.org
@@ -34,6 +34,7 @@ gptel is a simple Large Language Model chat client for Emacs, 
with support for m
 | Novita AI| ✓| 
[[https://novita.ai/model-api/product/llm-api?utm_source=github_gptel&utm_medium=github_readme&utm_campaign=link][Token]]
  |
 | xAI  | ✓| 
[[https://console.x.ai?utm_source=github_gptel&utm_medium=github_readme&utm_campaign=link][API
 key]]|
 | Github CopilotChat   | ✓| Github account |
+| Bedrock  | ✓| AWS credentials|
 #+html: 
 
 *General usage*: ([[https://www.youtube.com/watch?v=bsRnh_brggM][YouTube 
Demo]])
@@ -119,6 +120,7 @@ gptel uses Curl if available, but falls back to the 
built-in url-retrieve to wor
   - [[#novita-ai][Novita AI]]
   - [[#xai][xAI]]
   - [[#github-copilotchat][Github CopilotChat]]
+  - [[#aws-bedrock][AWS Bedrock]]
   - [[#usage][Usage]]
 - [[#in-any-buffer][In any buffer:]]
 - [[#in-a-dedicated-chat-buffer][In a dedicated chat buffer:]]
@@ -943,6 +945,47 @@ The above code makes the backend available to select.  If 
you want it to be the
 
 #+html: 
 
+#+html: 
+ AWS Bedrock
+#+html: 
+
+Register a backend with
+#+begin_src emacs-lisp
+(gptel-make-bedrock "AWS"
+  :region "ap-northeast-1"
+  ;; subset of gptel--bedrock-models
+  :models '(claude-3-5-sonnet-20241022)
+  ;; optional for provisioned access
+  :model-region 'apac)
+#+end_src
+
+The Bedrock backend gets your AWS credentials from the environment variables. 
It expects to find either
+~AWS_ACCESS_KEY_ID~, ~AWS_SECRET_ACCESS_KEY~, ~AWS_SESSION_TOKEN~ (optional), 
or if present, can use ~AWS_PROFILE~ to get these directly from the ~aws~ cli.
+
+NOTE: The Bedrock backend needs curl >= 8.5 in order for the sigv4 signing to 
work properly,
+https://github.com/curl/curl/issues/11794
+
+An error will be signalled if ~gptel-curl~ is ~NIL~.
+
+You can pick this backend from the menu when using gptel (see 
[[#usage][Usage]]).
+
+* (Optional) Set as the default gptel backend
+
+The above code makes the backend available to select.  If you want it to be 
the default backend for gptel, you can set this as the value of 
=gptel-backend=.  Use this instead of the above.
+#+begin_src emacs-lisp
+;; OPTIONAL configuration
+(setq gptel-model   'claude-3-5-sonnet-20241022
+  gptel-backend
+  (gptel-make-bedrock "AWS"
+   :region "ap-northeast-1"
+  ;; subset of gptel--bedrock-models
+  :models '(claude-3-5-sonnet-20241022)
+  ;; optional
+  :model-region 'apac))
+#+end_src
+
+#+html: 
+
 ** Usage
 
 gptel provides a few powerful, general purpose and flexible commands.  You can 
dynamically tweak their behavior to the needs of your task with /directives/, 
redirection options and more.  There is a 
[[https://www.youtube.com/watch?v=bsRnh_brggM][video demo]] showing various 
uses of gptel -- but =gptel-send= might be all you need.

[elpa] externals/beframe 7dd8bc1fb7: Make stylistic changes to beframe--global-buffers

[ELPA Syncer]

branch: externals/beframe
commit 7dd8bc1fb7fe478622dd88917e81b6cb5e7a64d1
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Make stylistic changes to beframe--global-buffers

We do not use the cl-loop elsewhere, so I prefer to be consistent.
Makes it easier to follow the entire code base.
---
 beframe.el | 38 +-
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/beframe.el b/beframe.el
index b338634986..020104f247 100644
--- a/beframe.el
+++ b/beframe.el
@@ -166,6 +166,31 @@ through `beframe--remove-internal-buffers'."
  (string-match-p regexp (buffer-name buffer
  buffers)))
 
+(defun beframe--parse-global-buffers ()
+  "Parse `beframe-global-buffers' into (regexp . symbols).
+Make strings a single regular expression out of all strings and collect
+any symbols into a list."
+  (let ((strings nil)
+(symbols nil))
+(dolist (element beframe-global-buffers)
+  (or (and (stringp element) (push element strings))
+  (and (symbolp element) (push element symbols
+(cons (string-join strings "\\|") symbols)))
+
+(defun beframe--global-buffers ()
+  "Return list of `beframe-global-buffers' buffer objects."
+  (pcase-let* ((public-buffers (beframe--get-buffers 'public))
+   (global-buffers nil)
+   (`(,regexp . ,modes) (beframe--parse-global-buffers)))
+(dolist (buffer public-buffers)
+  (cond
+   ((string-match-p regexp (buffer-name buffer))
+(push buffer global-buffers))
+   ((with-current-buffer buffer
+  (when (derived-mode-p modes)
+(push buffer global-buffers))
+global-buffers))
+
 (defun beframe--get-buffers (&optional arg)
   "Return list of buffers from different sources depending on ARG.
 
@@ -200,19 +225,6 @@ The following values of ARG can be used:
  (beframe--remove-internal-buffers (frame-parameter arg 'buffer-list)))
 (_ (user-error "Wrong argument in `beframe--get-buffers' pcase"
 
-(defun beframe--global-buffers ()
-  "Return list of `beframe-global-buffers' buffer objects."
-  (pcase-let* ((pub-buffs (beframe--get-buffers 'public))
-   (`(,str-re ,modes-lst)
-(cl-loop for E in beframe-global-buffers
- if (stringp E) collect E into str
- else if (symbolp E) collect E into sym
- finally return (list (string-join str "\\|") sym
-(cl-loop for b in pub-buffs
- if (string-match-p str-re (buffer-name b)) collect b
- else if (with-current-buffer b (derived-mode-p modes-lst))
- collect b)))
-
 (cl-defun beframe-buffer-list (&optional frame &key sort)
   "Return list of buffers that are used by the current frame.
 With optional FRAME as an object that satisfies `framep', return

[nongnu] elpa/gptel 67111b43ab 6/7: gptel-bedrock: Add Claude Sonnet/Opus 4 models

[ELPA Syncer]

branch: elpa/gptel
commit 67111b43ab5e762ce459aeaf37434ef0f95a221c
Author: Karthik Chikmagalur 
Commit: Karthik Chikmagalur 

gptel-bedrock: Add Claude Sonnet/Opus 4 models

* gptel-bedrock.el (gptel-anthropic, gptel-bedrock-model-ids)
(gptel--bedrock-models, gptel-make-bedrock): Add Claude
Sonnet/Opus 4 models.
---
 gptel-bedrock.el | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gptel-bedrock.el b/gptel-bedrock.el
index 411cdb7838..3f8b858bb1 100644
--- a/gptel-bedrock.el
+++ b/gptel-bedrock.el
@@ -28,7 +28,6 @@
 (require 'cl-generic)
 (require 'map)
 (require 'gptel)
-(require 'gptel-anthropic)
 (require 'mail-parse)
 
 (cl-defstruct (gptel-bedrock (:constructor gptel--make-bedrock)
@@ -536,7 +535,9 @@ Convenient to use with `cl-multiple-value-bind'"
 
 (defvar gptel-bedrock--model-ids
   ;; https://docs.aws.amazon.com/bedrock/latest/userguide/models-supported.html
-  '((claude-3-5-sonnet-20241022  . "anthropic.claude-3-5-sonnet-20241022-v2:0")
+  '((claude-sonnet-4-20250514. "anthropic.claude-sonnet-4-20250514-v1:0")
+(claude-opus-4-20250514  . "anthropic.claude-opus-4-20250514-v1:0")
+(claude-3-5-sonnet-20241022  . "anthropic.claude-3-5-sonnet-20241022-v2:0")
 (claude-3-5-sonnet-20240620  . "anthropic.claude-3-5-sonnet-20240620-v1:0")
 (claude-3-5-haiku-20241022   . "anthropic.claude-3-5-haiku-20241022-v1:0")
 (claude-3-opus-20240229  . "anthropic.claude-3-opus-20240229-v1:0")
@@ -563,8 +564,7 @@ IDs can be added or replaced by calling
 \(push (model-name . \"model-id\") gptel-bedrock--model-ids).")
 
 (defvar gptel--bedrock-models
-  (let ((known-ids (mapcar #'car gptel-bedrock--model-ids)))
-(cl-remove-if-not (lambda (model) (memq (car model) known-ids)) 
gptel--anthropic-models))
+  (mapcar #'car gptel-bedrock--model-ids)
   "List of available AWS Bedrock models and associated properties.")
 
 (defun gptel-bedrock--get-model-id (model &optional region)
@@ -615,6 +615,7 @@ Keyword arguments:
 REGION - AWS region name (e.g. \"us-east-1\")
 MODELS - The list of models supported by this backend
 MODEL-REGION - one of apac, eu, us or nil
+CURL-ARGS - additional curl args
 STREAM - Whether to use streaming responses or not."
   (declare (indent 1))
   (unless (and gptel-use-curl (version<= "8.5" (gptel-bedrock--curl-version)))

[nongnu] elpa/gptel 83915299d6 3/7: gptel-bedrock: Add Curl check in backend

[ELPA Syncer]

branch: elpa/gptel
commit 83915299d6142a239613c9c5705c3bfc21bba91c
Author: akṣaya śrīnivāsan 
Commit: Karthik Chikmagalur 

gptel-bedrock: Add Curl check in backend

* gptel-bedrock.el (gptel-bedrock--curl-args, gptel-make-bedrock):
gptel-bedrock requires Curl version 8.5 or higher.  Check for this
when creating a bedrock backend.
---
 gptel-bedrock.el | 9 +
 1 file changed, 9 insertions(+)

diff --git a/gptel-bedrock.el b/gptel-bedrock.el
index 570ac2a0c4..63829583bc 100644
--- a/gptel-bedrock.el
+++ b/gptel-bedrock.el
@@ -591,6 +591,12 @@ REGION is one of apac, eu or us."
  (when token
(list (format "-Hx-amz-security-token: %s" token))
 
+(defun gptel-bedrock--curl-version ()
+  (let* ((output (shell-command-to-string "curl --version"))
+ (version (and (string-match "^curl \\([0-9.]+\\)" output)
+   (match-string 1 output
+version))
+
 ;;;###autoload
 (cl-defun gptel-make-bedrock
 (name &key
@@ -609,6 +615,9 @@ MODELS - The list of models supported by this backend
 MODEL-REGION - one of apac, eu, us or nil
 STREAM - Whether to use streaming responses or not."
   (declare (indent 1))
+  (unless (and gptel-use-curl (version<= "8.5" (gptel-bedrock--curl-version)))
+(error "Bedrock-backend requires curl >= 8.5, but gptel-use-curl := %s, 
curl-version := %s"
+   gptel-use-curl (gptel-bedrock--curl-version)))
   (let ((host (format "bedrock-runtime.%s.amazonaws.com" region)))
 (setf (alist-get name gptel--known-backends nil nil #'equal)
   (gptel--make-bedrock

[nongnu] elpa/gptel 404cf337b7 1/7: gptel-bedrock: Add gptel-bedrock.el backend for AWS Bedrock

[ELPA Syncer]

branch: elpa/gptel
commit 404cf337b72bc29c6ed37b0c95b5390b8dd4e69e
Author: Felipe Ochoa 
Commit: Karthik Chikmagalur 

gptel-bedrock: Add gptel-bedrock.el backend for AWS Bedrock

* gptel-bedrock.el (gptel-bedrock, gptel-bedrock--prompt-type)
(gptel--request-data, gptel--parse-tools, gptel--parse-response)
(gptel-bedrock--record-tool-use, gptel--parse-list)
(gptel--wrap-user-prompt, gptel-bedrock--inject-media-context)
(gptel-bedrock--inject-text-context, gptel-bedrock--stream-cursor)
(gptel-curl--parse-stream, gptel-bedrock--parse-stream-message)
(gptel-bedrock--parse-headers, gptel-bedrock--bytes-to-int16)
(gptel-bedrock--bytes-to-int32, gptel-bedrock--bytes-to-int64)
(gptel-bedrock--bytes-to-uuid)
(gptel-bedrock--assemble-content-blocks, gptel--parse-buffer)
(gptel-bedrock--image-formats, gptel-bedrock--doc-formats)
(gptel-bedrock--parse-multipart, gptel--parse-tool-results)
(gptel-bedrock--fetch-aws-profile-credentials)
(gptel-bedrock--get-credentials, gptel-bedrock-model-ids)
(gptel-bedrock--get-model-id):
Add gptel-bedrock.el to support AWS Bedrock models.
---
 gptel-bedrock.el | 587 +++
 1 file changed, 587 insertions(+)

diff --git a/gptel-bedrock.el b/gptel-bedrock.el
new file mode 100644
index 00..3fab6d3ead
--- /dev/null
+++ b/gptel-bedrock.el
@@ -0,0 +1,587 @@
+;;; gptel-bedrock.el --- AWS Bedrock support for gptel  -*- lexical-binding: 
t; -*-
+
+;; Copyright (C) 2025 Karthik Chikmagalur
+
+;; Keywords: comm, convenience
+
+;; 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.
+
+;; 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 .
+
+;;; Commentary:
+
+;; This file adds support for AWS Bedrock to gptel.  Documentation for the 
request data and the
+;; response payloads can be found at these two links:
+;; * 
https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_Converse.html
+;; * 
https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_ConverseStream.html
+
+;;; Code:
+(require 'cl-generic)
+(require 'map)
+(require 'gptel)
+(require 'gptel-anthropic)
+(require 'mail-parse)
+
+(cl-defstruct (gptel-bedrock (:constructor gptel--make-bedrock)
+ (:copier nil)
+ (:include gptel-backend)))
+
+(defconst gptel-bedrock--prompt-type
+  ;; For documentation purposes only -- this describes the type of prompt 
objects that get passed
+  ;; around. 
https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_Message.html
+  '(plist
+:role (member "user" "assistant")
+:content (array (or (plist :text string)
+(plist :image (:format (member "png" "jpeg" "gif" 
"webp")
+   :source (plist :bytes string))) ; bytes 
is b64 encoded
+(plist :document (:format (member "pdf" "csv" "doc" 
"docx" "xls" "xlsx" "html" "txt" "md")
+  :name string
+  :source (plist :bytes string))) ; 
bytes is b64 encoded
+(plist :toolUse (plist :input any :name string 
:toolUseId string))
+(plist :toolResult (plist
+:toolUseId string
+:status (member "success" "error")
+;; AWS allows more result types in
+;; ToolResultContentBlock, but we 
only send text results
+:content (array (plist :text 
string
+
+(cl-defmethod gptel--request-data ((backend gptel-bedrock) prompts)
+  "Prepare request data for AWS Bedrock in converse format from PROMPTS."
+  (nconc
+   `(:messages [,@prompts] :inferenceConfig (:maxTokens ,(or gptel-max-tokens 
500)))
+   (when gptel--system-message `(:system [(:text ,gptel--system-message)]))
+   (when gptel-temperature `(:temperature ,gptel-temperature))
+   (when (and gptel-use-tools gptel-tools)
+ `(:toolConfig (:toolChoice ,(if (eq gptel-use-tools 'force) '(:any '()) 
'(:auto '()))
+:tools ,(gptel--parse-tools backend gptel-tools))
+
+(cl-defmethod gptel--parse-tools ((_backend gptel-bedrock) tools)
+  "Parse TOOLS and return a list of ToolSpecification objects.
+
+TOOLS is a list of `gptel-too