diff options
Diffstat (limited to 'lisp/ses.el')
| -rw-r--r-- | lisp/ses.el | 129 |
1 files changed, 65 insertions, 64 deletions
diff --git a/lisp/ses.el b/lisp/ses.el index d6090f3e8d7..81c27144a54 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -1,4 +1,4 @@ -;;; ses.el -- Simple Emacs Spreadsheet -*- lexical-binding:t -*- +;;; ses.el --- Simple Emacs Spreadsheet -*- lexical-binding:t -*- ;; Copyright (C) 2002-2021 Free Software Foundation, Inc. @@ -172,14 +172,14 @@ Each function is called with ARG=1." (defvar ses--completion-table nil "Set globally to what completion table to use depending on type - of completion (local printers, cells, etc.). We need to go - through a local variable to pass the SES buffer local variable - to completing function while the current buffer is the - minibuffer.") +of completion (local printers, cells, etc.). We need to go +through a local variable to pass the SES buffer local variable +to completing function while the current buffer is the +minibuffer.") (defvar ses--list-orig-buffer nil - "Calling buffer for SES listing help. Used for listing local - printers or renamed cells.") + "Calling buffer for SES listing help. +Used for listing local printers or renamed cells.") (defconst ses-mode-edit-map @@ -332,9 +332,9 @@ column or default printer and then modify its output.") next-line-add-newlines transient-mark-mode) "Buffer-local variables used by SES.")) -(defmacro ses--metaprogramming (exp) (declare (debug t)) (eval exp t)) -(ses--metaprogramming - `(progn ,@(mapcar (lambda (x) `(defvar ,(or (car-safe x) x))) ses-localvars))) +(defmacro ses--\,@ (exp) (declare (debug t)) (macroexp-progn (eval exp t))) +(ses--\,@ + (mapcar (lambda (x) `(defvar ,(or (car-safe x) x))) ses-localvars)) (defun ses-set-localvars () "Set buffer-local and initialize some SES variables." @@ -395,8 +395,9 @@ left-justification of the result. Set to error-signal if `ses-call-printer' encountered an error during printing. Otherwise nil.") (defvar ses-start-time nil - "Time when current operation started. Used by `ses--time-check' to decide -when to emit a progress message.") + "Time when current operation started. +Used by `ses--time-check' to decide when to emit a progress +message.") ;;---------------------------------------------------------------------------- @@ -560,9 +561,10 @@ the corresponding cell with name PROPERTY-NAME." (eq (ses-cell-symbol (car rowcol) (cdr rowcol)) sym)))))) (defun ses--cell (sym value formula printer references) - "Load a cell SYM from the spreadsheet file. Does not recompute VALUE from -FORMULA, does not reprint using PRINTER, does not check REFERENCES. -Safety-checking for FORMULA and PRINTER are deferred until first use." + "Load a cell SYM from the spreadsheet file. +Does not recompute VALUE from FORMULA, does not reprint using +PRINTER, does not check REFERENCES. Safety-checking for FORMULA +and PRINTER are deferred until first use." (let ((rowcol (ses-sym-rowcol sym))) (ses-formula-record formula) (ses-printer-record printer) @@ -580,8 +582,7 @@ Safety-checking for FORMULA and PRINTER are deferred until first use." (set sym value)) (defun ses-local-printer-compile (printer) - "Convert local printer function into faster printer -definition." + "Convert local printer function into faster printer definition." (cond ((functionp printer) printer) ((stringp printer) @@ -610,8 +611,8 @@ Return the printer info." ses--local-printer-hashmap)) (defmacro ses-column-widths (widths) - "Load the vector of column widths from the spreadsheet file. This is a -macro to prevent propagate-on-load viruses." + "Load the vector of column widths from the spreadsheet file. +This is a macro to prevent propagate-on-load viruses." (or (and (vectorp widths) (= (length widths) ses--numcols)) (error "Bad column-width vector")) ;;To save time later, we also calculate the total width of each line in the @@ -748,8 +749,8 @@ for this spreadsheet." (intern (concat (ses-column-letter col) (number-to-string (1+ row))))) (defun ses-decode-cell-symbol (str) - "Decode a symbol \"A1\" => (0,0). Return nil if STR is not a -canonical cell name." + "Decode a symbol \"A1\" => (0,0). +Return nil if STR is not a canonical cell name." (let (case-fold-search) (and (string-match "\\`\\([A-Z]+\\)\\([0-9]+\\)\\'" str) (let* ((col-str (match-string-no-properties 1 str)) @@ -840,31 +841,31 @@ and ARGS and reset `ses-start-time' to the current time." "Install VAL as the contents for field FIELD (named by a quoted symbol) of cell (ROW,COL). This is undoable. The cell's data will be updated through `post-command-hook'." - `(let ((row ,row) - (col ,col) - (val ,val)) - (let* ((cell (ses-get-cell row col)) + (macroexp-let2 nil row row + (macroexp-let2 nil col col + (macroexp-let2 nil val val + `(let* ((cell (ses-get-cell ,row ,col)) (change ,(let ((field (progn (cl-assert (eq (car field) 'quote)) (cadr field)))) (if (eq field 'value) - '(ses-set-with-undo (ses-cell-symbol cell) val) + `(ses-set-with-undo (ses-cell-symbol cell) ,val) ;; (let* ((slots (get 'ses-cell 'cl-struct-slots)) ;; (slot (or (assq field slots) ;; (error "Unknown field %S" field))) ;; (idx (- (length slots) ;; (length (memq slot slots))))) - ;; `(ses-aset-with-undo cell ,idx val)) + ;; `(ses-aset-with-undo cell ,idx ,val)) (let ((getter (intern-soft (format "ses-cell--%s" field)))) `(ses-setter-with-undo (eval-when-compile (cons #',getter (lambda (newval cell) (setf (,getter cell) newval)))) - val cell)))))) + ,val cell)))))) (if change - (add-to-list 'ses--deferred-write (cons row col)))) - nil)) ; Make coverage-tester happy. + (add-to-list 'ses--deferred-write (cons ,row ,col))) + nil))))) ; Make coverage-tester happy. (defun ses-cell-set-formula (row col formula) "Store a new formula for (ROW . COL) and enqueue the cell for @@ -1061,15 +1062,15 @@ the old and FORCE is nil." (ses-cell-set-formula row col nil)) (defcustom ses-self-reference-early-detection nil - "True if cycle detection is early for cells that refer to themselves." + "Non-nil if cycle detection is early for cells that refer to themselves." :version "24.1" :type 'boolean :group 'ses) (defun ses-update-cells (list &optional force) - "Recalculate cells in LIST, checking for dependency loops. Prints -progress messages every second. Dependent cells are not recalculated -if the cell's value is unchanged and FORCE is nil." + "Recalculate cells in LIST, checking for dependency loops. +Print progress messages every second. Dependent cells are not +recalculated if the cell's value is unchanged and FORCE is nil." (let ((ses--deferred-recalc list) (nextlist list) (pos (point)) @@ -2025,7 +2026,7 @@ Delete overlays, remove special text properties." When you invoke SES in a new buffer, it is divided into cells that you can enter data into. You can navigate the cells with the arrow keys and add more cells with the tab key. The contents -of these cells can be numbers, text, or Lisp expressions. (To +of these cells can be numbers, text, or Lisp expressions. (To enter text, enclose it in double quotes.) In an expression, you can use cell coordinates to refer to the @@ -2131,9 +2132,9 @@ formula: (defun ses-command-hook () "Invoked from `post-command-hook'. If point has moved to a different cell, -moves the underlining overlay. Performs any recalculations or cell-data +move the underlining overlay. Perform any recalculations or cell-data writes that have been deferred. If buffer-narrowing has been deferred, -narrows the buffer now." +narrow the buffer now." (condition-case err (when (eq major-mode 'ses-mode) ; Otherwise, not our buffer anymore. (when ses--deferred-recalc @@ -2251,9 +2252,8 @@ Based on the current set of columns and `window-hscroll' position." (push (symbol-name key) names)) ses--named-cell-hashmap) names))))) - (if - (string= s "") - (error "Invalid cell name") + (if (string= s "") + (user-error "Invalid cell name") (list (intern s))))) (let ((rowcol (ses-sym-rowcol sym))) (or rowcol (error "Invalid cell name")) @@ -2267,8 +2267,8 @@ Based on the current set of columns and `window-hscroll' position." (ses-jump cell))) (defun ses-reprint-all (&optional nonarrow) - "Recreate the display area. Calls all printer functions. Narrows to -print area if NONARROW is nil." + "Recreate the display area. Call all printer functions. +Narrow to print area if optional argument NONARROW is nil." (interactive "*P") (widen) (unless nonarrow @@ -2495,8 +2495,8 @@ to are recalculated first." (and collection (list start end collection)))))) (defun ses-edit-cell (row col newval) - "Display current cell contents in minibuffer, for editing. Returns nil if -cell formula was unsafe and user declined confirmation." + "Display current cell contents in minibuffer, for editing. +Return nil if cell formula was unsafe and user declined confirmation." (interactive (progn (barf-if-buffer-read-only) @@ -2559,8 +2559,9 @@ cell formula was unsafe and user declined confirmation." (funcall x 1)))) (defun ses-read-symbol (row col symb) - "Self-insert for a symbol as a cell formula. The set of all symbols that -have been used as formulas in this spreadsheet is available for completions." + "Self-insert for a symbol as a cell formula. +The set of all symbols that have been used as formulas in this +spreadsheet is available for completions." (interactive (let ((rowcol (progn (ses-check-curcell) (ses-sym-rowcol ses--curcell))) newval) @@ -2593,7 +2594,7 @@ With prefix, deletes several cells." (forward-char 1)))) (defun ses-clear-cell-backward (count) - "Move to previous cell and then delete it. With prefix, deletes several + "Move to previous cell and then delete it. With prefix, delete several cells." (interactive "*p") (if (< count 0) @@ -2653,9 +2654,7 @@ canceled." (barf-if-buffer-read-only) (if (eq default t) (setq default "") - (setq prompt (format "%s (default %S): " - (substring prompt 0 -2) - default))) + (setq prompt (format-prompt prompt default))) (dolist (key ses-completion-keys) (define-key ses-mode-edit-map key 'ses-read-printer-complete-symbol)) ;; make it globally visible, so that it can be visible from the minibuffer. @@ -2702,7 +2701,7 @@ right-justified) or a list of one string (will be left-justified)." ;;Range contains differing printer functions (setq default t) (throw 'ses-read-cell-printer t)))))) - (list (ses-read-printer (format "Cell %S printer: " ses--curcell) + (list (ses-read-printer (format "Cell %S printer" ses--curcell) default)))) (unless (eq newval t) (ses-begin-change) @@ -2716,7 +2715,7 @@ See `ses-read-cell-printer' for input forms." (interactive (let ((col (cdr (ses-sym-rowcol ses--curcell)))) (ses-check-curcell) - (list col (ses-read-printer (format "Column %s printer: " + (list col (ses-read-printer (format "Column %s printer" (ses-column-letter col)) (ses-col-printer col))))) @@ -2731,7 +2730,7 @@ See `ses-read-cell-printer' for input forms." "Set the default printer function for cells that have no other. See `ses-read-cell-printer' for input forms." (interactive - (list (ses-read-printer "Default printer: " ses--default-printer))) + (list (ses-read-printer "Default printer" ses--default-printer))) (unless (eq newval t) (ses-begin-change) (ses-set-parameter 'ses--default-printer newval) @@ -3358,7 +3357,7 @@ is non-nil. Newlines and tabs in the export text are escaped." (push "'" result) (setq item (cadr item))) (setq item (ses-prin1 item)) - (setq item (replace-regexp-in-string "\t" "\\\\t" item)) + (setq item (string-replace "\t" "\\t" item)) (push item result) (cond ((< col maxcol) @@ -3373,15 +3372,15 @@ is non-nil. Newlines and tabs in the export text are escaped." ;;---------------------------------------------------------------------------- (defun ses-list-local-printers (&optional local-printer-hashmap) - "List local printers in a help buffer. Can be called either -during editing a printer or a formula, or while in the SES -buffer." + "List local printers in a help buffer. +Can be called either during editing a printer or a formula, or +while in the SES buffer." (interactive (list (cond ((derived-mode-p 'ses-mode) ses--local-printer-hashmap) ((minibufferp) ses--completion-table) ((derived-mode-p 'help-mode) nil) - (t (error "Not in a SES buffer"))))) + (t (user-error "Not in a SES buffer"))))) (when local-printer-hashmap (let ((ses--list-orig-buffer (or ses--list-orig-buffer (current-buffer)))) (help-setup-xref @@ -3407,15 +3406,15 @@ buffer." (buffer-string))))))) (defun ses-list-named-cells (&optional named-cell-hashmap) - "List named cells in a help buffer. Can be called either -during editing a printer or a formula, or while in the SES -buffer." + "List named cells in a help buffer. +Can be called either during editing a printer or a formula, or +while in the SES buffer." (interactive (list (cond ((derived-mode-p 'ses-mode) ses--named-cell-hashmap) ((minibufferp) ses--completion-table) ((derived-mode-p 'help-mode) nil) - (t (error "Not in a SES buffer"))))) + (t (user-error "Not in a SES buffer"))))) (when named-cell-hashmap (let ((ses--list-orig-buffer (or ses--list-orig-buffer (current-buffer)))) (help-setup-xref @@ -3458,7 +3457,9 @@ With a \\[universal-argument] prefix arg, prompt the user. The top row is row 1. Selecting row 0 displays the default header row." (interactive (list (if (numberp current-prefix-arg) current-prefix-arg - (let ((currow (1+ (car (ses-sym-rowcol ses--curcell))))) + (let* ((curcell (or (ses--cell-at-pos (point)) + (user-error "Invalid header-row"))) + (currow (1+ (car (ses-sym-rowcol curcell))))) (if current-prefix-arg (read-number "Header row: " currow) currow))))) @@ -3773,7 +3774,7 @@ function is redefined." (setq name (intern name)) (let* ((cur-printer (gethash name ses--local-printer-hashmap)) (default (and cur-printer (ses--locprn-def cur-printer)))) - (setq def (ses-read-printer (format "Enter definition of printer %S: " name) + (setq def (ses-read-printer (format "Enter definition of printer %S" name) default))) (list name def))) |