From 9d56d3c466953371309934eedf6d4e56a82948d2 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sun, 22 Dec 2024 13:01:36 +0100 Subject: [PATCH] update gnuplot Signed-off-by: Andreas Gerler --- elpa/gnuplot-20230323.1400/gnuplot-pkg.el | 14 -- .../gnuplot-autoloads.el | 87 ++++++------- .../gnuplot-context.el | 2 +- .../gnuplot-gui.el | 62 ++++----- elpa/gnuplot-20240914.1522/gnuplot-pkg.el | 10 ++ .../gnuplot.el | 11 +- elpa/gnuplot-readme.txt | 122 ------------------ 7 files changed, 86 insertions(+), 222 deletions(-) delete mode 100644 elpa/gnuplot-20230323.1400/gnuplot-pkg.el rename elpa/{gnuplot-20230323.1400 => gnuplot-20240914.1522}/gnuplot-autoloads.el (81%) rename elpa/{gnuplot-20230323.1400 => gnuplot-20240914.1522}/gnuplot-context.el (99%) rename elpa/{gnuplot-20230323.1400 => gnuplot-20240914.1522}/gnuplot-gui.el (97%) create mode 100644 elpa/gnuplot-20240914.1522/gnuplot-pkg.el rename elpa/{gnuplot-20230323.1400 => gnuplot-20240914.1522}/gnuplot.el (99%) delete mode 100644 elpa/gnuplot-readme.txt diff --git a/elpa/gnuplot-20230323.1400/gnuplot-pkg.el b/elpa/gnuplot-20230323.1400/gnuplot-pkg.el deleted file mode 100644 index d05b3bad..00000000 --- a/elpa/gnuplot-20230323.1400/gnuplot-pkg.el +++ /dev/null @@ -1,14 +0,0 @@ -(define-package "gnuplot" "20230323.1400" "Major-mode and interactive frontend for gnuplot" - '((emacs "25.1")) - :commit "f99effa21f85a4c0963fec6a38e9112a8157d27e" :authors - '(("Jon Oddie, Bruce Ravel, Phil Type")) - :maintainers - '(("Maxime Tréca , Daniel Mendler" . "mail@daniel-mendler.de")) - :maintainer - '("Maxime Tréca , Daniel Mendler" . "mail@daniel-mendler.de") - :keywords - '("data" "gnuplot" "plotting") - :url "https://github.com/emacs-gnuplot/gnuplot") -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/gnuplot-20230323.1400/gnuplot-autoloads.el b/elpa/gnuplot-20240914.1522/gnuplot-autoloads.el similarity index 81% rename from elpa/gnuplot-20230323.1400/gnuplot-autoloads.el rename to elpa/gnuplot-20240914.1522/gnuplot-autoloads.el index ab8ca90b..87425afa 100644 --- a/elpa/gnuplot-20230323.1400/gnuplot-autoloads.el +++ b/elpa/gnuplot-20240914.1522/gnuplot-autoloads.el @@ -1,12 +1,14 @@ -;;; gnuplot-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; +;;; gnuplot-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + ;;; Code: -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + -;;;### (autoloads nil "gnuplot" "gnuplot.el" (0 0 0 0)) ;;; Generated autoloads from gnuplot.el (autoload 'gnuplot-mode "gnuplot" "\ @@ -39,7 +41,7 @@ provided by recent Gnuplot distributions. There are several known shortcomings of `gnuplot-mode', version 0.5g and up. Many of the shortcomings involve the graphical interface -\(refered to as the GUI) to setting arguments to plot options. Here is +(refered to as the GUI) to setting arguments to plot options. Here is a list: 1. Currently there is no way for `gnuplot-mode' to know if information @@ -60,8 +62,7 @@ a list: ------O------ Key bindings: - \\{gnuplot-mode-map}" t nil) - + \\{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 @@ -70,45 +71,25 @@ and then starts `gnuplot-mode'. 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: - (autoload 'gnuplot-make-buffer \"gnuplot\" + (autoload \\='gnuplot-make-buffer \"gnuplot\" \"open a buffer in gnuplot mode\" t) - (global-set-key [(f10)] 'gnuplot-make-buffer)" t nil) - + (global-set-key [(f10)] \\='gnuplot-make-buffer)" t) (autoload 'run-gnuplot "gnuplot" "\ -Run an inferior Gnuplot process." t nil) - +Run an inferior Gnuplot process." t) (register-definition-prefixes "gnuplot" '("gnuplot-")) -;;;*** -;;;### (autoloads nil "gnuplot-context" "gnuplot-context.el" (0 0 -;;;;;; 0 0)) ;;; Generated autoloads from gnuplot-context.el (autoload 'gnuplot-context-sensitive-mode "gnuplot-context" "\ Use context-sensitive completion and help in `gnuplot-mode'. -This is a minor mode. If called interactively, toggle the -`Gnuplot-Context-Sensitive mode' mode. If the prefix argument is -positive, enable the mode, and if it is zero or negative, disable -the mode. - -If called from Lisp, toggle the mode if ARG is `toggle'. Enable -the mode if ARG is nil, omitted, or is a positive number. -Disable the mode if ARG is a negative number. - -To check whether the minor mode is enabled in the current buffer, -evaluate `gnuplot-context-sensitive-mode'. - -The mode's hook is called both when the mode is enabled and when -it is disabled. - When context-sensitive mode is enabled, `gnuplot-mode' tries to provide more useful completions and help suggestions for built-in keywords and functions by parsing each command as you type. It attempts to take into account Gnuplot's many abbreviated keywords. For example, with point at the end of a line reading -\"plot 'datafile' w \", typing \\[completion-at-point] will pop +\"plot \\='datafile\\=' w \", typing \\[completion-at-point] will pop up a list of plotting styles. Key bindings: @@ -136,45 +117,53 @@ 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. -\(fn &optional ARG)" t nil) +This is a minor mode. If called interactively, toggle the +`Gnuplot-Context-Sensitive mode' mode. If the prefix argument is +positive, enable the mode, and if it is zero or negative, disable the +mode. + +If called from Lisp, toggle the mode if ARG is `toggle'. Enable the +mode if ARG is nil, omitted, or is a positive number. Disable the mode +if ARG is a negative number. + +To check whether the minor mode is enabled in the current buffer, +evaluate the variable `gnuplot-context-sensitive-mode'. +The mode's hook is called both when the mode is enabled and when it is +disabled. + +(fn &optional ARG)" t) (register-definition-prefixes "gnuplot-context" '("gnuplot-")) -;;;*** -;;;### (autoloads nil "gnuplot-gui" "gnuplot-gui.el" (0 0 0 0)) ;;; Generated autoloads from gnuplot-gui.el -(autoload 'gnuplot-gui-swap-simple-complete "gnuplot-gui" nil t nil) - +(autoload 'gnuplot-gui-swap-simple-complete "gnuplot-gui" nil t) (autoload 'gnuplot-gui-mouse-set "gnuplot-gui" "\ Use the mouse to begin setting options using a GUI interface. EVENT is a mouse event. Bound to \\[gnuplot-gui-mouse-set] Note that \"plot\", \"splot\", \"fit\", and \"cntrparam\" are not currently supported. -\(fn EVENT)" t nil) - +(fn EVENT)" t) (autoload 'gnuplot-gui-set-options-and-insert "gnuplot-gui" "\ Insert arguments using a GUI interface. Determine contents of current line and set up the appropriate GUI frame. Bound to \\[gnuplot-gui-set-options-and-insert] -Note that \"cntrparam\" is not currently supported." t nil) - -(autoload 'gnuplot-gui-toggle-popup "gnuplot-gui" nil t nil) - +Note that \"cntrparam\" is not currently supported." t) +(autoload 'gnuplot-gui-toggle-popup "gnuplot-gui" nil t) (register-definition-prefixes "gnuplot-gui" '("gnuplot-")) - -;;;*** -;;;### (autoloads nil nil ("gnuplot-pkg.el") (0 0 0 0)) +;;; End of scraped data + +(provide 'gnuplot-autoloads) -;;;*** - ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 +;; no-native-compile: t +;; coding: utf-8-emacs-unix ;; End: + ;;; gnuplot-autoloads.el ends here diff --git a/elpa/gnuplot-20230323.1400/gnuplot-context.el b/elpa/gnuplot-20240914.1522/gnuplot-context.el similarity index 99% rename from elpa/gnuplot-20230323.1400/gnuplot-context.el rename to elpa/gnuplot-20240914.1522/gnuplot-context.el index dfa20195..6b49ea78 100644 --- a/elpa/gnuplot-20230323.1400/gnuplot-context.el +++ b/elpa/gnuplot-20240914.1522/gnuplot-context.el @@ -2191,7 +2191,7 @@ provide more useful completions and help suggestions for built-in keywords and functions by parsing each command as you type. It attempts to take into account Gnuplot's many abbreviated keywords. For example, with point at the end of a line reading -\"plot 'datafile' w \", typing \\[completion-at-point] will pop +\"plot \\='datafile\\=' w \", typing \\[completion-at-point] will pop up a list of plotting styles. Key bindings: diff --git a/elpa/gnuplot-20230323.1400/gnuplot-gui.el b/elpa/gnuplot-20240914.1522/gnuplot-gui.el similarity index 97% rename from elpa/gnuplot-20230323.1400/gnuplot-gui.el rename to elpa/gnuplot-20240914.1522/gnuplot-gui.el index 6276e8b6..ebcb754d 100644 --- a/elpa/gnuplot-20230323.1400/gnuplot-gui.el +++ b/elpa/gnuplot-20240914.1522/gnuplot-gui.el @@ -597,9 +597,9 @@ See the doc-string for `gnuplot-gui-all-types'.") (defcustom gnuplot-gui-plot-splot-fit-style 'simple "Control the complexity of the GUI display for plot, splot, and fit. -The values are 'simple, which causes a limited set of plot, splot, or -fit options to be displayed, and 'complete, which attempts to display -all options. The 'complete setting is prone to making errors when +The values are \\='simple, which causes a limited set of plot, splot, or +fit options to be displayed, and \\='complete, which attempts to display +all options. The \\='complete setting is prone to making errors when parsing values already in the script buffer." :group 'gnuplot-gui :type '(radio (const :tag "Simple listing" simple) @@ -745,54 +745,54 @@ TAG is the name used on the widget and indicates one of the options for this command, set option, or terminal type. TYPE is one of - 'list a menu-list of strings - 'list* a menu-list of strings with a prefix - 'number a number with an optional prefix - 'tag like number but must be the first argument - 'fontsize like number but must be the last argument - 'range a pair of numbers like [#,#] or [#:#] - 'pair a pair of numbers with no punctuation and a prefix - 'file a quoted string and a file browser - 'string a quoted string with an optional prefix - 'string* an unquoted string with a prefix - 'format a quoted string and an info-link to (gnuplot)format - 'labels an array as needed for xtics, ytics, etc - 'position 2 or 3 comma separated numbers with an optional prefix + \\='list a menu-list of strings + \\='list* a menu-list of strings with a prefix + \\='number a number with an optional prefix + \\='tag like number but must be the first argument + \\='fontsize like number but must be the last argument + \\='range a pair of numbers like [#,#] or [#:#] + \\='pair a pair of numbers with no punctuation and a prefix + \\='file a quoted string and a file browser + \\='string a quoted string with an optional prefix + \\='string* an unquoted string with a prefix + \\='format a quoted string and an info-link to (gnuplot)format + \\='labels an array as needed for xtics, ytics, etc + \\='position 2 or 3 comma separated numbers with an optional prefix DEFAULT is the default value for this option. Note that the default -for 'range and 'pair is a cons cell and the default for 'labels is a +for \\='range and \\='pair is a cons cell and the default for \\='labels is a list. For most things, the best choice of DEFAULT is a string of white space or a cons cell of two strings of white space. Strings of white space are better defaults than empty strings or nil. The value of REST depends upon TYPE: - For 'list & REST is the list of options that will go into the - 'list* menu-button. This can also be a symbol which + For \\='list & REST is the list of options that will go into the + \\='list* menu-button. This can also be a symbol which evaluates to a list containing the options to go into the menu-button. This list variable must contain the DEFAULT. - For 'number REST is the prefix string (if it exists) for that number. - For 'range REST is the separator, \":\" for plot ranges and + For \\='number REST is the prefix string (if it exists) for that number. + For \\='range REST is the separator, \":\" for plot ranges and \",\" for plot dimensions (see for example the tgif terminal type) - For 'string & REST may a number denoting the width of the editable-text - 'string* field or it may be a string denoting a prefix. By + For \\='string & REST may a number denoting the width of the editable-text + \\='string* field or it may be a string denoting a prefix. By default, the width is half the width of the frame and there is no prefix. It may be useful to specify \"1\" when the input is a single character - as in 'set missing'. - For 'file REST determines the label placed before the file insertion + as in \"set missing\". + For \\='file REST determines the label placed before the file insertion field. If non-nil, then TAG is used. If nil, then the default \"File\" is used. - For 'position REST is the prefix and the number of comma separated numbers + For \\='position REST is the prefix and the number of comma separated numbers For others REST is not used. Here is an example entry for the png terminal type: (cons \"png\" - '((\"SIZE\" 'list \" \" \"small\" \"medium\" \"large\") - (\"COLOR\" 'list \" \" \"monochrome\" \"gray\" \"color\"))) + \\='((\"SIZE\" \\='list \" \" \"small\" \"medium\" \"large\") + (\"COLOR\" \\='list \" \" \"monochrome\" \"gray\" \"color\"))) This alist is formed at load time by appending together `gnuplot-gui-terminal-types', `gnuplot-gui-set-types' and @@ -1152,7 +1152,7 @@ arguments." (defun gnuplot-gui-post-process-alist (type) "A few types need some additional processing. -'range, 'pair, and 'labels are cons or list valued and need to b made +\\='range, \\='pair, and \\='labels are cons or list valued and need to b made into strings. This is called right before inserting the arguments into the buffer. TYPE is the object whose arguments are being set." (let ((alist gnuplot-gui-alist) @@ -1420,7 +1420,7 @@ SAVE-FRAME is non-nil when the widgets are being reset." "Create a menu widget for the Gnuplot GUI. ITEM is the object whose arguments are set by this widget, DEFAULT is the default argument value, LIST contains the items for the pop-up -menu. STARRED is true if this a 'list* widget." +menu. STARRED is true if this a \\='list* widget." (let ((widget (apply 'widget-create 'menu-choice :value default :tag item :doc starred @@ -1623,7 +1623,7 @@ the default value for the argument." ITEM is the object whose arguments are set by this widget, DEFAULT is the default value for the widget, SEPARATOR is a text string preceding the numerical argument, or the prefix for a pair operator. IS-RANGE -is non-nil if this is a 'range widget." +is non-nil if this is a \\='range widget." (widget-insert (capitalize item) ": ") (if is-range (widget-insert "[")) (widget-create 'editable-field diff --git a/elpa/gnuplot-20240914.1522/gnuplot-pkg.el b/elpa/gnuplot-20240914.1522/gnuplot-pkg.el new file mode 100644 index 00000000..609cc5dd --- /dev/null +++ b/elpa/gnuplot-20240914.1522/gnuplot-pkg.el @@ -0,0 +1,10 @@ +;; -*- no-byte-compile: t; lexical-binding: nil -*- +(define-package "gnuplot" "20240914.1522" + "Major-mode and interactive frontend for gnuplot." + '((emacs "25.1")) + :url "https://github.com/emacs-gnuplot/gnuplot" + :commit "235ba76c358d9db5b10f177552f5f8deeef74df5" + :revdesc "235ba76c358d" + :keywords '("data" "gnuplot" "plotting") + :maintainers '(("Maxime Tréca" . "maxime@gmail.com") + ("Daniel Mendler" . "mail@daniel-mendler.de"))) diff --git a/elpa/gnuplot-20230323.1400/gnuplot.el b/elpa/gnuplot-20240914.1522/gnuplot.el similarity index 99% rename from elpa/gnuplot-20230323.1400/gnuplot.el rename to elpa/gnuplot-20240914.1522/gnuplot.el index f83df937..6c4e564c 100644 --- a/elpa/gnuplot-20230323.1400/gnuplot.el +++ b/elpa/gnuplot-20240914.1522/gnuplot.el @@ -5,7 +5,8 @@ ;; Author: Jon Oddie, Bruce Ravel, Phil Type ;; Maintainer: Maxime Tréca , Daniel Mendler ;; Created: 1998 -;; Version: 0.8.1 +;; Package-Version: 20240914.1522 +;; Package-Revision: 235ba76c358d ;; Keywords: data gnuplot plotting ;; URL: https://github.com/emacs-gnuplot/gnuplot ;; Package-Requires: ((emacs "25.1")) @@ -495,7 +496,7 @@ You can also add new items to any of these sub-menus by adding to the `with-eval-after-load' blocks in your .emacs file. Here is an example of adding the \"regis\" terminal type to the terminal sub-menu: - (with-eval-after-load 'gnuplot + (with-eval-after-load \\='gnuplot (setq gnuplot-insertions-terminal (append gnuplot-insertions-terminal (list @@ -1542,7 +1543,7 @@ updates Gnuplot with the appropriate \"set output\" command." (gnuplot-send-hiding-output "set output\n") ; Flush output file (sit-for 0.1) ; Hack: wait for Gnuplot IO to finish (cl-ecase gnuplot-inline-image-mode - (nil nil) + ((nil) nil) (inline (ignore-errors (let ((image (create-image filename))) @@ -2071,9 +2072,9 @@ and then starts `gnuplot-mode'. 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: - (autoload 'gnuplot-make-buffer \"gnuplot\" + (autoload \\='gnuplot-make-buffer \"gnuplot\" \"open a buffer in gnuplot mode\" t) - (global-set-key [(f10)] 'gnuplot-make-buffer)" + (global-set-key [(f10)] \\='gnuplot-make-buffer)" (interactive) (switch-to-buffer gnuplot-gnuplot-buffer) (gnuplot-mode)) diff --git a/elpa/gnuplot-readme.txt b/elpa/gnuplot-readme.txt deleted file mode 100644 index e219636a..00000000 --- a/elpa/gnuplot-readme.txt +++ /dev/null @@ -1,122 +0,0 @@ -This is a major mode for composing gnuplot scripts and displaying -their results using gnuplot. It supports features of recent -Gnuplot versions (4.4 and up), but should also work fine with older -versions. - -This version of gnuplot-mode has been tested mostly on GNU Emacs 23 -and 24, but should also work with older GNU Emacs versions back to -Emacs 21, and XEmacs 21. - -This mode offers several tools to help you compose your scripts, -including font-lock syntax colorization, a syntax table appropriate -to gnuplot, key bindings, pull-down menus, indentation, keyword -completions and variable customization using the Custom package. -Once the script is composed, there are several function for sending -some or all of the script to gnuplot. The interaction with the -gnuplot process is within a comint buffer. Plots can optionally be -displayed within Emacs. - - C-c C-l send current line to gnuplot - C-c C-v send current line to gnuplot and move forward 1 line - C-c C-r send current region to gnuplot - C-c C-b send entire buffer to gnuplot - C-c C-f send a file to gnuplot - C-c C-i insert filename at point - C-c C-n negate set option on current line - 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-e show-gnuplot-buffer - C-c C-k kill gnuplot process - C-c C-u submit a bug report about gnuplot-mode - C-c C-z customize gnuplot-mode -M-tab or M-ret complete keyword before point - ret newline and indent - tab indent current line - C-c M-i toggle inline plot display in comint buffer - -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 - C-c C-e pop back to most recent script buffer - -These two functions are useful for starting up gnuplot-mode: - -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 - -Gnuplot-mode now 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'. - - ---------------------------------------------------------------------- - -Other lisp files used by gnuplot.el - -gnuplot-gui.el (written by Bruce): - Defines the GUI interface for setting setting arguments to - gnuplot options. This uses the widget package extensively. - -gnuplot-context.el (written by Jonathan, j.j.oddie@gmail.com) - Context-sensitive completion, help lookup and eldoc - strings for gnuplot buffers. Should be byte-compiled before - using. - ---------------------------------------------------------------------- - -This mode was inspired by the original gnu-plot-mode by Gershon -Elber, which is distributed with gnuplot itself and which dates -back to the early 90's. Although this mode encompasses the -functionality of the original, the two share no code and the -current implementation takes advantage of many features of modern -versions of emacs and adheres (or so I intend) to the major mode -conventions described in the emacs-lisp reference for version 19 -and later. - ---------------------------------------------------------------------- - - Installation - ============ - -A recent version of this file can be found at - https://github.com/emacsorphanage/gnuplot/ - -To autoload gnuplot-mode on any file with gp extension, put this in -your .emacs file - (autoload 'gnuplot-mode "gnuplot" "gnuplot major mode" t) - (autoload 'gnuplot-make-buffer "gnuplot" "open a buffer in gnuplot-mode" t) - -Something like - (setq auto-mode-alist (append '(("\\.gp$" . gnuplot-mode)) - auto-mode-alist)) -is useful for having files ending in .gp start up in gnuplot-mode. - -Something like - (global-set-key [(f9)] 'gnuplot-make-buffer) -may be useful. This binds f9 to the function that opens a scratch -buffer (i.e. one that is not visiting a file) in gnuplot-mode. -This is handy for your quick 'n' dirty plotting chores. - -To use the `gnuplot-info-lookup-symbol' function, the file -gnuplot.info MUST be installed somewhere that info can find it. -This means you must either: - 1. Copy gnuplot.info to the normal info directory or - 2. Make sure info can find gnuplot.info by putting this in your - .emacs file: - (setenv "INFOPATH" - (concat (getenv "INFOPATH") ":" - (expand-file-name "/path/to/file"))) - where "/path/to/file" is the location of gnuplot.info - -This mode has been tested extensively with GNU Emacs 23 and 24, and -in a limited manner with GNU Emacs 22 and XEmacs 21. -- 2.47.3