branch: elpa/tablist commit 4a88205b8d0da0311788029fd9bf2bf726951c94 Author: Philippe Vaucher <phili...@stvs.ch> Commit: Philippe Vaucher <philippe.vauc...@gmail.com>
Remove trailing whitespace --- tablist-filter.el | 10 ++++----- tablist.el | 62 +++++++++++++++++++++++-------------------------------- 2 files changed, 30 insertions(+), 42 deletions(-) diff --git a/tablist-filter.el b/tablist-filter.el index 6a6f058..d8b0eca 100644 --- a/tablist-filter.el +++ b/tablist-filter.el @@ -45,7 +45,7 @@ (defvar tablist-filter-wisent-parser nil) (defvar tablist-filter-lexer-regexps nil) - + (defvar tablist-filter-wisent-grammar '( ;; terminals @@ -217,7 +217,6 @@ (tablist-filter-parser-init) (unparse filter noerror))) - (defun tablist-filter-eval (filter id entry &optional named-alist) (cl-labels ((feval (filter) @@ -340,9 +339,9 @@ (princ "\"...\" may be used to quote names and values if necessary, and \(...\) to group expressions.") (with-current-buffer standard-output - (help-mode))))) - -;; + (help-mode))))) + +;; ;; **Filter Functions ;; @@ -391,7 +390,6 @@ else return nil." tail))) (_ (funcall fn filter)))) - ;; ;; Reading filter ;; diff --git a/tablist.el b/tablist.el index 65ad3bc..5dad1eb 100644 --- a/tablist.el +++ b/tablist.el @@ -117,7 +117,7 @@ column." ;; ;; *Mode Maps -;; +;; (defvar tablist-mode-filter-map (let ((kmap (make-sparse-keymap))) @@ -198,7 +198,6 @@ column." ;; (define-key kmap (kbd "C-o") 'tablist-display-item) kmap)) - ;; ;; *Variables ;; @@ -232,7 +231,7 @@ The 2nd argument will be a list of entry ID's. The function should somehow delete these entries and update `tabulated-list-entries'. -`find-entry' +`find-entry' The 2nd argument is the ID of an entry. The function should somehow find/display this entry, i.e. a kind of default @@ -291,7 +290,7 @@ as argument for the function `completion-in-region'.") ;; (defvar savehist-additional-variables) -(add-hook 'savehist-save-hook +(add-hook 'savehist-save-hook (lambda nil (add-to-list 'savehist-additional-variables 'tablist-named-filter))) @@ -344,12 +343,12 @@ as argument for the function `completion-in-region'.") (selected (tabulated-list-get-id))) (unless (eq selected id) (setq tablist-selected-id selected) - (run-hook-with-args + (run-hook-with-args 'tablist-selection-changed-functions tablist-selected-id))))) (defvar tablist-context-window-update--timer nil) - + (defun tablist-context-window-update (&optional id) (when (and tablist-context-window-function (window-live-p tablist-context-window) @@ -396,8 +395,7 @@ as argument for the function `completion-in-region'.") (if (window-live-p tablist-context-window) (tablist-hide-context-window) (tablist-display-context-window))) - - + ;; ;; *Marking ;; @@ -415,7 +413,7 @@ as argument for the function `completion-in-region'.") (if (numberp tablist-major-columns) (list tablist-major-columns) tablist-major-columns))) - + (defun tablist-put-mark (&optional pos) "Put a mark before the entry at POS. @@ -814,8 +812,6 @@ STATE is a return value of `tablist-get-mark-state'." :right-align) (not (= n (1- (length columns))))) (forward-char (1- (car (cdr (elt tabulated-list-format n))))))))) - - (defun tablist-move-to-major-column (&optional first-skip-invisible-p) "Move to the first major column." @@ -881,7 +877,7 @@ Return t, if point is now in a visible area." 'invisible nil (point-max))))) (not (invisible-p (point)))) -;; +;; ;; *Operations ;; @@ -907,7 +903,6 @@ ARG the prefix-arg of the command used in op-str (tablist-mark-prompt arg pp-items))))) - (defun tablist-operation-available-p (op) (and (functionp tablist-operations-function) (memq op (funcall tablist-operations-function @@ -950,7 +945,7 @@ ARG the prefix-arg of the command used in (message (format "Killed %d line%s" (length positions) (dired-plural-s (length positions)))))))) - + (defun tablist-do-operation (arg fn operation &optional delete-p revert-p) "Operate on marked items. @@ -973,9 +968,9 @@ Optional REVERT-P means, revert the display afterwards." (tablist-revert)) (tablist-move-to-major-column)))) -;; +;; ;; *Editing -;; +;; (defvar tablist-edit-column-minor-mode-map (let ((kmap (make-sparse-keymap))) (set-keymap-parent kmap (current-global-map)) @@ -990,7 +985,7 @@ Optional REVERT-P means, revert the display afterwards." (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 (unless (or tablist-minor-mode @@ -1005,8 +1000,7 @@ Optional REVERT-P means, revert the display afterwards." (t (remove-hook 'post-command-hook 'tablist-edit-column-constrain-point t) (read-only-mode 1)))) - - + (defun tablist-edit-column (&optional n) (interactive "P") (unless n (setq n (tablist-current-column))) @@ -1054,7 +1048,7 @@ Optional REVERT-P means, revert the display afterwards." (overlay-put ov 'evaporate t) (overlay-put ov 'tablist-edit t) (tablist-edit-column-minor-mode 1))) - + (defun tablist-edit-column-quit () (interactive) (tablist-edit-column-commit t)) @@ -1091,7 +1085,7 @@ Optional REVERT-P means, revert the display afterwards." (save-excursion (tabulated-list-print-entry id entry)) (forward-char (nth column (tablist-column-offsets)))))) - + (defun tablist-edit-column-complete () (interactive) (unless (tablist-operation-available-p 'complete) @@ -1109,8 +1103,8 @@ Optional REVERT-P means, revert the display afterwards." (- (point) beg)))) (unless completions (error "No completions available")) - (completion-in-region beg end completions)))) - + (completion-in-region beg end completions)))) + (defun tablist-column-editable (n) (and (tablist-operation-available-p 'edit-column) (not (tablist-column-property n :read-only)))) @@ -1155,11 +1149,11 @@ Optional REVERT-P means, revert the display afterwards." (setq end pos beg (previous-single-property-change pos 'tablist-edit)))) - + (unless (and beg end (get-text-property beg 'tablist-edit)) (error "Unable to locate edited text")) (cons beg (if skip-final-space (1- end) end)))) - + (defun tablist-edit-column-mark-field () (interactive) (push-mark (field-beginning)) @@ -1395,7 +1389,6 @@ This function is lazy and therfore pretty slow." (tablist-save-marks (tabulated-list-init-header) (tabulated-list-print))))) - (defun tablist-shrink-column (&optional column width) (interactive @@ -1403,9 +1396,8 @@ This function is lazy and therfore pretty slow." 3))) (tablist-enlarge-column column (- (or width 1)))) - ;; *Sorting -;; +;; (defun tablist-sort (&optional column) "Sort the tabulated-list by COLUMN. @@ -1563,7 +1555,7 @@ FILTER defaults to `tablist-current-filter'." ;; ;; **Filter Commands -;; +;; (defun tablist-push-filter (filter &optional interactive or-p) (setq tablist-current-filter (tablist-filter-push @@ -1731,7 +1723,7 @@ Named filter are saved in the variable `tablist-named-filter'." (when mode-filter (setcdr mode-filter (cl-remove name (cdr mode-filter) - :test 'equal :key 'car))))) + :test 'equal :key 'car))))) (defun tablist-name-current-filter (name) (interactive @@ -1749,7 +1741,7 @@ Named filter are saved in the variable `tablist-named-filter'." tablist-current-filter)) (setq tablist-current-filter name) (force-mode-line-update)) - + (defun tablist-deconstruct-named-filter () (interactive) (let (found) @@ -1768,8 +1760,7 @@ Named filter are saved in the variable `tablist-named-filter'." (unless found (error "No named filter found")) (force-mode-line-update))) - - + (defun tablist-filter-names (&optional mode) (mapcar 'car (cdr (assq (or mode major-mode) tablist-named-filter)))) @@ -1826,7 +1817,7 @@ Named filter are saved in the variable `tablist-named-filter'." "Display the current filter according to FLAG. If FLAG has the value 'toggle, toggle it's visibility. -If FLAG has the 'state, then do nothing but return the current +If FLAG has the 'state, then do nothing but return the current visibility." (interactive (list 'toggle)) (let* ((tag 'tablist-display-filter-mode-line-tag) @@ -1861,7 +1852,7 @@ visibility." ;; ;; **Hiding/Unhiding Entries -;; +;; (defun tablist-filter-set-entry-hidden (flag &optional pos) (save-excursion (when pos (goto-char pos)) @@ -1885,7 +1876,6 @@ visibility." (point-min) (point-max) '(invisible)))) - (defun tablist-window-attach (awindow &optional window) "Attach AWINDOW to WINDOW.