[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/dismal 3608fde768: ; Fix typos
|
From: |
Stefan Kangas |
|
Subject: |
[elpa] externals/dismal 3608fde768: ; Fix typos |
|
Date: |
Mon, 12 Dec 2022 17:30:07 -0500 (EST) |
branch: externals/dismal
commit 3608fde768224d8f75fccd680f6ab5acff380955
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
; Fix typos
---
README | 2 +-
auto-aligner.el | 4 ++--
checkout-dismal.script | 2 +-
dismal-manual.texi | 14 ++++++------
dismal-model-extensions.el | 2 +-
dismal-mouse3.el | 6 +++---
dismal-simple-menus.el | 4 ++--
dismal.el | 54 +++++++++++++++++++++++-----------------------
keystroke.el | 4 ++--
log.el | 4 ++--
simple-menu.el | 6 +++---
vectors.el | 2 +-
12 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/README b/README
index 6061da7837..c03ccc91d3 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@ of Card, Moran and Newell. These were reported at CHI:
'95. 393-400.
(http://www.psychology.nottingham.ac.uk/aigr/research/cmat/Chi95.html).
-For futher information, please see the dismal-manual.* files
+For further information, please see the dismal-manual.* files
accompanying the release, or
http://www.psychology.nottingham.ac.uk/staff/ritter/papers/dismal/dismal.html
diff --git a/auto-aligner.el b/auto-aligner.el
index 68906ffeed..ae22987106 100644
--- a/auto-aligner.el
+++ b/auto-aligner.el
@@ -131,7 +131,7 @@ nEnding row: ")
(setq j (1+ j)))
(setq i (1+ i)))
- ;; Step 3. Traverse the matrix forward along the path of higest scores
+ ;; Step 3. Traverse the matrix forward along the path of highest scores
;; but do it front first...
(message "Computing best match...")
(let* ((dis--max-seq-length
@@ -233,7 +233,7 @@ nEnding row: ")
;; (string-match "place-atom \\([0-9]*\\), \\1" "place-atom 33, 33")
;; move the edit references so that they are later.
-;; vaiables should be put into a lets
+;; variables should be put into a lets
;; ** assumes working with columns 1 and 9 ****
(defun dis--move-references-forward (obs-col _pred-col)
;; low-post-number is where to start looking for something to move
diff --git a/checkout-dismal.script b/checkout-dismal.script
index 1ad6cde446..56dc5ec819 100644
--- a/checkout-dismal.script
+++ b/checkout-dismal.script
@@ -126,7 +126,7 @@ VIII. Very hard stuff
(defun dismal-hard-test ()
"Test dismal with a function!"
- ;; note: this is imcomplete, but getting better.
+ ;; note: this is incomplete, but getting better.
(interactive)
(switch-to-buffer "test-dismal")
(dismal-mode)
diff --git a/dismal-manual.texi b/dismal-manual.texi
index f0c40a398f..64c3f5e6c3 100644
--- a/dismal-manual.texi
+++ b/dismal-manual.texi
@@ -14,7 +14,7 @@
@comment come last rather than first in the table entries. Also, I
@comment couldn't figure out where one of your footnotes went, so it
@comment is just tacked onto the end of the file. Also, there's a
-@comment figure missing somwhere. And the example spreadsheets are
+@comment figure missing somewhere. And the example spreadsheets are
@comment complete rubbish.
@comment
@comment Here's a somewhat cleaned up version.
@@ -1368,7 +1368,7 @@ with something in colA-1. It too only counts stuff that
is in order.
This explanation is probably inadaquate for most uses, but we
anticipate that few will actually use this functionality. If you find
-that you are intersted in using this, please feel free to email me or
+that you are interested in using this, please feel free to email me or
call for more specific help. Really. Tony Simon did this, and we got
his code to work (but we ran out of time for demoing it in his class).
@@ -1595,7 +1595,7 @@ that is evaluated to give the cell's value) through
dismal-get-exp.
You should try to use functions that start with dis-, for these are
pretty stable. If you have to, and you will, functions that start with
dismal- are less stable, and access internal data structures, and you
-can get youself more easily in trouble this way.
+can get yourself more easily in trouble this way.
If you really want to live dangerously (and this is documented for that
person), you can use dynamically bound variables. When dismal evaluates
@@ -1617,7 +1617,7 @@ The first function, klm-time, is used to calculate the
time to enter a
command that is given as an argument when the function is called, or
entered as a value in a Dismal spreadsheet cell. It will compute the
number of mental operators needed, but it can also take that as an
-optional arguement if the analyst knows that this is higher or lower
+optional argument if the analyst knows that this is higher or lower
than expected. The default algorithm give one Mop per word separated by
a dash or space. This rule is derived from the heuristic specified by
Card et al (1983, Figure 8.2 rule 2). It was specifically used when
@@ -1693,8 +1693,8 @@ a fixed range.
@item Rational
@itemx s
-The representation of nmbers in Emacs 19 suppoert rational and
-interger numbers, which should be adaquate for most users.
+The representation of nmbers in Emacs 19 support rational and
+integer numbers, which should be adequate for most users.
@item Floating point
@itemx s
@@ -1745,7 +1745,7 @@ the opposite.
@node Known Bugs And Interactions, GNU-Emacs/Dismal compatibility, Advanced
use of Dismal, Top
@chapter Known Bugs And Interactions
-Dismal has been developed to serve specific needs and with limited resources.
In addition to these limiations, Emacs was designed as an editor, and there
remain a few problems with making it behave like a spreadsheet. We note these
here for your understanding and avoidance.
+Dismal has been developed to serve specific needs and with limited resources.
In addition to these limitations, Emacs was designed as an editor, and there
remain a few problems with making it behave like a spreadsheet. We note these
here for your understanding and avoidance.
@section Hidden variables preclude modifying mode by hand
diff --git a/dismal-model-extensions.el b/dismal-model-extensions.el
index 2a8451ebea..ab8bab0aed 100644
--- a/dismal-model-extensions.el
+++ b/dismal-model-extensions.el
@@ -50,7 +50,7 @@ with something in colA-1. Only counts stuff that is in
order."
range-list 0)
(dis-div (float matches) (float total)) ))
-;; these are not easily combined with the function abov
+;; these are not easily combined with the function above
(defun dis-model-match-op (range-list)
"Given a cell RANGE-LIST computes the percentage of colA matched
with something in colA-2, and col A is an operator. Only counts stuff
diff --git a/dismal-mouse3.el b/dismal-mouse3.el
index 2e4afa5689..5589b76e39 100644
--- a/dismal-mouse3.el
+++ b/dismal-mouse3.el
@@ -199,12 +199,12 @@
(defvar dismal-current-column)
(defun dis-mouse-highlight-cell-or-range ()
- "Highlight a cell or range of cells as choosen by the mouse."
+ "Highlight a cell or range of cells as chosen by the mouse."
(interactive)
(mouse-set-point last-command-event)
;; (setq aa last-command-event)
;; Grab mouse position now and highlight the current cell, store
- ;; the cell information incase a drag is performed
+ ;; the cell information in case a drag is performed
(mouse-set-point last-command-event)
;; First, clear out old highlight.
(dismal-add-text-properties (point-min) (point-max) (list 'face 'default))
@@ -296,7 +296,7 @@
;; ;; set point to position of mouse on window
;; (mouse-set-point last-command-event) ; may go as well
;;
-;; ;; find out what colum is to be highlighted and highlight it
+;; ;; find out what column is to be highlighted and highlight it
;; (setq column (car (dismal-find-cell)))
;; (dis-highlight-range column 0 column dismal-max-row)
;; (dismal-goto-row 0)
diff --git a/dismal-simple-menus.el b/dismal-simple-menus.el
index 0e2c25f794..85ae806157 100644
--- a/dismal-simple-menus.el
+++ b/dismal-simple-menus.el
@@ -139,7 +139,7 @@
))
(sm-def-menu 'dismal-delete-menu
- "Dis deleteable items"
+ "Dis deletable items"
"" ;help prompt
'(("Row Delete a row." dis-delete-row)
("Column Delete a column." dis-delete-column)
@@ -291,7 +291,7 @@
("Auto-update Toggle auto-updating." dis-toggle-auto-update)
("Middle-col Set the last col, that is grouped with the LHS when
aligning."
dis-set-metacolumn)
- ("Field-sep Set the field seperator in files read in."
+ ("Field-sep Set the field separator in files read in."
dis-set-dis-field-sep)
("Show-updt Toggle showing the variables getting updated."
dis-toggle-show-update)
diff --git a/dismal.el b/dismal.el
index e289dcd1e5..e710874b57 100644
--- a/dismal.el
+++ b/dismal.el
@@ -155,13 +155,13 @@ dump files (default TAB).")
"*Text inserted by dis-dump-range at the beginning of each row")
(defvar dis-dump-between-col-marker "\t"
- "*Text inserted by dis-dump-range betweeen columns")
+ "*Text inserted by dis-dump-range between columns")
(defvar dis-dump-tex-end-row-marker "\\\\ \n"
"*Text inserted by dis-tex-dump-range at the end of each row")
(defvar dis-dump-tex-between-col-marker " & "
- "*Text inserted by dis-tex-dump-range betweeen columns")
+ "*Text inserted by dis-tex-dump-range between columns")
(defvar dis-show-update nil
"*If t, then display the values being updated when a variable changes.")
@@ -180,7 +180,7 @@ Zero means disable autosaving.")
(make-variable-buffer-local 'dis-show-ruler)
(defvar dis-auto-update t
- "*If t (the default) automaticaly call update after a cell changes.
+ "*If t (the default) automatically call update after a cell changes.
Setting this to nill can save significant amounts of time on large sheets.")
(make-variable-buffer-local 'dis-auto-update)
@@ -654,7 +654,7 @@ column labels.")
(defvar dismal-interactive-p t)
;; Set to nil when doing secret commands, that we don't want side effects from.
-;; Not buffer local, if doing a command, must be accessable in all buffers.
+;; Not buffer local, if doing a command, must be accessible in all buffers.
(defvar dismal-mark [nil nil])
(make-variable-buffer-local 'dismal-mark)
@@ -898,7 +898,7 @@ in the status line."
"Like ESC t but applies to adjacent horizontal cells.
Flips the current cell and the one to its left."
;; if on left edge, moves one cell right
- ;; this is stupid about updating forumla references, etc.
+ ;; this is stupid about updating formula references, etc.
(interactive)
(dismal-save-excursion
(if (= 0 dismal-current-col)
@@ -956,7 +956,7 @@ Flips the current cell and the one to its left."
))
; (or (null sexp) ;; up
and out immediately if these types,
; (floatp sexp)
- ; (symbolp sexp) ;; plain
variables donot count, cant see changes
+ ; (symbolp sexp) ;; plain
variables donot count, can't see changes
; (not (listp sexp))) ;; b/c
they have nothing to do
(defsubst dismal-file-header (mode-name-to-write)
@@ -1027,7 +1027,7 @@ Optional second argument non-nil means use scientific
notation."
;; For David:
;; 17. Implement evaluation loop counting [you should take a whack at this,
-;; it's outside my interests and talents (reletively)].
+;; it's outside my interests and talents (relatively)].
;; [On DF's list]
;; * On updates, and adding, deleting rows/cols, we're are losing time
;; big in dismal-erase-all-dependencies and dismal-record-all-dependencies.
@@ -1056,10 +1056,10 @@ Optional second argument non-nil means use scientific
notation."
;; 2 (60) Should have a submit bug command.
;; 2 (300) Check for and note circular references.
;; 3 (200) Insert cell references when they are created in formula
-;; more generally, probbaly have to have a check when creating a new
+;; more generally, probably have to have a check when creating a new
;; cell, for can live that it is null until it has a value.
;; 3 (100) incorporate new frame-pop.el from David Smith
-;; 3 (40) make the foramt of saved files more readable and concise
+;; 3 (40) make the format of saved files more readable and concise
;; 3 (?) recover-file fails
;; 2 (20) chaning a null cell to a values does not update formula depending on
it
;; 1 (15) yank does not update cells that rely on the yanked into cell
@@ -1077,7 +1077,7 @@ Optional second argument non-nil means use scientific
notation."
;; load write5.dis, 8:18, unit, 8:43
;; 3 (15) on insert col, adjust dis-middle-col
;; 2 (50) Compute average delay of slots,
-;; eg. v9 matches 32 between two segmetns that match at 61 & 62
+;; eg. v9 matches 32 between two segments that match at 61 & 62
;; also get this error with 18.54: could not sbrk, return=1
;; ? (?) Show state changes
;; ? (?) support coding before matching
@@ -1153,11 +1153,11 @@ Optional second argument non-nil means use scientific
notation."
;; 2 (15:45) Save-some-buffers will not save files the right way, need to
redefine
;; save-some-buffers to do .dis special, 20-Aug-93 -FER
;; 1 (?) previous-pa.dis somehow blew up from 24k to 769k, with a big null row
-;; was a basic pointer problem in how we assinged cells. fixed now
Oct-92
+;; was a basic pointer problem in how we assigned cells. fixed now
Oct-92
;; copy on left mouse button fixed. 6-Nov-92 -fer
;; shell-command fixed (for some), but using new popper.
-;; * And related to this, is updating cell refernces, If you have
-;; the code in hand, I would be happy to cut in a fucntion that knows how
+;; * And related to this, is updating cell references, If you have
+;; the code in hand, I would be happy to cut in a function that knows how
;; to update the contents of a range when it is pasted in, and that could
;; apply when a rectangle is inserted or deleted. 12-Jul-93 -FER/EMA?
;; 3 (15) yank does not invalidate cells
@@ -1427,7 +1427,7 @@ C-x C-q to change read-only.")))
(defun dismal-draw-ruler (expected-current-row)
;; Uses expected-current-row, b/c it is draw before current-row is updated
- (sit-for 0) ;this sit-for appears to be necssary, which is v. weird.
+ (sit-for 0) ;this sit-for appears to be necessary, which is v. weird.
(dismal-save-excursion
(let ((new-ruler-row (- expected-current-row (dis--current-line-in-window)))
(buffer-originally-clean (not (buffer-modified-p))))
@@ -1605,7 +1605,7 @@ C-x C-q to change read-only.")))
(defun dis-bury-buffer (&optional _buffer)
"Bury the current buffer and notify user."
(interactive)
- (message "Burying %s as a way of quiting dismal..."
+ (message "Burying %s as a way of quitting dismal..."
(buffer-name (current-buffer)))
(bury-buffer nil))
@@ -2421,7 +2421,7 @@ nil. Leaves point in same row and column of window
[which seems wrong]."
(insert-char ?\040 chars-missing) ; Insert some blanks
(end-of-line)
(set-buffer-modified-p original-modified-p)))
- ;; this ins't quite right, but is pleasent n.t.l.
+ ;; this isn't quite right, but is pleasant n.t.l.
;; (setq aa (list 'last-col column 'cc (current-column)
;; 'hscroll (window-hscroll)
;; 'going2 (> (+ 3 (current-column)) (+ (window-hscroll) (window-width)))))
@@ -3884,7 +3884,7 @@ by the compress(1) command.")
;; stolen from crypt.el
(defmacro dis--save-point (&rest body)
- "Save value of point, evalutes FORMS and restore value of point.
+ "Save value of point, evaluates FORMS and restore value of point.
If the saved value of point is no longer valid go to (point-max).
This macro exists because, save-excursion loses track of point during
some types of deletions."
@@ -4008,7 +4008,7 @@ Prefix arg (or optional second arg non-nil) UNDO means
uncompress."
(defun dis-insert-file (filename)
"Insert contents of file FILENAME into buffer starting at the current cell.
-Fields (cells) are seperated by dis-field-sep.
+Fields (cells) are separated by dis-field-sep.
Cells are overwritten rather than pushed down.
Set mark after the inserted text."
(interactive "FDis insert file: ")
@@ -4076,7 +4076,7 @@ Set mark after the inserted text."
(interactive "P")
(let ((new-sep (or initial-field-sep
(read-string
- (format "New field seperator value [was %s]: "
+ (format "New field separator value [was %s]: "
dis-field-sep)) )))
(cond ( (stringp new-sep)
(setq dis-field-sep new-sep)
@@ -4461,7 +4461,7 @@ Writes an extra tab if last field is empty for use in
other programs, like S."
; Usage (send-cmd-to-shell "gplot
/tmp/disgnu.gp" t) Send the command
; line to the shell (using
`shell-command' to process gplot commands
- ; didnt work. gplot does fancy stuff
with pipes, so I'm not sure if
+ ; didn't work. gplot does fancy stuff
with pipes, so I'm not sure if
; there was a problem with pipes. So,
now we create a buffer called
; *dis-gnuplot* to process our gnuplot
shell commands.
; (send-cmd-to-shell "ls" t)
@@ -4495,7 +4495,7 @@ Writes an extra tab if last field is empty for use in
other programs, like S."
(getenv "SHELL")
"sh")
nil "-i")
- ;; could use make-local-hook, but thats a relatively new
+ ;; could use make-local-hook, but that's a relatively new
;; function, so do it the hard way for now.
(set (make-local-variable 'dismal-gnuplot-finish)
dis-gnuplot-kill-gplot)
@@ -5108,7 +5108,7 @@ redraws with point in the center. Adjusts somewhat for
rulers."
;; (setq string " -1.0000")
;; (setq rightspace 2)
-;; not longer necessary, convereted to all native floats 2-Jan-97 -FER
+;; no longer necessary, converted to all native floats 2-Jan-97 -FER
;; but used by convervsion programs.
(defun dismal-flat-format-float-string (string rightspace)
;; Given the STRING returned by dis--float-to-string, return a string
formatted
@@ -5205,7 +5205,7 @@ redraws with point in the center. Adjusts somewhat for
rulers."
column))))
-;;;; XVIII. Column formating commands
+;;;; XVIII. Column formatting commands
(defun dis-set-alignment (range-or-col alignment-style)
(interactive (list (sm-run-menu 'dismal-range-or-col-menu 'col)
@@ -5469,7 +5469,7 @@ in a file created by the log program."
;; old way, changes inspired by Dan Nicolaescu <done@ece.arizona.edu>
;; 17-Jun-97 -FER
;;(defun dismal-insert-blank-box (start-point rows cols text)
-;; ;; Starting at START-POINT insert ROW lines of COLS copys of TEXT.
+;; ;; Starting at START-POINT insert ROW lines of COLS copies of TEXT.
;; ;; The column is taken from that of START.
;; ;; A rough inverse of this function is kill-rectangle.
;; (save-excursion
@@ -5483,7 +5483,7 @@ in a file created by the log program."
;; (move-to-column cc)))))
(defun dismal-insert-blank-box (start-point rows width text)
- ;; Starting at START-POINT insert ROW lines of WIDTH copys of TEXT.
+ ;; Starting at START-POINT insert ROW lines of WIDTH copies of TEXT.
;; The column is taken from that of START.
;; A rough inverse of this function is kill-rectangle.
(save-excursion
@@ -5560,7 +5560,7 @@ in a file created by the log program."
(t ; not leap year
(setq days (- days 365))
(setq styear (+ 1 styear)))))
- ;; this is awkard, but should work....
+ ;; this is awkward, but should work....
(if (<= days 31) (setq month "Jan")
(setq days (- days 31))
(if (or (and (= 0 (% styear 4))
@@ -5650,7 +5650,7 @@ Includes leap years."
(setq days (+ days
(dis-days-to-eoy stmonth stday)
(dis-days-from-boy month day)))
- (setq days (+ days 1 ; double substraction here
+ (setq days (+ days 1 ; double subtraction here
(dis-days-from-boy month day)))
(setq days (- days (dis-days-from-boy stmonth stday))))
;; return the total
diff --git a/keystroke.el b/keystroke.el
index ff3a8f0067..3c88a1d1fd 100644
--- a/keystroke.el
+++ b/keystroke.el
@@ -32,7 +32,7 @@
;; a command that given as an argument when the function is
;; called, or entered as a value in a Dismal spreadsheet cell.
;; It will compute the number of mental operators needed, but it can
-;; also take that as an optional arguement if the analyst knows that this
+;; also take that as an optional argument if the analyst knows that this
;; is higher or lower than expected. The default algorithm give one Mop
;; per word separated by a dash or space. This rule is
;; derived from the heuristic specified by Card et al (1983, Figure 8.2
@@ -69,7 +69,7 @@
;;;
;;; I. command-time: Time to enter a command
;;;
-;; Takes COMMAND (a string) as arguement, automatically calculates
+;; Takes COMMAND (a string) as argument, automatically calculates
;; mental operators by looking for hyphens, and includes average typing
;; speed from wpm to return time to execute command in seconds.
diff --git a/log.el b/log.el
index fd2c5c6731..bfadb16831 100644
--- a/log.el
+++ b/log.el
@@ -725,7 +725,7 @@ representations. Output to *log-time-episodes*."
log--lex-timestamp nil
log--lex-keymap nil
log--lex-keys nil)
- (skip-chars-forward " \t") ; skip whitespace befor field 1
+ (skip-chars-forward " \t") ; skip whitespace before field 1
(if (not (looking-at "\\([0-9]+\\)[ \t]")) ; line number?
()
(setq log--lex-line-number (match-string 1))
@@ -1216,7 +1216,7 @@ spaces, which can't otherwise get into the data.)
Collapses ^A-^Z,
;; 11-28-92 - indenting copy-as-kills is meant to improve
;; filterability. in particular, it means that keystrokes can be
;; counted by filtering out lines that lead with spaces.
-;; important if one happens to yank mulitple lines from the log
+;; important if one happens to yank multiple lines from the log
;; buffer...
(provide 'log)
diff --git a/simple-menu.el b/simple-menu.el
index b2a760dc59..5109848006 100644
--- a/simple-menu.el
+++ b/simple-menu.el
@@ -85,7 +85,7 @@
;; a value with message as its result.
;;
;; If there is only one menu item, it is executed when the menu is run.
-;; After an item is selected and sucessfully completed, a possible keybinding
+;; After an item is selected and successfully completed, a possible keybinding
;; or call via meta-X is displayed if possible.
;;
;; Here's an example:
@@ -152,7 +152,7 @@
(if command
(sm-note-function-key command sm--current-key-map)
(beep)
- (message "Quiting simple-menu"))
+ (message "Quitting simple-menu"))
;; (beep) (message "hi") (sit-for 1)
(setq sm-run-menu-flag nil)
;; (keyboard-quit)
@@ -763,7 +763,7 @@ or the current-local-map."
;; menu
;; (get menu 'items))))
;; ;; these had been switched to save cycles, but
-;; ;; it looks like some menus are buffer sensative
+;; ;; it looks like some menus are buffer sensitive
;; (t "not documented"))))))
(defun sm-note-function-key (command keymap)
diff --git a/vectors.el b/vectors.el
index addeab94f3..3a5d01e7bf 100644
--- a/vectors.el
+++ b/vectors.el
@@ -180,7 +180,7 @@ current size.")
(defsubst vector-delete (vector index count)
"In VECTOR at position INDEX delete COUNT elements."
;; keeping raw size of vector still large
- ;; not deleteing more then you have to
+ ;; not deleting more then you have to
(if (< index (aref vector 1))
(progn
(setq count (min count (- (aref vector 1) index)))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/dismal 3608fde768: ; Fix typos,
Stefan Kangas <=