From f629d024af7ca608e8e63e005a62ad6e20fbc5a7 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sun, 26 Apr 2026 19:52:45 +0200 Subject: [PATCH] update gnuplot --- elpa/gnuplot-20260322.20/README-elpa | 10 ++++ .../dir | 0 .../gnuplot-autoloads.el | 18 ++++--- .../gnuplot-context.el | 18 +++---- .../gnuplot-eldoc.el | 0 .../gnuplot-gui.el | 50 +++++++++---------- .../gnuplot-pkg.el | 6 +-- .../gnuplot.el | 6 +-- .../gnuplot.info | 0 9 files changed, 57 insertions(+), 51 deletions(-) create mode 100644 elpa/gnuplot-20260322.20/README-elpa rename elpa/{gnuplot-20250724.1531 => gnuplot-20260322.20}/dir (100%) rename elpa/{gnuplot-20250724.1531 => gnuplot-20260322.20}/gnuplot-autoloads.el (87%) rename elpa/{gnuplot-20250724.1531 => gnuplot-20260322.20}/gnuplot-context.el (99%) rename elpa/{gnuplot-20250724.1531 => gnuplot-20260322.20}/gnuplot-eldoc.el (100%) rename elpa/{gnuplot-20250724.1531 => gnuplot-20260322.20}/gnuplot-gui.el (97%) rename elpa/{gnuplot-20250724.1531 => gnuplot-20260322.20}/gnuplot-pkg.el (74%) rename elpa/{gnuplot-20250724.1531 => gnuplot-20260322.20}/gnuplot.el (99%) rename elpa/{gnuplot-20250724.1531 => gnuplot-20260322.20}/gnuplot.info (100%) diff --git a/elpa/gnuplot-20260322.20/README-elpa b/elpa/gnuplot-20260322.20/README-elpa new file mode 100644 index 00000000..52caf5c8 --- /dev/null +++ b/elpa/gnuplot-20260322.20/README-elpa @@ -0,0 +1,10 @@ +This is a major mode for composing gnuplot scripts and displaying +their results using gnuplot. It supports features of recent Gnuplot +versions (5.0 and up), but should also work fine with older +versions. + +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 +`gnuplot-context-sensitive-mode'. diff --git a/elpa/gnuplot-20250724.1531/dir b/elpa/gnuplot-20260322.20/dir similarity index 100% rename from elpa/gnuplot-20250724.1531/dir rename to elpa/gnuplot-20260322.20/dir diff --git a/elpa/gnuplot-20250724.1531/gnuplot-autoloads.el b/elpa/gnuplot-20260322.20/gnuplot-autoloads.el similarity index 87% rename from elpa/gnuplot-20250724.1531/gnuplot-autoloads.el rename to elpa/gnuplot-20260322.20/gnuplot-autoloads.el index 88ce31e8..58ae3c15 100644 --- a/elpa/gnuplot-20250724.1531/gnuplot-autoloads.el +++ b/elpa/gnuplot-20260322.20/gnuplot-autoloads.el @@ -11,8 +11,8 @@ ;;; Generated autoloads from gnuplot.el -(autoload 'gnuplot-mode "gnuplot" "\ -Major mode for editing and executing GNUPLOT scripts. +(autoload 'gnuplot-mode "gnuplot" +"Major mode for editing and executing GNUPLOT scripts. This was written with version 4.6 of gnuplot in mind, but should work with newer and older versions. @@ -49,9 +49,13 @@ a list: 5. The GUI handling of \"hidden3d\" is flaky and \"cntrparam\" is unsupported. -(fn)" t) -(autoload 'gnuplot-make-buffer "gnuplot" "\ -Open a new buffer in `gnuplot-mode'. +In addition to any hooks its parent mode `prog-mode' might have run, +this mode runs the hook `gnuplot-mode-hook', as the final or +penultimate step during initialization. + +\\{gnuplot-mode-map}" t) +(autoload 'gnuplot-make-buffer "gnuplot" +"Open a new buffer in `gnuplot-mode'. When invoked, it switches to a new, empty buffer visiting no file and then starts `gnuplot-mode'. @@ -59,8 +63,8 @@ It is convenient to bind this function to a global key sequence. For example, to make the F10 key open a gnuplot script buffer, put the following in your .emacs file: (global-set-key [(f10)] \\='gnuplot-make-buffer)" t) -(autoload 'run-gnuplot "gnuplot" "\ -Run an inferior Gnuplot process." t) +(autoload 'run-gnuplot "gnuplot" +"Run an inferior Gnuplot process." t) (add-to-list 'auto-mode-alist '("\\.gp\\'" . gnuplot-mode)) (add-to-list 'interpreter-mode-alist '("gnuplot" . gnuplot-mode)) (register-definition-prefixes "gnuplot" '("gnuplot-")) diff --git a/elpa/gnuplot-20250724.1531/gnuplot-context.el b/elpa/gnuplot-20260322.20/gnuplot-context.el similarity index 99% rename from elpa/gnuplot-20250724.1531/gnuplot-context.el rename to elpa/gnuplot-20260322.20/gnuplot-context.el index 25831a61..46105053 100644 --- a/elpa/gnuplot-20250724.1531/gnuplot-context.el +++ b/elpa/gnuplot-20260322.20/gnuplot-context.el @@ -4,8 +4,6 @@ ;; Author: Jon Oddie -;; This file is not part of GNU Emacs. - ;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or @@ -472,7 +470,7 @@ name; otherwise continues tokenizing up to the token at point. FIXME." (t ; two patterns (let* ((pat1 (cadr pat)) - (pat2 (cl-caddr pat)) + (pat2 (caddr pat)) (pat1-c (gnuplot-context--compile-pattern pat1)) (pat2-c (gnuplot-context--compile-pattern pat2)) (pat1-l (length pat1-c)) @@ -509,7 +507,7 @@ name; otherwise continues tokenizing up to the token at point. FIXME." ;; Syntactic sugar for delimited lists ((delimited-list) (let* ((item (cadr pat)) - (sep (cl-caddr pat))) + (sep (caddr pat))) (gnuplot-context--compile-pattern `(sequence ,item (many (sequence ,sep ,item)))))) @@ -1799,7 +1797,7 @@ there." ;; (literal LITERAL NO-COMPLETE) ((literal) (let ((expect (cadr inst)) - (no-complete (cl-caddr inst))) + (no-complete (caddr inst))) (cond (end-of-tokens (unless no-complete (gnuplot-context--trace "\tpushing \"%s\" to completions\n" expect) @@ -1824,7 +1822,7 @@ there." ;; regexp-matches REGEXP, use NAME for completions ((keyword) (let ((regexp (cadr inst)) - (name (cl-caddr inst))) + (name (caddr inst))) (cond (end-of-tokens (gnuplot-context--trace "\tpushing \"%s\" to completions\n" name) (push name gnuplot-context--completions) @@ -1901,7 +1899,7 @@ there." ;; onto the stack ((push) (let* ((type (cadr inst)) - (value (cl-caddr inst))) + (value (caddr inst))) (push `(,type ,value ,tokens) stack))) ;; (pop TYPE): pop something off the stack @@ -1925,7 +1923,7 @@ there." (record (assoc name gnuplot-context--captures))) (if (not record) (error "Gnuplot-match-tokens: no open capture group named %s" name) - (setf (cl-caddr record) tokens) + (setf (caddr record) tokens) (gnuplot-context--debug (gnuplot-dump-captures))))) ;; (check-progress): make sure not stuck in an infinite loop @@ -1975,7 +1973,7 @@ there." (not (and gnuplot-context--info-at-point gnuplot-context--eldoc))) (let* ((item (car stack)) (type (car item)) - (position (cl-caddr item))) ; must progress by at least one token + (position (caddr item))) ; must progress by at least one token (if (and (memq type '(info eldoc no-scan)) (not (eq position tokens))) (cl-case type @@ -2013,7 +2011,7 @@ there." (let ((record (assoc name gnuplot-context--captures))) (if (not record) nil (let ((begin (cadr record)) - (end (cl-caddr record)) + (end (caddr record)) (accum '())) (while (and begin (not (eq begin end))) (push (pop begin) accum)) diff --git a/elpa/gnuplot-20250724.1531/gnuplot-eldoc.el b/elpa/gnuplot-20260322.20/gnuplot-eldoc.el similarity index 100% rename from elpa/gnuplot-20250724.1531/gnuplot-eldoc.el rename to elpa/gnuplot-20260322.20/gnuplot-eldoc.el diff --git a/elpa/gnuplot-20250724.1531/gnuplot-gui.el b/elpa/gnuplot-20260322.20/gnuplot-gui.el similarity index 97% rename from elpa/gnuplot-20250724.1531/gnuplot-gui.el rename to elpa/gnuplot-20260322.20/gnuplot-gui.el index 756c0bdc..86a9ac76 100644 --- a/elpa/gnuplot-20250724.1531/gnuplot-gui.el +++ b/elpa/gnuplot-20260322.20/gnuplot-gui.el @@ -4,8 +4,6 @@ ;; Author: Bruce Ravel -;; This file is not part of GNU Emacs. - ;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or @@ -872,16 +870,14 @@ Note that \"cntrparam\" is not currently supported." (old-top (gnuplot-gui-get-frame-param 'top))) (when (or (and (equal gnuplot-gui-plot-splot-fit-style 'complete) - (cl-member word '("plot" "splot" "fit") - :test 'equal)) + (member word '("plot" "splot" "fit"))) (equal word "test")) (gnuplot-gui-set-frame-param 'height 32) (gnuplot-gui-set-frame-param 'top 50)) (gnuplot-gui-prompt-for-frame word) (when (or (and (equal gnuplot-gui-plot-splot-fit-style 'complete) - (cl-member word '("plot" "splot" "fit") - :test 'equal)) + (member word '("plot" "splot" "fit"))) (equal word "test")) (gnuplot-gui-set-frame-param 'height old-height) (gnuplot-gui-set-frame-param 'top old-top)) )) @@ -946,8 +942,8 @@ argument, for example an axis label or a font name. It also replaces 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 'equal)) + (setq list (cl-remove "\\s-+" list :test #'string-match) + list (remove "" list)) (while list ; concatinate parts of quoted string (if (not (string-match "^\\([\]\[()'\"]\\)" (car list))) (setq fixed-list (append fixed-list (list (car list)))) @@ -998,15 +994,15 @@ arguments." (while temp-list (cond ;; ---------------------------- list - ((cl-member symbol '(list list*) :test 'equal) + ((memq symbol '(list list*)) (let* ((case-fold-search nil) (match-cons (cl-member (concat "^" (car temp-list)) - values :test 'string-match))) + values :test #'string-match))) (if (and (car match-cons) ; " " may be first elem. of list (not (equal " " (car match-cons)))) (setq this-cons (cons tag (car match-cons)) arg-list (cl-remove (car temp-list) arg-list - :test 'equal :count 1) + :test #'equal :count 1) temp-list nil) (setq temp-list (cdr temp-list))))) ;; ---------------------------- tag (first number in list) @@ -1027,16 +1023,16 @@ arguments." (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 'equal :count 1) + :test #'equal :count 1) arg-list (cl-remove (cadr temp-list) arg-list - :test 'equal :count 1) + :test #'equal :count 1) temp-list nil)) ;; --------------------- number without prefix ((and (not prefix) (string-match "^[-0-9.]+$" (car temp-list))) (setq this-cons (cons tag (car temp-list)) arg-list (cl-remove (car temp-list) arg-list - :test 'equal :count 1) + :test #'equal :count 1) temp-list nil)) (t (setq temp-list (cdr temp-list))))) @@ -1045,8 +1041,8 @@ arguments." (if (and (equal prefix (car temp-list)) (string-match "^[-0-9.]+$" (cadr temp-list))) (let ((this-car (cadr temp-list)) - (this-cdr (if (string-match "^[-0-9.]+$" (cl-caddr temp-list)) - (cl-caddr temp-list) ""))) + (this-cdr (if (string-match "^[-0-9.]+$" (caddr temp-list)) + (caddr temp-list) ""))) (setq this-cons (cons tag (cons this-car this-cdr)) temp-list nil)) (setq temp-list (cdr temp-list)))) @@ -1062,7 +1058,7 @@ arguments." (cons tag (cons (match-string 1 (car temp-list)) (match-string 2 (car temp-list)))) arg-list (cl-remove (car temp-list) arg-list - :test 'equal :count 1) + :test #'equal :count 1) temp-list nil) (setq temp-list (cdr temp-list)) )) ;; ---------------------------- labels @@ -1072,7 +1068,7 @@ arguments." ")") ; closing paren (car temp-list)) (let* ((list (split-string (car temp-list) "[ \t(),]+")) - (list (cl-remove "" list :test 'equal)) + (list (remove "" list)) (return ())) (while list (if (string-match "['\"]\\([^'\"]*\\)['\"]" (car list)) @@ -1084,18 +1080,18 @@ arguments." (setq list (cdr list)) ) (setq this-cons (cons tag return) arg-list (cl-remove (car temp-list) arg-list - :test 'equal :count 1) + :test #'equal :count 1) temp-list nil)) (setq temp-list (cdr temp-list))) ) ;; ---------------------------- string, file, format - ((cl-member symbol '(string file format) :test 'equal) + ((memq symbol '(string file format)) (if (string-match (concat "['\"]" ; opening quote "\\([^'\"]*\\)" ; string "['\"]") ; closing quote (car temp-list)) (setq this-cons (cons tag (match-string 0 (car temp-list))) arg-list (cl-remove (car temp-list) arg-list - :test 'equal :count 1) + :test #'equal :count 1) temp-list nil) (setq temp-list (cdr temp-list)) )) ;; ---------------------------- string* @@ -1103,9 +1099,9 @@ arguments." (if (equal prefix (car temp-list)) (setq this-cons (cons tag (cadr temp-list)) arg-list (cl-remove (car temp-list) arg-list - :test 'equal :count 1) + :test #'equal :count 1) arg-list (cl-remove (cadr temp-list) arg-list - :test 'equal :count 1) + :test #'equal :count 1) temp-list nil) (setq temp-list (cdr temp-list)) ) ) ;; ---------------------------- other or unknown @@ -1237,19 +1233,19 @@ SAVE-FRAME is non-nil when the widgets are being reset." (widget-insert "\t") ; insert the appropriate widget (cond ;;------------------------------ list, list* ------------ - ((cl-member (eval wtype) '(list list*) :test 'equal) + ((memq (eval wtype) '(list list*)) (let ((starred (if (equal (eval wtype) 'list*) t nil))) (gnuplot-gui-menu-choice tag default list starred))) ;;------------------------------ number, tag, fontsize -- - ((cl-member (eval wtype) '(number tag fontsize) :test 'equal) + ((memq (eval wtype) '(number tag fontsize)) (gnuplot-gui-number tag default prefix)) ;;------------------------------ position --------------- ;;------------------------------ range, pair ------------ - ((cl-member (eval wtype) '(range pair) :test 'equal) + ((memq (eval wtype) '(range pair)) (let ((is-range (equal (eval wtype) 'range))) (gnuplot-gui-range tag default prefix is-range))) ;;------------------------------ string, string* -------- - ((cl-member (eval wtype) '(string string*) :test 'equal) + ((memq (eval wtype) '(string string*)) (let ((starred (if (equal (eval wtype) 'string) nil t))) (gnuplot-gui-string tag default prefix starred))) ;;------------------------------ format ----------------- diff --git a/elpa/gnuplot-20250724.1531/gnuplot-pkg.el b/elpa/gnuplot-20260322.20/gnuplot-pkg.el similarity index 74% rename from elpa/gnuplot-20250724.1531/gnuplot-pkg.el rename to elpa/gnuplot-20260322.20/gnuplot-pkg.el index 18b68a0e..464b48ab 100644 --- a/elpa/gnuplot-20250724.1531/gnuplot-pkg.el +++ b/elpa/gnuplot-20260322.20/gnuplot-pkg.el @@ -1,11 +1,11 @@ ;; -*- no-byte-compile: t; lexical-binding: nil -*- -(define-package "gnuplot" "20250724.1531" +(define-package "gnuplot" "20260322.20" "Major-mode and interactive frontend for gnuplot." '((emacs "28.1") (compat "30")) :url "https://github.com/emacs-gnuplot/gnuplot" - :commit "43e9674b869475b1c2a32f045c167673eb2faae0" - :revdesc "43e9674b8694" + :commit "39ba1dec5e8e227ba093a30ca07b20d8eb038f29" + :revdesc "39ba1dec5e8e" :keywords '("data" "gnuplot" "plotting") :maintainers '(("Maxime Tréca" . "maxime@gmail.com") ("Daniel Mendler" . "mail@daniel-mendler.de"))) diff --git a/elpa/gnuplot-20250724.1531/gnuplot.el b/elpa/gnuplot-20260322.20/gnuplot.el similarity index 99% rename from elpa/gnuplot-20250724.1531/gnuplot.el rename to elpa/gnuplot-20260322.20/gnuplot.el index 7d749478..cefe01f1 100644 --- a/elpa/gnuplot-20250724.1531/gnuplot.el +++ b/elpa/gnuplot-20260322.20/gnuplot.el @@ -5,14 +5,12 @@ ;; Author: Jon Oddie, Bruce Ravel, Phil Type ;; Maintainer: Maxime Tréca , Daniel Mendler ;; Created: 1998 -;; Package-Version: 20250724.1531 -;; Package-Revision: 43e9674b8694 +;; Package-Version: 20260322.20 +;; Package-Revision: 39ba1dec5e8e ;; Keywords: data gnuplot plotting ;; URL: https://github.com/emacs-gnuplot/gnuplot ;; Package-Requires: ((emacs "28.1") (compat "30")) -;; This file is not part of GNU Emacs. - ;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or diff --git a/elpa/gnuplot-20250724.1531/gnuplot.info b/elpa/gnuplot-20260322.20/gnuplot.info similarity index 100% rename from elpa/gnuplot-20250724.1531/gnuplot.info rename to elpa/gnuplot-20260322.20/gnuplot.info -- 2.47.3