daniel/emacs-conf
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages and add valign

Browse Source
This commit is contained in:
Daniel Weschke
2026-04-05 20:00:27 +02:00
parent b062fb98e3
commit 03fb00e374
640 changed files with 109768 additions and 39311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lisp/gnuplot/gnuplot-context.el
View File

@@ -4,8 +4,6 @@
;; Author: Jon Oddie <jonxfield@gmail.com>
;; 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))

50
lisp/gnuplot/gnuplot-gui.el
View File

@@ -4,8 +4,6 @@
;; Author: Bruce Ravel <ravel@phys.washington.edu>
;; 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 -----------------

6
lisp/gnuplot/gnuplot-pkg.el
View File

@@ -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")))

6
lisp/gnuplot/gnuplot.el
View File

@@ -5,14 +5,12 @@
;; Author: Jon Oddie, Bruce Ravel, Phil Type
;; Maintainer: Maxime Tréca <maxime@gmail.com>, Daniel Mendler <mail@daniel-mendler.de>
;; 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

12
lisp/gnuplot/gnuplot.info
View File

@@ -1,4 +1,4 @@
This is gnuplot.info, produced by makeinfo version 7.2 from
This is gnuplot.info, produced by makeinfo version 7.3 from
gnuplot.texi.
INFO-DIR-SECTION Math
@@ -23499,7 +23499,7 @@ Concept Index
* ? <3>: gamma. (line 9)
* ? <4>: inverf. (line 7)
* ? <5>: imag. (line 7)
* ? <6>: invnorm. (line 10)
* ? <6>: invnorm. (line 9)
* ? <7>: invnorm. (line 9)
* ? <8>: real. (line 6)
* ? <9>: sqrt. (line 8)
@@ -23519,13 +23519,13 @@ Concept Index
* ? <23>: words. (line 33)
* ? <24>: words. (line 35)
* ? <25>: words. (line 38)
* ? <26>: words. (line 40)
* ? <27>: words. (line 40)
* ? <28>: words. (line 40)
* ? <26>: words. (line 39)
* ? <27>: words. (line 39)
* ? <28>: words. (line 39)
* ? <29>: words. (line 39)
* ? <30>: hsv2rgb. (line 7)
* ? <31>: rgbcolor. (line 11)
* ? <32>: rgbcolor. (line 13)
* ? <32>: rgbcolor. (line 12)
* ? <33>: rgbcolor. (line 12)
* .gnuplot: Start-up_(initialization).
(line 6)