From bf3ff9f2438b91e43bd8142374a043895cc2f114 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sun, 26 Nov 2023 16:30:12 +0100 Subject: [PATCH] update tablist Signed-off-by: Andreas Gerler --- .../tablist-20190414.643/tablist-autoloads.el | 36 ----- elpa/tablist-20190414.643/tablist-pkg.el | 11 -- .../tablist-20230321.705/tablist-autoloads.el | 58 +++++++ .../tablist-filter.el | 22 ++- elpa/tablist-20230321.705/tablist-pkg.el | 13 ++ .../tablist.el | 150 +++++++++--------- 6 files changed, 168 insertions(+), 122 deletions(-) delete mode 100644 elpa/tablist-20190414.643/tablist-autoloads.el delete mode 100644 elpa/tablist-20190414.643/tablist-pkg.el create mode 100644 elpa/tablist-20230321.705/tablist-autoloads.el rename elpa/{tablist-20190414.643 => tablist-20230321.705}/tablist-filter.el (98%) create mode 100644 elpa/tablist-20230321.705/tablist-pkg.el rename elpa/{tablist-20190414.643 => tablist-20230321.705}/tablist.el (94%) diff --git a/elpa/tablist-20190414.643/tablist-autoloads.el b/elpa/tablist-20190414.643/tablist-autoloads.el deleted file mode 100644 index 2a189f97..00000000 --- a/elpa/tablist-20190414.643/tablist-autoloads.el +++ /dev/null @@ -1,36 +0,0 @@ -;;; tablist-autoloads.el --- automatically extracted autoloads -;; -;;; Code: -(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) - -;;;### (autoloads nil "tablist" "tablist.el" (23994 46395 211954 -;;;;;; 236000)) -;;; Generated autoloads from tablist.el - -(autoload 'tablist-minor-mode "tablist" "\ -Toggle Tablist minor mode on or off. -With a prefix argument ARG, enable Tablist minor mode if ARG is -positive, and disable it otherwise. If called from Lisp, enable -the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. -\\{tablist-minor-mode-map} - -\(fn &optional ARG)" t nil) - -(autoload 'tablist-mode "tablist" "\ - - -\(fn)" t nil) - -;;;*** - -;;;### (autoloads nil nil ("tablist-filter.el" "tablist-pkg.el") -;;;;;; (23994 46395 210438 171000)) - -;;;*** - -;; Local Variables: -;; version-control: never -;; no-byte-compile: t -;; no-update-autoloads: t -;; End: -;;; tablist-autoloads.el ends here diff --git a/elpa/tablist-20190414.643/tablist-pkg.el b/elpa/tablist-20190414.643/tablist-pkg.el deleted file mode 100644 index 836344a4..00000000 --- a/elpa/tablist-20190414.643/tablist-pkg.el +++ /dev/null @@ -1,11 +0,0 @@ -(define-package "tablist" "20190414.643" "Extended tabulated-list-mode" - '((emacs "24.3")) - :keywords - '("extensions" "lisp") - :authors - '(("Andreas Politz" . "politza@fh-trier.de")) - :maintainer - '("Andreas Politz" . "politza@fh-trier.de")) -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/tablist-20230321.705/tablist-autoloads.el b/elpa/tablist-20230321.705/tablist-autoloads.el new file mode 100644 index 00000000..ed0000e0 --- /dev/null +++ b/elpa/tablist-20230321.705/tablist-autoloads.el @@ -0,0 +1,58 @@ +;;; tablist-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- +;; +;;; Code: + +(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path)))) + + +;;;### (autoloads nil "tablist" "tablist.el" (0 0 0 0)) +;;; Generated autoloads from tablist.el + +(autoload 'tablist-minor-mode "tablist" "\ +Toggle tablist minor mode. + +This is a minor mode. If called interactively, toggle the +`Tablist minor 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 `tablist-minor-mode'. + +The mode's hook is called both when the mode is enabled and when +it is disabled. + +\(fn &optional ARG)" t nil) + +(autoload 'tablist-mode "tablist" "\ + + +\(fn)" t nil) + +(register-definition-prefixes "tablist" '("tablist-")) + +;;;*** + +;;;### (autoloads nil "tablist-filter" "tablist-filter.el" (0 0 0 +;;;;;; 0)) +;;; Generated autoloads from tablist-filter.el + +(register-definition-prefixes "tablist-filter" '("tablist-filter-")) + +;;;*** + +;;;### (autoloads nil nil ("tablist-pkg.el") (0 0 0 0)) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; coding: utf-8 +;; End: +;;; tablist-autoloads.el ends here diff --git a/elpa/tablist-20190414.643/tablist-filter.el b/elpa/tablist-20230321.705/tablist-filter.el similarity index 98% rename from elpa/tablist-20190414.643/tablist-filter.el rename to elpa/tablist-20230321.705/tablist-filter.el index 0317fb64..c5d56b88 100644 --- a/elpa/tablist-20190414.643/tablist-filter.el +++ b/elpa/tablist-20230321.705/tablist-filter.el @@ -32,6 +32,10 @@ (defvar wisent-eoi-term) (declare-function wisent-parse "semantic/wisent/wisent.el") +;; +;; *Variables +;; + (defvar tablist-filter-binary-operator '((== . tablist-filter-op-equal) (=~ . tablist-filter-op-regexp) @@ -74,6 +78,10 @@ ((filter or filter) `(or ,$1 ,$3)) ((?\( filter ?\)) $2)))) +;; +;; *Filter Parsing +;; + (defun tablist-filter-parser-init (&optional reinitialize interactive) (interactive (list t t)) (unless (and tablist-filter-lexer-regexps @@ -255,6 +263,10 @@ (_ (error "Invalid filter: %s" filter))))) (feval filter))) +;; +;; *Filter Operators +;; + (defun tablist-filter-get-item-by-name (entry col-name) (let* ((col (cl-position col-name tabulated-list-format :key 'car @@ -343,7 +355,7 @@ and \(...\) to group expressions.") (help-mode))))) ;; -;; **Filter Functions +;; *Filter Functions ;; ;; filter ::= nil | named | fn | (OP OP1 [OP2]) @@ -371,7 +383,7 @@ By default the filters are and'ed, unless OR-P is non-nil." "Remove the first operator or operand from filter. If filter starts with a negation, return filter unnegated, -if filter starts with a dis- or conjuction, remove the first operand, +if filter starts with a dis- or conjunction, remove the first operand, if filter is nil, raise an error, else return nil." (pcase filter @@ -392,7 +404,7 @@ else return nil." (_ (funcall fn filter)))) ;; -;; Reading filter +;; *Reading Filter ;; (defvar tablist-filter-edit-history nil) @@ -445,4 +457,8 @@ else return nil." filter))) (provide 'tablist-filter) +;; Local Variables: +;; outline-regexp: ";;\\(\\(?:[;*]+ \\| \\*+\\)[^\s\t\n]\\|###autoload\\)\\|(" +;; indent-tabs-mode: nil +;; End: ;;; tablist-filter.el ends here diff --git a/elpa/tablist-20230321.705/tablist-pkg.el b/elpa/tablist-20230321.705/tablist-pkg.el new file mode 100644 index 00000000..36e2b700 --- /dev/null +++ b/elpa/tablist-20230321.705/tablist-pkg.el @@ -0,0 +1,13 @@ +(define-package "tablist" "20230321.705" "Extended tabulated-list-mode" + '((emacs "24.3")) + :commit "5f7b71a92bfb25418d7da86ad9c45f14b149496f" :authors + '(("Andreas Politz" . "politza@fh-trier.de")) + :maintainers + '(("Andreas Politz" . "politza@fh-trier.de")) + :maintainer + '("Andreas Politz" . "politza@fh-trier.de") + :keywords + '("extensions" "lisp")) +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/tablist-20190414.643/tablist.el b/elpa/tablist-20230321.705/tablist.el similarity index 94% rename from elpa/tablist-20190414.643/tablist.el rename to elpa/tablist-20230321.705/tablist.el index 51728a8f..4fbeb6cd 100644 --- a/elpa/tablist-20190414.643/tablist.el +++ b/elpa/tablist-20230321.705/tablist.el @@ -123,81 +123,81 @@ column." (defvar tablist-mode-filter-map (let ((kmap (make-sparse-keymap))) - (define-key kmap "p" 'tablist-pop-filter) - (define-key kmap "r" 'tablist-push-regexp-filter) - (define-key kmap "=" 'tablist-push-equal-filter) - (define-key kmap "n" 'tablist-push-numeric-filter) - (define-key kmap "!" 'tablist-negate-filter) - (define-key kmap "t" 'tablist-toggle-first-filter-logic) - (define-key kmap "/" 'tablist-display-filter) - (define-key kmap "z" 'tablist-suspend-filter) - - (define-key kmap "a" 'tablist-push-named-filter) - (define-key kmap "s" 'tablist-name-current-filter) - (define-key kmap "D" 'tablist-delete-named-filter) - (define-key kmap "d" 'tablist-deconstruct-named-filter) - (define-key kmap "e" 'tablist-edit-filter) - (define-key kmap "C" 'tablist-clear-filter) + (define-key kmap "p" #'tablist-pop-filter) + (define-key kmap "r" #'tablist-push-regexp-filter) + (define-key kmap "=" #'tablist-push-equal-filter) + (define-key kmap "n" #'tablist-push-numeric-filter) + (define-key kmap "!" #'tablist-negate-filter) + (define-key kmap "t" #'tablist-toggle-first-filter-logic) + (define-key kmap "/" #'tablist-display-filter) + (define-key kmap "z" #'tablist-suspend-filter) + + (define-key kmap "a" #'tablist-push-named-filter) + (define-key kmap "s" #'tablist-name-current-filter) + (define-key kmap "D" #'tablist-delete-named-filter) + (define-key kmap "d" #'tablist-deconstruct-named-filter) + (define-key kmap "e" #'tablist-edit-filter) + (define-key kmap "C" #'tablist-clear-filter) kmap)) (defvar tablist-mode-mark-map (let ((kmap (make-sparse-keymap))) - (define-key kmap "c" 'tablist-change-marks) - (define-key kmap "!" 'tablist-unmark-all-marks) - (define-key kmap "r" 'tablist-mark-items-regexp) - (define-key kmap "n" 'tablist-mark-items-numeric) - (define-key kmap "m" 'tablist-mark-forward) + (define-key kmap "c" #'tablist-change-marks) + (define-key kmap "!" #'tablist-unmark-all-marks) + (define-key kmap "r" #'tablist-mark-items-regexp) + (define-key kmap "n" #'tablist-mark-items-numeric) + (define-key kmap "m" #'tablist-mark-forward) kmap)) (defvar tablist-mode-regexp-map (let ((kmap (make-sparse-keymap))) - ;; (define-key kmap "&" 'tablist-flag-gargabe-items) - (define-key kmap "m" 'tablist-mark-items-regexp) + ;; (define-key kmap "&" #'tablist-flag-gargabe-items) + (define-key kmap "m" #'tablist-mark-items-regexp) kmap)) (defvar tablist-minor-mode-map (let ((kmap (make-sparse-keymap))) - (define-key kmap "m" 'tablist-mark-forward) - (define-key kmap (kbd "DEL") 'tablist-unmark-backward) - (define-key kmap "k" 'tablist-do-kill-lines) - (define-key kmap "U" 'tablist-unmark-all-marks) - (define-key kmap "u" 'tablist-unmark-forward) - (define-key kmap "t" 'tablist-toggle-marks) + (define-key kmap "m" #'tablist-mark-forward) + (define-key kmap (kbd "DEL") #'tablist-unmark-backward) + (define-key kmap "k" #'tablist-do-kill-lines) + (define-key kmap "U" #'tablist-unmark-all-marks) + (define-key kmap "u" #'tablist-unmark-forward) + (define-key kmap "t" #'tablist-toggle-marks) - (define-key kmap (kbd "TAB") 'tablist-forward-column) - (define-key kmap "\t" 'tablist-forward-column) - (define-key kmap [backtab] 'tablist-backward-column) + (define-key kmap (kbd "TAB") #'tablist-forward-column) + (define-key kmap "\t" #'tablist-forward-column) + (define-key kmap [backtab] #'tablist-backward-column) (define-key kmap "%" tablist-mode-regexp-map) (define-key kmap "*" tablist-mode-mark-map) (define-key kmap "/" tablist-mode-filter-map) - ;; (define-key kmap "e" 'tablist-edit-column) - ;; (define-key kmap "i" 'tablist-insert-entry) - (define-key kmap "s" 'tablist-sort) - (define-key kmap [remap back-to-indentation] 'tablist-move-to-major-column) - (define-key kmap [remap next-line] 'tablist-next-line) - (define-key kmap [remap previous-line] 'tablist-previous-line) - (define-key kmap "<" 'tablist-shrink-column) - (define-key kmap ">" 'tablist-enlarge-column) - (define-key kmap "q" 'tablist-quit) - (define-key kmap "G" 'tablist-revert) - (define-key kmap (kbd "C-c C-e") 'tablist-export-csv) + ;; (define-key kmap "e" #'tablist-edit-column) + ;; (define-key kmap "i" #'tablist-insert-entry) + (define-key kmap "s" #'tablist-sort) + (define-key kmap [remap back-to-indentation] #'tablist-move-to-major-column) + (define-key kmap [remap next-line] #'tablist-next-line) + (define-key kmap [remap previous-line] #'tablist-previous-line) + (define-key kmap "<" #'tablist-shrink-column) + (define-key kmap ">" #'tablist-enlarge-column) + (define-key kmap "q" #'tablist-quit) + (define-key kmap "G" #'tablist-revert) + (define-key kmap (kbd "C-c C-e") #'tablist-export-csv) kmap)) (defvar tablist-mode-map (let ((kmap (copy-keymap tablist-minor-mode-map))) (set-keymap-parent kmap tabulated-list-mode-map) - (define-key kmap "d" 'tablist-flag-forward) - (define-key kmap (kbd "RET") 'tablist-find-entry) - (define-key kmap "f" 'tablist-find-entry) - ;; (define-key kmap "~" 'tablist-flag-gargabe-items) - (define-key kmap "D" 'tablist-do-delete) - (define-key kmap "C" 'tablist-do-copy) - (define-key kmap "R" 'tablist-do-rename) - (define-key kmap "x" 'tablist-do-flagged-delete) - ;; (define-key kmap "F" 'tablist-find-marked-items) - ;; (define-key kmap (kbd "C-o") 'tablist-display-item) + (define-key kmap "d" #'tablist-flag-forward) + (define-key kmap (kbd "RET") #'tablist-find-entry) + (define-key kmap "f" #'tablist-find-entry) + ;; (define-key kmap "~" #'tablist-flag-gargabe-items) + (define-key kmap "D" #'tablist-do-delete) + ;; (define-key kmap "C" #'tablist-do-copy) + ;; (define-key kmap "R" #'tablist-do-rename) + (define-key kmap "x" #'tablist-do-flagged-delete) + ;; (define-key kmap "F" #'tablist-find-marked-items) + ;; (define-key kmap (kbd "C-o") #'tablist-display-item) kmap)) ;; @@ -298,7 +298,8 @@ as argument for the function `completion-in-region'.") ;;;###autoload (define-minor-mode tablist-minor-mode - nil nil nil nil + "Toggle tablist minor mode." + :global nil (unless (derived-mode-p 'tabulated-list-mode) (error "Buffer is not in Tabulated List Mode")) (tablist-init (not tablist-minor-mode))) @@ -309,7 +310,7 @@ as argument for the function `completion-in-region'.") (defun tablist-init (&optional disable) (let ((cleaned-misc (cl-remove 'tablist-current-filter - mode-line-misc-info :key 'car))) + mode-line-misc-info :key #'car-safe))) (cond ((not disable) (set (make-local-variable 'mode-line-misc-info) @@ -547,7 +548,7 @@ OLD and NEW are both characters used to mark files." (tablist-put-mark))))))))) (defun tablist-unmark-all-marks (&optional marks interactive) - "Remove alls marks in MARKS. + "Remove all marks in MARKS. MARKS should be a string of mark characters to match and defaults to all marks. Interactively, remove all marks, unless a prefix @@ -647,13 +648,13 @@ proceeds as \(BINOP N OPERAND\)." (list (funcall fn)))) (t (cl-labels ((search (re) - (let (sucess) + (let (success) (tablist-skip-invisible-entries) - (while (and (setq sucess + (while (and (setq success (re-search-forward re nil t)) (invisible-p (point))) (tablist-forward-entry)) - sucess))) + success))) (let ((regexp (tablist-marker-regexp)) next-position results found) (save-excursion @@ -779,7 +780,7 @@ STATE is a return value of `tablist-get-mark-state'." (defun tablist-repeat-over-lines (arg function) "Call FUNCTION for the next ARG entries." - ;; Move out of potentially invisble area. + ;; Move out of potentially invisible area. (tablist-skip-invisible-entries) (let ((pos (make-marker))) (while (and (> arg 0) @@ -953,7 +954,7 @@ ARG the prefix-arg of the command used in ARG should be the `current-prefix-arg', FN is a function of two arguments \(ID ENTRY\) handling the operation. It gets called -repeatly with all marked items. OPERATION is a symbol or string +repeatedly with all marked items. OPERATION is a symbol or string describing the operation, it is used for display. Optional non-nil DELETE-P means, remove the items from the display. @@ -976,20 +977,21 @@ Optional REVERT-P means, revert the display afterwards." (defvar tablist-edit-column-minor-mode-map (let ((kmap (make-sparse-keymap))) (set-keymap-parent kmap (current-global-map)) - (define-key kmap [remap self-insert-command] 'self-insert-command) - (define-key kmap "\r" 'tablist-edit-column-commit) - (define-key kmap (kbd "C-g") 'tablist-edit-column-quit) - (define-key kmap (kbd "C-c C-c") 'tablist-edit-column-commit) - (define-key kmap (kbd "C-c C-q") 'tablist-edit-column-quit) - (define-key kmap "\t" 'tablist-edit-column-complete) - (define-key kmap (kbd "TAB") 'tablist-edit-column-complete) - (define-key kmap [remap end-of-buffer] 'end-of-line) - (define-key kmap [remap beginning-of-buffer] 'beginning-of-line) - (define-key kmap [remap mark-whole-buffer] 'tablist-edit-column-mark-field) + (define-key kmap [remap self-insert-command] #'self-insert-command) + (define-key kmap "\r" #'tablist-edit-column-commit) + (define-key kmap (kbd "C-g") #'tablist-edit-column-quit) + (define-key kmap (kbd "C-c C-c") #'tablist-edit-column-commit) + (define-key kmap (kbd "C-c C-q") #'tablist-edit-column-quit) + (define-key kmap "\t" #'tablist-edit-column-complete) + (define-key kmap (kbd "TAB") #'tablist-edit-column-complete) + (define-key kmap [remap end-of-buffer] #'end-of-line) + (define-key kmap [remap beginning-of-buffer] #'beginning-of-line) + (define-key kmap [remap mark-whole-buffer] #'tablist-edit-column-mark-field) kmap)) (define-minor-mode tablist-edit-column-minor-mode - "" nil nil nil + "Toggle tablist-edit-column minor mode." + :global nil (unless (or tablist-minor-mode (derived-mode-p 'tablist-mode)) (error "Not in a tablist buffer")) @@ -1369,7 +1371,7 @@ Return the output buffer." (defun tablist-enlarge-column (&optional column width) "Enlarge column COLUMN by WIDTH. -This function is lazy and therfore pretty slow." +This function is lazy and therefore pretty slow." (interactive (list nil (* (prefix-numeric-value current-prefix-arg) 3))) @@ -1938,4 +1940,8 @@ the 0-th column as numbers by the less-than relation." (aref (cadr e2) column))))) (provide 'tablist) +;; Local Variables: +;; outline-regexp: ";;\\(\\(?:[;*]+ \\| \\*+\\)[^\s\t\n]\\|###autoload\\)\\|(" +;; indent-tabs-mode: nil +;; End: ;;; tablist.el ends here -- 2.47.3