diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-04 00:02:42 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-04 00:02:42 -0800 |
| commit | c80e3b4aed2e70eb6d8445d786c0df770094e9e1 (patch) | |
| tree | e44fe2f2604d66890ec2442ea23e73ee5011907a /lisp | |
| parent | a24bf23e0f6e5cea917b77cc455314cdcc31be5b (diff) | |
| download | emacs-c80e3b4aed2e70eb6d8445d786c0df770094e9e1.tar.gz | |
Spelling fixes.
Diffstat (limited to 'lisp')
86 files changed, 290 insertions, 291 deletions
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 8721130ec50..2a5a20181e1 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -7177,7 +7177,7 @@ 2006-08-20 Chong Yidong <cyd@stupidchicken.com> * frame.el (blink-cursor-start): Set timer first. - (blink-cursor-end): Ignore timer cancelling errors. + (blink-cursor-end): Ignore timer canceling errors. Suggested by Ken Manheimer. 2006-08-20 Juanma Barranquero <lekktu@gmail.com> @@ -15842,7 +15842,7 @@ interactive spec from "p" to "P". * progmodes/cc-styles.el: Amend the doc-string of c-set-style, in - reponse to a report from Joseph Kiniry <kiniry@acm.org> that it + response to a report from Joseph Kiniry <kiniry@acm.org> that it was difficult to understand. 2005-12-08 Martin Stjernholm <bug-cc-mode@gnu.org> diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 12eadc6aadf..0e6a27e0776 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -8010,7 +8010,7 @@ 2007-10-31 Juanma Barranquero <lekktu@gmail.com> * help-at-pt.el (help-at-pt-unload-hook): Remove. - Timers are automatically cancelled by `unload-feature'. + Timers are automatically canceled by `unload-feature'. * delsel.el (delsel-unload-hook): Remove function and variable. (delsel-unload-function): New-style unload function, adapted diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index 0348a0141a2..7063ed67b62 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -866,7 +866,7 @@ * calc/calc-embed.el (calc-embedded-restore-original-modes): Add argument for Calculator buffer. - (calc-do-embedded): Use specific Calculator buffer when cancelling + (calc-do-embedded): Use specific Calculator buffer when canceling embedded mode. * calc/calc.el (calc-buffer-list): New variable. diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index e0c244d5725..ab1eb3591cd 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -7086,7 +7086,7 @@ (sql-mode-oracle-font-lock-keywords): Improve SQL*Plus REMARK syntax pattern. (sql-mode-postgres-font-lock-keywords): Support Postgres V9. - (sql-mode-sqlite-font-lock-keywords): Hilight sqlite commands. + (sql-mode-sqlite-font-lock-keywords): Highlight sqlite commands. 2010-09-10 Lars Magne Ingebrigtsen <larsi@gnus.org> @@ -11908,7 +11908,7 @@ Add new VC methods: vc-log-incoming and vc-log-outgoing. * vc.el (vc-print-log-setup-buttons): New function split out from vc-print-log-internal. - (vc-log-internal-common): New function, a parametrized version of + (vc-log-internal-common): New function, a parameterized version of vc-print-log-internal. (vc-print-log-internal): Just call vc-log-internal-common with the right arguments. diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index cb39ca5997f..b97bcea89cc 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -6305,7 +6305,7 @@ to "Non-echoed text: ". This conforms with the convention used by existing prompts, and gives more room to type stuff. - * comint.el (comint-last-input-start): New varible. In + * comint.el (comint-last-input-start): New variable. In particular, this helps support subprocesses that insist on echoing their input. Added comments to porting guide indicating that this should probably not be used for implementing history stuff. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 934258ade67..25a80567069 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -884,7 +884,7 @@ 1998-07-21 Kenichi Handa <handa@etl.go.jp> * international/kkc.el (kkc-region): Handled the case that - conversion is cancelled. + conversion is canceled. (kkc-terminate): Update kkc-overlay-head correctly. (kkc-cancel): Don't call kkc-terminate, but set kkc-converting to nil. diff --git a/lisp/calc/calc-menu.el b/lisp/calc/calc-menu.el index d8099b0aadc..d8c01656784 100644 --- a/lisp/calc/calc-menu.el +++ b/lisp/calc/calc-menu.el @@ -24,19 +24,19 @@ (defvar calc-arithmetic-menu (list "Arithmetic" (list "Basic" - ["-(1:)" calc-change-sign + ["-(1:)" calc-change-sign :keys "n" :active (>= (calc-stack-size) 1)] - ["(2:) + (1:)" calc-plus + ["(2:) + (1:)" calc-plus :keys "+" :active (>= (calc-stack-size) 2)] - ["(2:) - (1:)" calc-minus + ["(2:) - (1:)" calc-minus :keys "-" :active (>= (calc-stack-size) 2)] - ["(2:) * (1:)" calc-times + ["(2:) * (1:)" calc-times :keys "*" :active (>= (calc-stack-size) 2)] - ["(2:) / (1:)" calc-divide + ["(2:) / (1:)" calc-divide :keys "/" :active (>= (calc-stack-size) 2)] - ["(2:) ^ (1:)" calc-power + ["(2:) ^ (1:)" calc-power :keys "^" :active (>= (calc-stack-size) 2)] - ["(2:) ^ (1/(1:))" + ["(2:) ^ (1/(1:))" (progn (require 'calc-ext) (let ((calc-inverse-flag t)) @@ -44,8 +44,8 @@ :keys "I ^" :active (>= (calc-stack-size) 2) :help "The (1:)th root of (2:)"] - ["abs(1:)" - (progn + ["abs(1:)" + (progn (require 'calc-arith) (call-interactively 'calc-abs)) :keys "A" @@ -57,7 +57,7 @@ (call-interactively 'calc-inv)) :keys "&" :active (>= (calc-stack-size) 1)] - ["sqrt(1:)" + ["sqrt(1:)" (progn (require 'calc-math) (call-interactively 'calc-sqrt)) @@ -70,7 +70,7 @@ :keys "\\" :active (>= (calc-stack-size) 2) :help "The integer quotient of (2:) over (1:)"] - ["(2:) mod (1:)" + ["(2:) mod (1:)" (progn (require 'calc-misc) (call-interactively 'calc-mod)) @@ -78,28 +78,28 @@ :active (>= (calc-stack-size) 2) :help "The remainder when (2:) is divided by (1:)"]) (list "Rounding" - ["floor(1:)" + ["floor(1:)" (progn (require 'calc-arith) (call-interactively 'calc-floor)) :keys "F" :active (>= (calc-stack-size) 1) :help "The greatest integer less than or equal to (1:)"] - ["ceiling(1:)" + ["ceiling(1:)" (progn (require 'calc-arith) (call-interactively 'calc-ceiling)) :keys "I F" :active (>= (calc-stack-size) 1) :help "The smallest integer greater than or equal to (1:)"] - ["round(1:)" + ["round(1:)" (progn (require 'calc-arith) (call-interactively 'calc-round)) :keys "R" :active (>= (calc-stack-size) 1) :help "The nearest integer to (1:)"] - ["truncate(1:)" + ["truncate(1:)" (progn (require 'calc-arith) (call-interactively 'calc-trunc)) @@ -140,32 +140,32 @@ :active (>= (calc-stack-size) 1) :help "The argument (polar angle) of (1:)"]) (list "Conversion" - ["Convert (1:) to a float" + ["Convert (1:) to a float" (progn (require 'calc-ext) (call-interactively 'calc-float)) :keys "c f" :active (>= (calc-stack-size) 1)] - ["Convert (1:) to a fraction" + ["Convert (1:) to a fraction" (progn (require 'calc-ext) (call-interactively 'calc-fraction)) :keys "c F" :active (>= (calc-stack-size) 1)]) (list "Binary" - ["Set word size" + ["Set word size" (progn (require 'calc-bin) (call-interactively 'calc-word-size)) :keys "b w"] - ["Clip (1:) to word size" + ["Clip (1:) to word size" (progn (require 'calc-bin) (call-interactively 'calc-clip)) :keys "b c" :active (>= (calc-stack-size) 1) :help "Reduce (1:) modulo 2^wordsize"] - ["(2:) and (1:)" + ["(2:) and (1:)" (progn (require 'calc-bin) (call-interactively 'calc-and)) @@ -180,13 +180,13 @@ :active (>= (calc-stack-size) 2) :help "Bitwise inclusive OR [modulo 2^wordsize]"] ["(2:) xor (1:)" - (progn + (progn (require 'calc-bin) (call-interactively 'calc-xor)) :keys "b x" :active (>= (calc-stack-size) 2) :help "Bitwise exclusive OR [modulo 2^wordsize]"] - ["diff(2:,1:)" + ["diff(2:,1:)" (progn (require 'calc-bin) (call-interactively 'calc-diff)) @@ -263,82 +263,82 @@ :keys "I P" :help "Euler's constant"]) (list "Logs and Exps" - ["ln(1:)" - (progn - (require 'calc-math) - (call-interactively 'calc-ln)) + ["ln(1:)" + (progn + (require 'calc-math) + (call-interactively 'calc-ln)) :keys "L" :active (>= (calc-stack-size) 1) :help "The natural logarithm"] - ["e^(1:)" + ["e^(1:)" (progn (require 'calc-math) (call-interactively 'calc-exp)) :keys "E" :active (>= (calc-stack-size) 1)] - ["log(1:) [base 10]" + ["log(1:) [base 10]" (progn (require 'calc-math) (call-interactively 'calc-log10)) :keys "H L" :active (>= (calc-stack-size) 1) :help "The common logarithm"] - ["10^(1:)" + ["10^(1:)" (progn (require 'calc-math) (let ((calc-inverse-flag t)) (call-interactively 'calc-log10))) :keys "I H L" :active (>= (calc-stack-size) 1)] - ["log(2:) [base(1:)]" + ["log(2:) [base(1:)]" (progn (require 'calc-math) (call-interactively 'calc-log)) :keys "B" :active (>= (calc-stack-size) 2) :help "The logarithm with an arbitrary base"] - ["(2:) ^ (1:)" - calc-power + ["(2:) ^ (1:)" + calc-power :keys "^" :active (>= (calc-stack-size) 2)]) (list "Trigonometric Functions" - ["sin(1:)" + ["sin(1:)" (progn (require 'calc-math) (call-interactively 'calc-sin)) :keys "S" :active (>= (calc-stack-size) 1)] - ["cos(1:)" + ["cos(1:)" (progn (require 'calc-math) (call-interactively 'calc-cos)) :keys "C" :active (>= (calc-stack-size) 1)] - ["tan(1:)" + ["tan(1:)" (progn (require 'calc-math) (call-interactively 'calc-tan)) :keys "T" :active (>= (calc-stack-size) 1)] - ["arcsin(1:)" + ["arcsin(1:)" (progn (require 'calc-math) (call-interactively 'calc-arcsin)) :keys "I S" :active (>= (calc-stack-size) 1)] - ["arccos(1:)" + ["arccos(1:)" (progn (require 'calc-math) (call-interactively 'calc-arccos)) :keys "I C" :active (>= (calc-stack-size) 1)] - ["arctan(1:)" + ["arctan(1:)" (progn (require 'calc-math) (call-interactively 'calc-arctan)) :keys "I T" :active (>= (calc-stack-size) 1)] - ["arctan2(2:,1:)" + ["arctan2(2:,1:)" (progn (require 'calc-math) (call-interactively 'calc-arctan2)) @@ -367,65 +367,65 @@ :style radio :selected (eq calc-angle-mode 'hms)]) (list "Hyperbolic Functions" - ["sinh(1:)" + ["sinh(1:)" (progn (require 'calc-math) (call-interactively 'calc-sinh)) :keys "H S" :active (>= (calc-stack-size) 1)] - ["cosh(1:)" + ["cosh(1:)" (progn (require 'calc-math) (call-interactively 'calc-cosh)) :keys "H C" :active (>= (calc-stack-size) 1)] - ["tanh(1:)" + ["tanh(1:)" (progn (require 'calc-math) (call-interactively 'calc-tanh)) :keys "H T" :active (>= (calc-stack-size) 1)] - ["arcsinh(1:)" + ["arcsinh(1:)" (progn (require 'calc-math) (call-interactively 'calc-arcsinh)) :keys "I H S" :active (>= (calc-stack-size) 1)] - ["arccosh(1:)" + ["arccosh(1:)" (progn (require 'calc-math) (call-interactively 'calc-arccosh)) :keys "I H C" :active (>= (calc-stack-size) 1)] - ["arctanh(1:)" + ["arctanh(1:)" (progn (require 'calc-math) (call-interactively 'calc-arctanh)) :keys "I H T" :active (>= (calc-stack-size) 1)]) (list "Advanced Math Functions" - ["Gamma(1:)" + ["Gamma(1:)" (progn (require 'calc-comb) (call-interactively 'calc-gamma)) :keys "f g" :active (>= (calc-stack-size) 1) :help "The Euler Gamma function"] - ["GammaP(2:,1:)" + ["GammaP(2:,1:)" (progn (require 'calc-funcs) (call-interactively 'calc-inc-gamma)) :keys "f G" :active (>= (calc-stack-size) 2) :help "The lower incomplete Gamma function"] - ["Beta(2:,1:)" + ["Beta(2:,1:)" (progn (require 'calc-funcs) (call-interactively 'calc-beta)) :keys "f b" :active (>= (calc-stack-size) 2) :help "The Euler Beta function"] - ["BetaI(3:,2:,1:)" + ["BetaI(3:,2:,1:)" (progn (require 'calc-funcs) (call-interactively 'calc-inc-beta)) @@ -439,14 +439,14 @@ :keys "f e" :active (>= (calc-stack-size) 1) :help "The error function"] - ["BesselJ(2:,1:)" + ["BesselJ(2:,1:)" (progn (require 'calc-funcs) (call-interactively 'calc-bessel-J)) :keys "f j" :active (>= (calc-stack-size) 2) :help "The Bessel function of the first kind (of order (2:))"] - ["BesselY(2:,1:)" + ["BesselY(2:,1:)" (progn (require 'calc-funcs) (call-interactively 'calc-bessel-Y)) @@ -454,44 +454,44 @@ :active (>= (calc-stack-size) 2) :help "The Bessel function of the second kind (of order (2:))"]) (list "Combinatorial Functions" - ["gcd(2:,1:)" + ["gcd(2:,1:)" (progn (require 'calc-comb) (call-interactively 'calc-gcd)) :keys "k g" :active (>= (calc-stack-size) 2)] - ["lcm(2:,1:)" + ["lcm(2:,1:)" (progn (require 'calc-comb) (call-interactively 'calc-lcm)) :keys "k l" :active (>= (calc-stack-size) 2)] - ["factorial(1:)" + ["factorial(1:)" (progn (require 'calc-comb) (call-interactively 'calc-factorial)) :keys "!" :active (>= (calc-stack-size) 1)] - ["(2:) choose (1:)" + ["(2:) choose (1:)" (progn (require 'calc-comb) (call-interactively 'calc-choose)) :keys "k c" :active (>= (calc-stack-size) 2)] - ["permutations(2:,1:)" + ["permutations(2:,1:)" (progn (require 'calc-comb) (call-interactively 'calc-perm)) :keys "H k c" :active (>= (calc-stack-size) 2)] - ["Primality test for (1:)" + ["Primality test for (1:)" (progn (require 'calc-comb) (call-interactively 'calc-prime-test)) :keys "k p" :active (>= (calc-stack-size) 1) :help "For large (1:), a probabilistic test"] - ["Factor (1:) into primes" + ["Factor (1:) into primes" (progn (require 'calc-comb) (call-interactively 'calc-prime-factors)) @@ -527,17 +527,17 @@ ["Help on Scientific Functions" (calc-info-goto-node "Scientific Functions")]) "Menu for Calc's scientific functions.") - + (defvar calc-algebra-menu (list "Algebra" (list "Simplification" - ["Simplify (1:)" + ["Simplify (1:)" (progn (require 'calc-alg) (call-interactively 'calc-simplify)) :keys "a s" :active (>= (calc-stack-size) 1)] - ["Simplify (1:) with extended rules" + ["Simplify (1:) with extended rules" (progn (require 'calc-alg) (call-interactively 'calc-simplify-extended)) @@ -545,72 +545,72 @@ :active (>= (calc-stack-size) 1) :help "Apply possibly unsafe simplifications"]) (list "Manipulation" - ["Expand formula (1:)" + ["Expand formula (1:)" (progn (require 'calc-alg) (call-interactively 'calc-expand-formula)) :keys "a \"" :active (>= (calc-stack-size) 1) :help "Expand (1:) into its defining formula, if possible"] - ["Evaluate variables in (1:)" + ["Evaluate variables in (1:)" (progn (require 'calc-ext) (call-interactively 'calc-evaluate)) :keys "=" :active (>= (calc-stack-size) 1)] - ["Make substitution in (1:)" + ["Make substitution in (1:)" (progn (require 'calc-alg) (call-interactively 'calc-substitute)) :keys "a b" :active (>= (calc-stack-size) 1) - :help + :help "Substitute all occurrences of a sub-expression with a new sub-expression"]) (list "Polynomials" - ["Factor (1:)" + ["Factor (1:)" (progn (require 'calc-alg) (call-interactively 'calc-factor)) :keys "a f" :active (>= (calc-stack-size) 1)] - ["Collect terms in (1:)" + ["Collect terms in (1:)" (progn (require 'calc-alg) - (call-interactively 'calc-collect)) + (call-interactively 'calc-collect)) :keys "a c" :active (>= (calc-stack-size) 1) :help "Arrange as a polynomial in a given variable"] - ["Expand (1:)" + ["Expand (1:)" (progn (require 'calc-alg) (call-interactively 'calc-expand)) :keys "a x" :active (>= (calc-stack-size) 1) :help "Apply distributive law everywhere"] - ["Find roots of (1:)" + ["Find roots of (1:)" (progn (require 'calcalg2) (call-interactively 'calc-poly-roots)) :keys "a P" :active (>= (calc-stack-size) 1)]) (list "Calculus" - ["Differentiate (1:)" + ["Differentiate (1:)" (progn (require 'calcalg2) (call-interactively 'calc-derivative)) :keys "a d" :active (>= (calc-stack-size) 1)] - ["Integrate (1:) [indefinite]" + ["Integrate (1:) [indefinite]" (progn (require 'calcalg2) (call-interactively 'calc-integral)) :keys "a i" :active (>= (calc-stack-size) 1)] - ["Integrate (1:) [definite]" + ["Integrate (1:) [definite]" (progn (require 'calcalg2) (let ((var (read-string "Integration variable: "))) - (calc-tabular-command 'calcFunc-integ "Integration" + (calc-tabular-command 'calcFunc-integ "Integration" "intg" nil var nil nil))) :keys "C-u a i" :active (>= (calc-stack-size) 1)] @@ -621,20 +621,20 @@ :keys "a I" :active (>= (calc-stack-size) 1) :help "Integrate using the open Romberg method"] - ["Taylor expand (1:)" + ["Taylor expand (1:)" (progn (require 'calcalg2) (call-interactively 'calc-taylor)) :keys "a t" :active (>= (calc-stack-size) 1)] - ["Minimize (2:) [initial guess = (1:)]" + ["Minimize (2:) [initial guess = (1:)]" (progn (require 'calcalg3) (call-interactively 'calc-find-minimum)) :keys "a N" :active (>= (calc-stack-size) 2) :help "Find a local minimum"] - ["Maximize (2:) [initial guess = (1:)]" + ["Maximize (2:) [initial guess = (1:)]" (progn (require 'calcalg3) (call-interactively 'calc-find-maximum)) @@ -642,26 +642,26 @@ :active (>= (calc-stack-size) 2) :help "Find a local maximum"]) (list "Solving" - ["Solve equation (1:)" + ["Solve equation (1:)" (progn (require 'calcalg2) (call-interactively 'calc-solve-for)) :keys "a S" :active (>= (calc-stack-size) 1)] - ["Solve equation (2:) numerically [initial guess = (1:)]" + ["Solve equation (2:) numerically [initial guess = (1:)]" (progn (require 'calcalg3) (call-interactively 'calc-find-root)) :keys "a R" :active (>= (calc-stack-size) 2)] - ["Find roots of polynomial (1:)" + ["Find roots of polynomial (1:)" (progn (require 'calcalg2) (call-interactively 'calc-poly-roots)) :keys "a P" :active (>= (calc-stack-size) 1)]) (list "Curve Fitting" - ["Fit (1:)=[x values, y values] to a curve" + ["Fit (1:)=[x values, y values] to a curve" (progn (require 'calcalg3) (call-interactively 'calc-curve-fit)) @@ -675,13 +675,13 @@ (defvar calc-graphics-menu (list "Graphics" - ["Graph 2D [(1:)= y values, (2:)= x values]" + ["Graph 2D [(1:)= y values, (2:)= x values]" (progn (require 'calc-graph) (call-interactively 'calc-graph-fast)) :keys "g f" :active (>= (calc-stack-size) 2)] - ["Graph 3D [(1:)= z values, (2:)= y values, (3:)= x values]" + ["Graph 3D [(1:)= z values, (2:)= y values, (3:)= x values]" (progn (require 'calc-graph) (call-interactively 'calc-graph-fast-3d)) @@ -696,11 +696,11 @@ (defvar calc-vectors-menu (list "Matrices/Vectors" (list "Matrices" - ["(2:) + (1:)" calc-plus + ["(2:) + (1:)" calc-plus :keys "+" :active (>= (calc-stack-size) 2)] - ["(2:) - (1:)" calc-minus + ["(2:) - (1:)" calc-minus :keys "-" :active (>= (calc-stack-size) 2)] - ["(2:) * (1:)" calc-times + ["(2:) * (1:)" calc-times :keys "*" :active (>= (calc-stack-size) 2)] ["(1:)^(-1)" (progn @@ -709,17 +709,17 @@ :keys "&" :active (>= (calc-stack-size) 1)] ["Create an identity matrix" - (progn + (progn (require 'calc-vec) (call-interactively 'calc-ident)) :keys "v i"] - ["transpose(1:)" + ["transpose(1:)" (progn (require 'calc-vec) (call-interactively 'calc-transpose)) :keys "v t" :active (>= (calc-stack-size) 1)] - ["det(1:)" + ["det(1:)" (progn (require 'calc-mtx) (call-interactively 'calc-mdet)) @@ -731,19 +731,19 @@ (call-interactively 'calc-mtrace)) :keys "V T" :active (>= (calc-stack-size) 1)] - ["LUD decompose (1:)" + ["LUD decompose (1:)" (progn (require 'calc-mtx) (call-interactively 'calc-mlud)) :keys "V L" :active (>= (calc-stack-size) 1)] - ["Extract a row from (1:)" + ["Extract a row from (1:)" (progn (require 'calc-vec) (call-interactively 'calc-mrow)) :keys "v r" :active (>= (calc-stack-size) 1)] - ["Extract a column from (1:)" + ["Extract a column from (1:)" (progn (require 'calc-vec) (call-interactively 'calc-mcol)) @@ -756,13 +756,13 @@ (call-interactively 'calc-head)) :keys "v h" :active (>= (calc-stack-size) 1)] - ["Extract an element from (1:)" + ["Extract an element from (1:)" (progn (require 'calc-vec) (call-interactively 'calc-mrow)) :keys "v r" :active (>= (calc-stack-size) 1)] - ["Reverse (1:)" + ["Reverse (1:)" (progn (require 'calc-vec) (call-interactively 'calc-reverse-vector)) @@ -775,19 +775,19 @@ :keys "v u" :active (>= (calc-stack-size) 1) :help "Separate the elements of (1:)"] - ["(2:) cross (1:)" + ["(2:) cross (1:)" (progn (require 'calc-vec) (call-interactively 'calc-cross)) :keys "V C" :active (>= (calc-stack-size) 2) :help "The cross product in R^3"] - ["(2:) dot (1:)" - calc-mult + ["(2:) dot (1:)" + calc-mult :keys "*" :active (>= (calc-stack-size) 2) :help "The dot product"] - ["Map a function across (1:)" + ["Map a function across (1:)" (progn (require 'calc-map) (call-interactively 'calc-map)) @@ -795,25 +795,25 @@ :active (>= (calc-stack-size) 1) :help "Apply a function to each element"]) (list "Vectors As Sets" - ["Remove duplicates from (1:)" + ["Remove duplicates from (1:)" (progn (require 'calc-vec) (call-interactively 'calc-remove-duplicates)) :keys "V +" :active (>= (calc-stack-size) 1)] - ["(2:) union (1:)" + ["(2:) union (1:)" (progn (require 'calc-vec) (call-interactively 'calc-set-union)) :keys "V V" :active (>= (calc-stack-size) 2)] - ["(2:) intersect (1:)" + ["(2:) intersect (1:)" (progn (require 'calc-vec) (call-interactively 'calc-set-intersect)) :keys "V ^" :active (>= (calc-stack-size) 2)] - ["(2:) \\ (1:)" + ["(2:) \\ (1:)" (progn (require 'calc-vec) (call-interactively 'calc-set-difference)) @@ -821,35 +821,35 @@ :help "Set difference" :active (>= (calc-stack-size) 2)]) (list "Statistics On Vectors" - ["length(1:)" + ["length(1:)" (progn (require 'calc-stat) (call-interactively 'calc-vector-count)) :keys "u #" :active (>= (calc-stack-size) 1) :help "The number of data values"] - ["sum(1:)" + ["sum(1:)" (progn (require 'calc-stat) (call-interactively 'calc-vector-sum)) :keys "u +" :active (>= (calc-stack-size) 1) :help "The sum of the data values"] - ["max(1:)" + ["max(1:)" (progn (require 'calc-stat) - (call-interactively 'calc-vector-max)) + (call-interactively 'calc-vector-max)) :keys "u x" :active (>= (calc-stack-size) 1) :help "The maximum of the data values"] - ["min(1:)" + ["min(1:)" (progn (require 'calc-stat) - (call-interactively 'calc-vector-min)) + (call-interactively 'calc-vector-min)) :keys "u N" :active (>= (calc-stack-size) 1) - :help "The minumum of the data values"] - ["mean(1:)" + :help "The minimum of the data values"] + ["mean(1:)" (progn (require 'calc-stat) (call-interactively 'calc-vector-mean)) @@ -863,28 +863,28 @@ :keys "I u M" :active (>= (calc-stack-size) 1) :help "The average (arithmetic mean) of the data values as an error form"] - ["sdev(1:)" + ["sdev(1:)" (progn (require 'calc-stat) (call-interactively 'calc-vector-sdev)) :keys "u S" :active (>= (calc-stack-size) 1) :help "The sample sdev, sqrt[sum((values - mean)^2)/(N-1)]"] - ["variance(1:)" + ["variance(1:)" (progn (require 'calc-stat) (call-interactively 'calc-vector-variance)) :keys "H u S" :active (>= (calc-stack-size) 1) :help "The sample variance, sum((values - mean)^2)/(N-1)"] - ["population sdev(1:)" + ["population sdev(1:)" (progn (require 'calc-stat) (call-interactively 'calc-vector-pop-sdev)) :keys "I u S" :active (>= (calc-stack-size) 1) :help "The population sdev, sqrt[sum((values - mean)^2)/N]"] - ["population variance(1:)" + ["population variance(1:)" (progn (require 'calc-stat) (call-interactively 'calc-vector-pop-variance)) @@ -937,25 +937,25 @@ (defvar calc-units-menu (list "Units" - ["Convert units in (1:)" + ["Convert units in (1:)" (progn (require 'calc-units) (call-interactively 'calc-convert-units )) :keys "u c" :active (>= (calc-stack-size) 1)] - ["Convert temperature in (1:)" + ["Convert temperature in (1:)" (progn (require 'calc-units) (call-interactively 'calc-convert-temperature)) :keys "u t" :active (>= (calc-stack-size) 1)] - ["Simplify units in (1:)" + ["Simplify units in (1:)" (progn (require 'calc-units) (call-interactively 'calc-simplify-units)) :keys "u s" :active (>= (calc-stack-size) 1)] - ["View units table" + ["View units table" (progn (require 'calc-units) (call-interactively 'calc-view-units-table)) @@ -1072,40 +1072,40 @@ (defvar calc-variables-menu (list "Variables" - ["Store (1:) into a variable" + ["Store (1:) into a variable" (progn (require 'calc-store) (call-interactively 'calc-store)) :keys "s s" :active (>= (calc-stack-size) 1)] - ["Recall a variable value" + ["Recall a variable value" (progn (require 'calc-store) (call-interactively 'calc-recall )) :keys "s r"] - ["Edit the value of a variable" + ["Edit the value of a variable" (progn (require 'calc-store) (call-interactively 'calc-edit-variable)) :keys "s e"] - ["Exchange (1:) with a variable value" + ["Exchange (1:) with a variable value" (progn (require 'calc-store) (call-interactively 'calc-store-exchange)) :keys "s x" :active (>= (calc-stack-size) 1)] - ["Clear variable value" + ["Clear variable value" (progn (require 'calc-store) (call-interactively 'calc-unstore)) :keys "s u"] - ["Evaluate variables in (1:)" + ["Evaluate variables in (1:)" (progn (require 'calc-ext) (call-interactively 'calc-evaluate)) :keys "=" :active (>= (calc-stack-size) 1)] - ["Evaluate (1:), assigning a value to a variable" + ["Evaluate (1:), assigning a value to a variable" (progn (require 'calc-store) (call-interactively 'calc-let)) @@ -1119,19 +1119,19 @@ (defvar calc-stack-menu (list "Stack" - ["Remove (1:)" - calc-pop + ["Remove (1:)" + calc-pop :keys "DEL" :active (>= (calc-stack-size) 1)] - ["Switch (1:) and (2:)" - calc-roll-down + ["Switch (1:) and (2:)" + calc-roll-down :keys "TAB" :active (>= (calc-stack-size) 2)] - ["Duplicate (1:)" - calc-enter + ["Duplicate (1:)" + calc-enter :keys "RET" :active (>= (calc-stack-size) 1)] - ["Edit (1:)" + ["Edit (1:)" (progn (require 'calc-yank) (call-interactively calc-edit)) @@ -1144,12 +1144,12 @@ (defvar calc-errors-menu (list "Undo" - ["Undo" + ["Undo" (progn (require 'calc-undo) (call-interactively 'calc-undo)) :keys "U"] - ["Redo" + ["Redo" (progn (require 'calc-undo) (call-interactively 'calc-redo)) @@ -1162,7 +1162,7 @@ (defvar calc-modes-menu (list "Modes" - ["Precision" + ["Precision" (progn (require 'calc-ext) (call-interactively 'calc-precision)) @@ -1277,7 +1277,7 @@ ["Binary" (progn (require 'calc-bin) - (call-interactively + (call-interactively (lambda () (interactive) (calc-binary-radix t)))) :keys "C-u d 2" :style radio @@ -1330,7 +1330,7 @@ :keys "d e" :style radio :selected (eq (car-safe calc-float-format) 'eng)]) - (list "Complex Format" + (list "Complex Format" ["Default" (progn (require 'calc-cplx) @@ -1522,17 +1522,17 @@ (defvar calc-help-menu (list "Help" - ["Manual" + ["Manual" calc-info :keys "h i"] - ["Tutorial" - calc-tutorial + ["Tutorial" + calc-tutorial :keys "h t"] - ["Summary" - calc-info-summary + ["Summary" + calc-info-summary :keys "h s"] "----" - ["Help on Help" + ["Help on Help" (progn (calc-info-goto-node "Introduction") (Info-goto-node "Help Commands"))]) @@ -1557,7 +1557,7 @@ calc-errors-menu calc-modes-menu calc-help-menu - ["Reset" + ["Reset" (progn (require 'calc-ext) (call-interactively 'calc-reset)) @@ -1565,4 +1565,3 @@ ["Quit" calc-quit])) (provide 'calc-menu) - diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el index 2360cf00ddc..135ea0bae40 100644 --- a/lisp/calc/calc-yank.el +++ b/lisp/calc/calc-yank.el @@ -131,7 +131,7 @@ val)) val)))))))) -;;; The Calc set- and get-register commands are modified versions of functions +;;; The Calc set- and get-register commands are modified versions of functions ;;; in register.el (defvar calc-register-alist nil @@ -206,7 +206,7 @@ With prefix arg, delete as well." (defun calc-add-to-register (register start end prepend delete-flag) "Add the lines in the region to register REGISTER. -If PREPEND is non-nil, add them to the beginning of the register, +If PREPEND is non-nil, add them to the beginning of the register, otherwise the end. If DELETE-FLAG is non-nil, also delete the region." (let* ((top-num (calc-locate-cursor-element start)) (top-pos (save-excursion @@ -242,7 +242,7 @@ With prefix arg, also delete the region." (if (eq major-mode 'calc-mode) (calc-add-to-register register start end nil delete-flag) (append-to-register register start end delete-flag))) - + (defun calc-prepend-to-register (register start end &optional delete-flag) "Copy the lines in the region to the beginning of register REGISTER. With prefix arg, also delete the region." @@ -250,7 +250,7 @@ With prefix arg, also delete the region." (if (eq major-mode 'calc-mode) (calc-add-to-register register start end t delete-flag) (prepend-to-register register start end delete-flag))) - + (defun calc-clean-newlines (s) @@ -585,12 +585,12 @@ To cancel the edit, simply kill the *Calc Edit* buffer." (setq calc-allow-ret allow-ret) (let ((inhibit-read-only t)) (erase-buffer)) - (add-hook 'kill-buffer-hook (lambda () + (add-hook 'kill-buffer-hook (lambda () (let ((calc-edit-handler nil)) (calc-edit-finish t)) (message "(Cancelled)")) t t) (insert (propertize - (concat + (concat (or title title "Calc Edit Mode. ") "Press `C-c C-c'" (if allow-ret "" " or RET") diff --git a/lisp/calculator.el b/lisp/calculator.el index 4a79316d736..faf62424729 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el @@ -81,7 +81,7 @@ This determines the default behavior of unary operators." (defcustom calculator-prompt "Calc=%s> " "The prompt used by the Emacs calculator. -It should contain a \"%s\" somewhere that will indicate the i/o radixes; +It should contain a \"%s\" somewhere that will indicate the i/o radices; this will be a two-character string as described in the documentation for `calculator-mode'." :type 'string diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el index c44eb6e1b5d..9f527f75096 100644 --- a/lisp/calendar/appt.el +++ b/lisp/calendar/appt.el @@ -508,7 +508,7 @@ The time should be in either 24 hour format or am/pm format. Optional argument WARNTIME is an integer (or string) giving the number of minutes before the appointment at which to start warning. The default is `appt-message-warning-time'." - (interactive "sTime (hh:mm[am/pm]): \nsMessage: + (interactive "sTime (hh:mm[am/pm]): \nsMessage: sMinutes before the appointment to start warning: ") (unless (string-match appt-time-regexp time) (error "Unacceptable time-string")) @@ -521,7 +521,7 @@ sMinutes before the appointment to start warning: ") (or appt-timer (appt-activate)) (let ((time-msg (list (list (appt-convert-time time)) (concat time " " msg) t))) - ;; It is presently non-sensical to have multiple warnings about + ;; It is presently nonsensical to have multiple warnings about ;; the same appointment with just different delays, but it might ;; not always be so. TODO (if warntime (setq time-msg (append time-msg (list warntime)))) diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el index 53639b19a96..35841d2a6b2 100644 --- a/lisp/cedet/inversion.el +++ b/lisp/cedet/inversion.el @@ -199,12 +199,12 @@ not an indication of new features or bug fixes." (= v1-1 v2-1) (= v1-2 v2-2) (= v1-3 v2-3) - v1-4 v2-4 ; all or nothin if elt - is = + v1-4 v2-4 ; all or nothing if elt - is = (< v1-4 v2-4)) (and (= v1-0 v2-0) (= v1-1 v2-1) (= v1-2 v2-2) - v1-3 v2-3 ; all or nothin if elt - is = + v1-3 v2-3 ; all or nothing if elt - is = (< v1-3 v2-3)) (and (= v1-1 v2-1) (< v1-2 v2-2)) diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el index 3355ed83a91..337413caf75 100644 --- a/lisp/cedet/semantic.el +++ b/lisp/cedet/semantic.el @@ -680,7 +680,7 @@ Does nothing if the current buffer doesn't need reparsing." (save-excursion (semantic-fetch-tags)) nil) ;; If we are here, it is because the lexical step failed, - ;; proably due to unterminated lists or something like that. + ;; probably due to unterminated lists or something like that. ;; We do nothing, and just wait for the next idle timer ;; to go off. In the meantime, remember this, and make sure diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index a2c8c5efd40..3fbcf6d932f 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el @@ -859,7 +859,7 @@ pre-positioned to a convenient location." (setq cacheend chil) (while (and cacheend (not (eq last (car cacheend)))) (setq cacheend (cdr cacheend))) - ;; The splicable part is after cacheend.. so move cacheend + ;; The spliceable part is after cacheend.. so move cacheend ;; one more tag. (setq cacheend (cdr cacheend)) ;; Splice the found end tag into the cons cell diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el index 6761a7f532b..4b3a51e79f7 100644 --- a/lisp/cedet/semantic/idle.el +++ b/lisp/cedet/semantic/idle.el @@ -515,7 +515,7 @@ Does nothing if the current buffer doesn't need reparsing." (save-excursion (semantic-fetch-tags)) nil) ;; If we are here, it is because the lexical step failed, - ;; proably due to unterminated lists or something like that. + ;; probably due to unterminated lists or something like that. ;; We do nothing, and just wait for the next idle timer ;; to go off. In the meantime, remember this, and make sure diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index ba43ba657a1..dab5c444fae 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -1248,7 +1248,7 @@ they are comment end characters) AND when you want whitespace tokens." (if (eq (semantic-lex-token-class (car semantic-lex-token-stream)) 'whitespace) ;; Merge whitespace tokens together if they are adjacent. Two - ;; whitespace tokens may be sperated by a comment which is not in + ;; whitespace tokens may be separated by a comment which is not in ;; the token stream. (setcdr (semantic-lex-token-bounds (car semantic-lex-token-stream)) (match-end 0)) @@ -1271,7 +1271,7 @@ they are comment end characters)." (if (eq (semantic-lex-token-class (car semantic-lex-token-stream)) 'whitespace) ;; Merge whitespace tokens together if they are adjacent. Two - ;; whitespace tokens may be sperated by a comment which is not in + ;; whitespace tokens may be separated by a comment which is not in ;; the token stream. (progn (setq semantic-lex-end-point (match-end 0)) diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el index 4d001322108..2f585cbdf45 100644 --- a/lisp/cedet/semantic/tag-ls.el +++ b/lisp/cedet/semantic/tag-ls.el @@ -195,7 +195,7 @@ See `semantic-tag-static-p'." ;;;###autoload (define-overloadable-function semantic-tag-prototype-p (tag) "Return non nil if TAG is a prototype. -For some laguages, such as C, a prototype is a declaration of +For some languages, such as C, a prototype is a declaration of something without an implementation." ) diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el index f13fb17ca8f..f4d34a0f2ab 100644 --- a/lisp/cedet/srecode/fields.el +++ b/lisp/cedet/srecode/fields.el @@ -324,7 +324,7 @@ Try to use this to provide useful completion when available.") ) (defvar srecode-field-replication-max-size 100 - "Maximum size of a field before cancelling replication.") + "Maximum size of a field before canceling replication.") (defun srecode-field-mod-hook (ol after start end &optional pre-len) "Modification hook for the field overlay. diff --git a/lisp/delim-col.el b/lisp/delim-col.el index ed6ab96107a..96a0745dd31 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el @@ -206,7 +206,7 @@ This has effect only when there are lines with different number of columns." :group 'columns) (defcustom delimit-columns-start 0 - "Specify column number to start prettifing. + "Specify column number to start prettifying. See also `delimit-columns-end' for documentation. @@ -221,7 +221,7 @@ column (column 0) is located at left corner." :group 'columns) (defcustom delimit-columns-end 1000000 - "Specify column number to end prettifing. + "Specify column number to end prettifying. See also `delimit-columns-start' for documentation. diff --git a/lisp/delsel.el b/lisp/delsel.el index 6d2c47f3957..fcd45f1a148 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -144,7 +144,7 @@ any selection." (put 'newline 'delete-selection t) (put 'open-line 'delete-selection 'kill) -;; This is very useful for cancelling a selection in the minibuffer without +;; This is very useful for canceling a selection in the minibuffer without ;; aborting the minibuffer. (defun minibuffer-keyboard-quit () "Abort recursive edit. diff --git a/lisp/descr-text.el b/lisp/descr-text.el index 8b7fa89a19b..f285fe42332 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -358,7 +358,7 @@ This function is semi-obsolete. Use `get-char-code-property'." (compose-string (string ch) 0 1 (format "\t%c\t" ch)) (string ch))) -;; Return a nicely formated list of categories; extended category +;; Return a nicely formatted list of categories; extended category ;; description is added to the category name as a tooltip (defsubst describe-char-categories (category-set) (let ((mnemonics (category-set-mnemonics category-set))) diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 4daf313445c..0863cc1abac 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -1392,7 +1392,7 @@ Considers buffers closer to the car of `buffer-list' to be more recent." ;; Apparently people do use it. - lrd 12/22/97. (with-no-warnings - ;; Warnings are suppresed to avoid "global/dynamic var `X' lacks a prefix". + ;; Warnings are suppressed to avoid "global/dynamic var `X' lacks a prefix". ;; This is unbearably ugly, but not more than having global variables ;; named size, time, name or s, however practical it can be while writing ;; `dired-mark-sexp' predicates. diff --git a/lisp/electric.el b/lisp/electric.el index 1a8bf9f89ed..cec1b5d2000 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -85,7 +85,7 @@ (eq last-input-event ?\C-g)) (progn (setq unread-command-events nil prefix-arg nil) - ;; If it wasn't cancelling a prefix character, then quit. + ;; If it wasn't canceling a prefix character, then quit. (if (or (= (length (this-command-keys)) 1) (not inhibit-quit)) ; safety (progn (ding) diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 86c7e59fd07..d7cfcfb870a 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -3448,7 +3448,7 @@ instrumented. Then it does `edebug-on-entry' and switches to `go' mode." (defun edebug-on-entry (function &optional flag) "Cause Edebug to stop when FUNCTION is called. With prefix argument, make this temporary so it is automatically -cancelled the first time the function is entered." +canceled the first time the function is entered." (interactive "aEdebug on entry to: \nP") ;; Could store this in the edebug data instead. (put function 'edebug-on-entry (if flag 'temp t))) diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index db3236afc1a..170d3fb0bf8 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -57,7 +57,7 @@ (eval-and-compile ;; About the above. EIEIO must process its own code when it compiles -;; itself, thus, by eval-and-compiling outselves, we solve the problem. +;; itself, thus, by eval-and-compiling ourselves, we solve the problem. ;; Compatibility (if (fboundp 'compiled-function-arglist) diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 9a50352d507..a68c4dfdf69 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -1242,7 +1242,7 @@ If ARG is the atom `-', scroll upward by nearly full screen." ;; Handle shifted cursor keys and other movement commands. ;; If region is not active, region is activated if key is shifted. - ;; If region is active, region is cancelled if key is unshifted + ;; If region is active, region is canceled if key is unshifted ;; (and region not started with C-SPC). ;; If rectangle is active, expand rectangle in specified direction and ;; ignore the movement. diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el index 690555e81dc..b6a3a977909 100644 --- a/lisp/emulation/cua-gmrk.el +++ b/lisp/emulation/cua-gmrk.el @@ -94,7 +94,7 @@ insert the deleted or copied text before the global marker, even when the global marker is in another buffer. If the global marker isn't set, set the global marker at point in the current buffer. Otherwise jump to the global marker position and cancel it. -With prefix argument, don't jump to global mark when cancelling it." +With prefix argument, don't jump to global mark when canceling it." (interactive "P") (unless cua--global-mark-initialized (cua--init-global-mark)) diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el index a0c6062fb29..1298e5424ac 100644 --- a/lisp/emulation/vip.el +++ b/lisp/emulation/vip.el @@ -420,7 +420,7 @@ Type `n' to quit this window for now.\n") (goto-char (point-min)) (if (y-or-n-p "Inhibit VIP startup message? ") (progn - (with-current-buffer + (with-current-buffer (find-file-noselect (substitute-in-file-name vip-startup-file)) (goto-char (point-max)) @@ -877,7 +877,7 @@ is the name of the register for COM." (if (> beg end) (exchange-point-and-mark))) (defun vip-global-execute () - "Call last keyboad macro for each line in the region." + "Call last keyboard macro for each line in the region." (if (> (point) (mark)) (exchange-point-and-mark)) (beginning-of-line) (call-last-kbd-macro) diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index ce3cc3c9a22..78bc09af136 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -716,7 +716,7 @@ (error (viper-message-conditions conds)))) -;; escape to emacs mode termporarily +;; escape to emacs mode temporarily (defun viper-escape-to-emacs (arg &optional events) "Escape to Emacs state from Vi state for one Emacs command. ARG is used as the prefix value for the executed command. If @@ -726,7 +726,7 @@ EVENTS is a list of events, which become the beginning of the command." (message "Switched to EMACS state for the next command...")) (viper-escape-to-state arg events 'emacs-state)) -;; escape to Vi mode termporarily +;; escape to Vi mode temporarily (defun viper-escape-to-vi (arg) "Escape from Emacs state to Vi state for one Vi 1-character command. If the Vi command that the user types has a prefix argument, e.g., `d2w', then @@ -2407,7 +2407,7 @@ problems." t 'local) (add-hook 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) - ;; guard against a smartie who switched from R-replace to normal replace + ;; guard against a smarty who switched from R-replace to normal replace (remove-hook 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local) (if overwrite-mode (overwrite-mode -1)) @@ -2531,7 +2531,7 @@ problems." 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local) (add-hook 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) - ;; guard against a smartie who switched from R-replace to normal replace + ;; guard against a smarty who switched from R-replace to normal replace (remove-hook 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) ) @@ -3767,7 +3767,7 @@ If MAJOR-MODE is set, set the macros only in that major mode." "//" 'vi-state [1 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return] scope) - ;; toggle regexp/vanila search + ;; toggle regexp/vanilla search (viper-record-kbd-macro "///" 'vi-state [2 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return] @@ -3824,7 +3824,7 @@ the macros are set in the current major mode. "//" 'emacs-state [1 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return] (or arg-majormode major-mode)) - ;; toggle regexp/vanila search + ;; toggle regexp/vanilla search (viper-record-kbd-macro "///" 'emacs-state [2 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return] @@ -4017,7 +4017,7 @@ Null string will repeat previous search." (setq viper-prefix-commands (cons viper-buffer-search-char viper-prefix-commands))) -;; This is a Viper wraper for isearch-forward. +;; This is a Viper wrapper for isearch-forward. (defun viper-isearch-forward (arg) "Do incremental search forward." (interactive "P") @@ -4025,7 +4025,7 @@ Null string will repeat previous search." (if (listp arg) (setq arg (car arg))) (viper-exec-form-in-emacs (list 'isearch-forward arg))) -;; This is a Viper wraper for isearch-backward." +;; This is a Viper wrapper for isearch-backward." (defun viper-isearch-backward (arg) "Do incremental search backward." (interactive "P") diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 2d221d5fa05..2fc8dc599cb 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -818,7 +818,7 @@ Related buffers can be cycled through via :R and :P commands." ;;; Face-saving tricks (defgroup viper-highlighting nil - "Hilighting of replace region, search pattern, minibuffer, etc." + "Highlighting of replace region, search pattern, minibuffer, etc." :prefix "viper-" :group 'viper) diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el index e978823a49c..2704bdc5b40 100644 --- a/lisp/emulation/viper-macs.el +++ b/lisp/emulation/viper-macs.el @@ -921,7 +921,7 @@ name from there." (defun viper-global-execute () - "Call last keyboad macro for each line in the region." + "Call last keyboard macro for each line in the region." (if (> (point) (mark t)) (exchange-point-and-mark)) (beginning-of-line) (call-last-kbd-macro) diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index b2035e8ede6..3704725b8dd 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -491,7 +491,7 @@ unless it is coming up in a wrong Viper state." ) "List specifying how to modify the various major modes to enable some Viperisms. The list has the structure: ((mode viper-state keymap) (mode viper-state -keymap) ...). If `mode' is on the list, the `kemap' will be made active (on +keymap) ...). If `mode' is on the list, the `keymap' will be made active (on the minor-mode-map-alist) in the specified viper state. If you change this list, have to restart Emacs for the change to take effect. However, if you did the change through the customization widget, then Emacs diff --git a/lisp/files.el b/lisp/files.el index f903d2919a6..40b6e7d56b4 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -4866,7 +4866,7 @@ given. With a prefix argument, TRASH is nil." directory 'full directory-files-no-dot-files-regexp)) (error "Directory is not empty, not moving to trash") (move-file-to-trash directory))) - ;; Otherwise, call outselves recursively if needed. + ;; Otherwise, call ourselves recursively if needed. (t (if (and recursive (not (file-symlink-p directory))) (mapc (lambda (file) @@ -6110,7 +6110,7 @@ message to that effect instead of signaling an error." (defvar kill-emacs-query-functions nil "Functions to call with no arguments to query about killing Emacs. -If any of these functions returns nil, killing Emacs is cancelled. +If any of these functions returns nil, killing Emacs is canceled. `save-buffers-kill-emacs' calls these functions, but `kill-emacs', the low level primitive, does not. See also `kill-emacs-hook'.") diff --git a/lisp/follow.el b/lisp/follow.el index 2273e8920fd..ee8be14c6dc 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -1129,7 +1129,7 @@ Otherwise, return nil." ;;{{{ Redisplay ;; Redraw all the windows on the screen, starting with the top window. -;; The window used as as marker is WIN, or the selcted window if WIN +;; The window used as as marker is WIN, or the selected window if WIN ;; is nil. Start every window directly after the end of the previous ;; window, to make sure long lines are displayed correctly. @@ -1993,7 +1993,7 @@ report this using the `report-emacs-bug' function." ;; going to be recentered at the next redisplay, unless we do a ;; read-and-write cycle to update the `force' flag inside the windows. ;; -;; In 19.30, a new varible `window-scroll-functions' is called every +;; In 19.30, a new variable `window-scroll-functions' is called every ;; time a window is recentered. It is not perfect for our situation, ;; since when it is called for a tail window, it is to late. However, ;; if it is called for another window, we can try to update our diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 1f2b5c9d1cf..1f46887f00f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -365,7 +365,7 @@ (message-mail-other-window, message-mail-other-frame) (message-news-other-window, message-news-other-frame): Use switch-to-buffer-other-frame and switch-to-buffer-other-window - instead of setting buffer display varibles. + instead of setting buffer display variables. 2011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org> @@ -7128,7 +7128,7 @@ * gnus-start.el (gnus-activate-group): Take an optional parameter to say that you don't want to call gnus-request-group with don-check, but - do check the reponse. This is for virtual groups only. + do check the response. This is for virtual groups only. (gnus-get-unread-articles): Count the archive groups as secondary, so that they're activated the same way as before. diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el index 08ec3c4ffb0..44cb1583ec9 100644 --- a/lisp/gnus/gnus-fun.el +++ b/lisp/gnus/gnus-fun.el @@ -274,10 +274,10 @@ colors of the displayed X-Faces." result)) (defun gnus-fun-ppm-change-string () - (let* ((possibilites '("%02x0000" "00%02x00" "0000%02x" - "%02x%02x00" "00%02x%02x" "%02x00%02x")) + (let* ((possibilities '("%02x0000" "00%02x00" "0000%02x" + "%02x%02x00" "00%02x%02x" "%02x00%02x")) (format (concat "'#%02x%02x%02x' '#" - (nth (random 6) possibilites) + (nth (random 6) possibilities) "'")) (values nil)) (dotimes (i 255) diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index e06d475ed6c..58373525f96 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el @@ -1588,7 +1588,7 @@ this is a reply." ;; BUG: We really need to get the charset for ;; each name in the Newsgroups and Followup-To ;; lines to allow crossposting between group - ;; namess with incompatible character sets. + ;; names with incompatible character sets. ;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2001-10-08. (group-field-charset (gnus-group-name-charset diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index b3f85cf9366..71081063715 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -7087,7 +7087,7 @@ With ARG, turn line truncation on if ARG is positive." (defun gnus-summary-find-for-reselect () "Return the number of an article to stay on across a reselect. The current article is considered, then following articles, then previous -articles. An article is sought which is not cancelled and isn't a temporary +articles. An article is sought which is not canceled and isn't a temporary insertion from another group. If there's no such then return a dummy 0." (let (found) (dolist (rev '(nil t)) diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 5f385ec1054..b1f0f60668e 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -700,7 +700,7 @@ be set in `.emacs' instead." (defface gnus-summary-cancelled '((((class color)) (:foreground "yellow" :background "black"))) - "Face used for cancelled articles." + "Face used for canceled articles." :group 'gnus-summary) ;; backward-compatibility alias (put 'gnus-summary-cancelled-face 'face-alias 'gnus-summary-cancelled) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 649b2f5f96b..8ecbd22fc0d 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -906,7 +906,7 @@ The function `message-setup' runs this hook." :type 'hook) (defcustom message-cancel-hook nil - "Hook run when cancelling articles." + "Hook run when canceling articles." :group 'message-various :link '(custom-manual "(message)Various Message Variables") :type 'hook) @@ -4840,7 +4840,7 @@ Otherwise, generate and save a value for `canlock-password' first." (message-fetch-field "Followup-To"))) ;; BUG: We really need to get the charset for each name in the ;; Newsgroups and Followup-To lines to allow crossposting - ;; between group namess with incompatible character sets. + ;; between group names with incompatible character sets. ;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2001-10-08. (group-field-charset (gnus-group-name-charset method newsgroups-field)) diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index 043356ca841..25557ad7119 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -353,7 +353,7 @@ all. This may very well take some time.") ;; List of NNDiary headers that specify the time spec. Each header name is ;; followed by either two integers (specifying a range of possible values ;; for this header) or one list (specifying all the possible values for this - ;; header). In the latter case, the list does NOT include the unspecifyed + ;; header). In the latter case, the list does NOT include the unspecified ;; spec (*). ;; For time zone values, we have symbolic time zone names associated with ;; the (relative) number of seconds ahead GMT. @@ -1163,9 +1163,9 @@ all. This may very well take some time.") ;; Parse the schedule string STR, or signal an error. ;; Signals are caught by `nndary-schedule'. (if (string-match "[ \t]*\\*[ \t]*" str) - ;; unspecifyed + ;; unspecified nil - ;; specifyed + ;; specified (if (listp min-or-values) ;; min-or-values is values ;; #### NOTE: this is actually only a hack for time zones. diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 78d2478b4fb..3d0fc78dca7 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -1273,8 +1273,8 @@ Tested with swish-e-2.0.1 on Windows NT 4.0." (message "Doing hyrex-search query \"%s\"...done" qstring) (sit-for 0) ;; nnir-search returns: - ;; for nnml/nnfolder: "filename mailid weigth" - ;; for nnimap: "group mailid weigth" + ;; for nnml/nnfolder: "filename mailid weight" + ;; for nnimap: "group mailid weight" (goto-char (point-min)) (delete-non-matching-lines "^\\S + [0-9]+ [0-9]+$") ;; HyREX doesn't search directly in groups -- so filter out here. diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 9816c208fab..f4b8ce66d16 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -665,7 +665,7 @@ command whose response triggered the error." (process-buffer -process)))) ;; When I an able to identify the ;; connection to the server AND I've - ;; received NO reponse for + ;; received NO response for ;; nntp-connection-timeout seconds. (when (and -buffer (eq 0 (buffer-size -buffer))) ;; Close the connection. Take no diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 3f3b0b7a843..bc7dff278cc 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -426,7 +426,7 @@ directory, like `default-directory'." '(menu-item "Save current filter groups permanently..." ibuffer-save-filter-groups :enable (and (featurep 'ibuf-ext) ibuffer-filter-groups) - :help "Use a mnemnonic name to store current filter groups")) + :help "Use a mnemonic name to store current filter groups")) (define-key-after groups-map [switch-to-saved-filter-groups] '(menu-item "Restore permanently saved filters..." ibuffer-switch-to-saved-filter-groups @@ -676,7 +676,7 @@ directory, like `default-directory'." (define-key-after map [menu-bar view filter save-filters] '(menu-item "Save current filters permanently..." ibuffer-save-filters :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers) - :help "Use a mnemnonic name to store current filter stack")) + :help "Use a mnemonic name to store current filter stack")) (define-key-after map [menu-bar view filter switch-to-saved-filters] '(menu-item "Restore permanently saved filters..." ibuffer-switch-to-saved-filters diff --git a/lisp/international/mule.el b/lisp/international/mule.el index d078d98a480..1beffa5218b 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1785,7 +1785,7 @@ contents of the current buffer following point against succeed, it checks to see if any function in `auto-coding-functions' gives a match. -If a coding system is specifed, the return value is a cons +If a coding system is specified, the return value is a cons \(CODING . SOURCE), where CODING is the specified coding system and SOURCE is a symbol `auto-coding-alist', `auto-coding-regexp-alist', `:coding', or `auto-coding-functions' indicating by what CODING is diff --git a/lisp/international/quail.el b/lisp/international/quail.el index a29b729dcf0..3a70b1ec2a5 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -2703,7 +2703,7 @@ KEY BINDINGS FOR CONVERSION ;; Generate a half-cooked decode map (char-table) for the current ;; Quail map. An element for a character C is a key string or a list -;; of a key strings to type to input C. The lenth of key string is at +;; of a key strings to type to input C. The length of key string is at ;; most 2. If it is 2, more keys may be required to input C. (defun quail-gen-decode-map () diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index 6614ac8b416..82349761bdb 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -122,7 +122,7 @@ compose one Chinese character. In this input method, you enter a Chinese character by first typing keys corresponding to Zhuyin symbols (see the above table) followed by -SPC, 1, 2, 3, or 4 specifing a tone (SPC:$(0?v(N(B, 1:$(0M=Vy(B, 2:$(0Dm(N(B, 3: $(0&9Vy(B, +SPC, 1, 2, 3, or 4 specifying a tone (SPC:$(0?v(N(B, 1:$(0M=Vy(B, 2:$(0Dm(N(B, 3: $(0&9Vy(B, 4:$(0(+Vy(B). \\<quail-translation-docstring>") @@ -203,7 +203,7 @@ compose a Chinese character. In this input method, you enter a Chinese character by first typing keys corresponding to Zhuyin symbols (see the above table) followed by -SPC, 6, 3, 4, or 7 specifing a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy(B, 4:$(0(+Vy(B, +SPC, 6, 3, 4, or 7 specifying a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy(B, 4:$(0(+Vy(B, 7:$(0M=Vy(B). \\<quail-translation-docstring>"))) diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el index df05b355b46..8d13eb2039d 100644 --- a/lisp/international/ucs-normalize.el +++ b/lisp/international/ucs-normalize.el @@ -227,7 +227,7 @@ Note that Hangul are excluded.") (eval-when-compile decomposition-pair-to-composition))) (defun ucs-normalize-primary-composite (decomposition-pair composition-predicate) - "Convert DECOMPOSITION-PAIR to primay composite using COMPOSITION-PREDICATE." + "Convert DECOMPOSITION-PAIR to primary composite using COMPOSITION-PREDICATE." (let ((char (or (gethash decomposition-pair ucs-normalize-decomposition-pair-to-primary-composite) (and (<= #x1100 (car decomposition-pair)) diff --git a/lisp/kmacro.el b/lisp/kmacro.el index eea3009faf4..6915640944a 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -747,7 +747,7 @@ If kbd macro currently being defined end it before activating it." ;; Create a separate keymap installed as a minor-mode keymap (e.g. in ;; the emulation-mode-map-alists) in which macro bindings are made ;; independent of any other bindings. When first binding is made, -;; the kemap is created, installed, and enabled. Key seq. C-x C-k + +;; the keymap is created, installed, and enabled. Key seq. C-x C-k + ;; can then be used to toggle the use of this keymap on and off. ;; This means that it would be safe(r) to bind ordinary keys like ;; letters and digits, provided that we inhibit the keymap while diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el index c44dc44581d..0e87d4d8e8c 100644 --- a/lisp/language/chinese.el +++ b/lisp/language/chinese.el @@ -125,7 +125,7 @@ (define-coding-system 'chinese-big5 "BIG5 8-bit encoding for Chinese (MIME:Big5)" :coding-type 'big5 - :mnemonic ?B + :mnemonic ?B :charset-list '(ascii big5) :mime-charset 'big5) @@ -152,7 +152,7 @@ (define-coding-system 'chinese-big5-hkscs "BIG5-HKSCS 8-bit encoding for Chinese, Hong Kong supplement (MIME:Big5-HKSCS)" :coding-type 'charset - :mnemonic ?B + :mnemonic ?B :charset-list '(ascii big5-hkscs) :mime-charset 'big5-hkscs) (define-coding-system-alias 'big5-hkscs 'chinese-big5-hkscs) @@ -191,7 +191,7 @@ chinese-cns11643-5 chinese-cns11643-6 chinese-cns11643-7) (iso639-language . zh) - (setup-function . (lambda () + (setup-function . (lambda () (use-cjk-char-width-table 'zh_TW))) (exit-function . use-default-char-width-table) (coding-system iso-2022-cn euc-tw) @@ -211,7 +211,7 @@ accepts Big5 for input also (which is then converted to CNS).")) chinese-cns11643-5 chinese-cns11643-6 chinese-cns11643-7 chinese-big5-1 chinese-big5-2) (iso639-language . zh) - (setup-function . (lambda () + (setup-function . (lambda () (use-cjk-char-width-table 'zh_TW))) (exit-function . use-default-char-width-table) (coding-system euc-tw iso-2022-cn) @@ -220,7 +220,7 @@ accepts Big5 for input also (which is then converted to CNS).")) (features china-util) (input-method . "chinese-cns-quick") (documentation . "\ -Support for Chinese, prefering the EUC-TW character set. Note that +Support for Chinese, preferring the EUC-TW character set. Note that the EUC-TW coding system accepts Big5 for input also (which is then converted to CNS).")) '("Chinese")) @@ -241,13 +241,13 @@ converted to CNS).")) (set-language-info-alist "Chinese-GBK" '((charset chinese-gbk) (iso639-language . zh) - (setup-function . (lambda () + (setup-function . (lambda () (use-cjk-char-width-table 'zh_CN))) (exit-function . use-default-char-width-table) (coding-system chinese-gbk) (coding-priority gbk iso-2022-cn chinese-big5 chinese-iso-8bit) ; fixme? - (ctext-non-standard-encodings "gbk-0") + (ctext-non-standard-encodings "gbk-0") (input-method . "chinese-py-punct") ; fixme? (sample-text . "Chinese ($BCfJ8(B,$BIaDL$A;0(B,$A::So(B) $(D95$B9%(B") (features china-util) diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el index ea601c041e4..b71c65438be 100644 --- a/lisp/language/viet-util.el +++ b/lisp/language/viet-util.el @@ -34,7 +34,7 @@ ;; for representing these characters: VISCII, TCVN-5712, VPS, VIQR, ;; and Unicode. VISCII, TCVN-5712 and VPS are simple 1-byte code ;; which assigns 134 unique characters in control-code area -;; (0x00..0x1F) and right half area (0x80..0xFF). VIQR is a menmonic +;; (0x00..0x1F) and right half area (0x80..0xFF). VIQR is a mnemonic ;; encoding specification representing diacritical marks by following ;; ASCII characters. @@ -47,7 +47,7 @@ "Return VISCII character code of CHAR if appropriate." (encode-char char 'viscii)) -;; VIQR is a menmonic encoding specification for Vietnamese. +;; VIQR is a mnemonic encoding specification for Vietnamese. ;; It represents diacritical marks by ASCII characters as follows: ;; ------------+----------+-------- ;; mark | mnemonic | example diff --git a/lisp/man.el b/lisp/man.el index c9ba64bf5e0..aeba3327c40 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -687,7 +687,7 @@ POS defaults to `point'." ;; Otherwise record the current column and look backwards. (setq column (current-column)) (skip-chars-backward ",; \t") - ;; Record the distance travelled. + ;; Record the distance traveled. (setq distance (- column (current-column))) (when (looking-back (concat "([ \t]*\\(?:" Man-section-regexp "\\)[ \t]*)")) diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 7ae6912cf8f..a0d2281bfe8 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1664,7 +1664,7 @@ good, skip, fatal, or unknown." (if (not (and seen-prompt ange-ftp-pending-error-line)) (ange-ftp-process-handle-line line proc) ;; If we've seen a potential error message and it - ;; hasn't been cancelled by a good message before + ;; hasn't been canceled by a good message before ;; seeing a prompt, then the error was real. (delete-process proc) (setq ange-ftp-process-busy nil diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el index cc538c224dc..a889a6a4177 100644 --- a/lisp/net/zeroconf.el +++ b/lisp/net/zeroconf.el @@ -82,7 +82,7 @@ ;; The function `zeroconf-publish-service' publishes a new service to ;; the Avahi daemon. Although the domain, where to the service is -;; published, can be specified by this function, it is usally the +;; published, can be specified by this function, it is usually the ;; default domain "local" (also written as nil or ""). ;; (zeroconf-publish-service diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el index 9a29e3d4cca..1f69f5d7bf3 100644 --- a/lisp/nxml/rng-valid.el +++ b/lisp/nxml/rng-valid.el @@ -377,8 +377,8 @@ The schema is set like `rng-auto-set-schema'." (defun rng-kill-timers () ;; rng-validate-timer and rng-validate-quick-timer have the ;; permanent-local property, so that the timers can be - ;; cancelled even after changing mode. - ;; This function takes care of cancelling the timers and + ;; canceled even after changing mode. + ;; This function takes care of canceling the timers and ;; then killing the local variables. (when (local-variable-p 'rng-validate-timer) (when rng-validate-timer diff --git a/lisp/obsolete/pgg.el b/lisp/obsolete/pgg.el index 42030f7d502..876f3744bc2 100644 --- a/lisp/obsolete/pgg.el +++ b/lisp/obsolete/pgg.el @@ -174,7 +174,7 @@ is true, or else the output buffer is displayed." (defvar pgg-pending-timers (make-vector 7 0) "Hash table for managing scheduled pgg cache management timers. -We associate key and timer, so the timer can be cancelled if a new +We associate key and timer, so the timer can be canceled if a new timeout for the key is set while an old one is still pending.") (defun pgg-read-passphrase (prompt &optional key notruncate) diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 1c8a3e72956..cb518f97a19 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -278,7 +278,7 @@ * org-archive.el (org-archive-subtree): While it might be possible to archive an headline of a temporary buffer (i.e. not visiting a - file), it wouldn't be really sensical. + file), it wouldn't be really sensible. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> @@ -4008,7 +4008,7 @@ * org-list.el (org-list-blocks): New variable. (org-list-context): New function. (org-list-full-item-re): New variable. - (org-list-struct-assoc-at-point): Use new varible. + (org-list-struct-assoc-at-point): Use new variable. (org-list-struct): Rewrite of function. Now, list data is collected by looking at the list line after line. It reads the whole list each time because reading only a subtree was not enough @@ -8139,7 +8139,7 @@ 2010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> * org-list.el (org-insert-item-internal): New function to handle - positionning and contents of an item being inserted at a specific + positioning and contents of an item being inserted at a specific pos. It is not possible anymore to split a term in a description list or a checkbox when inserting a new item. @@ -9758,7 +9758,7 @@ 2010-07-19 Bastien Guerry <bzg@altern.org> - * org-timer.el (org-timer-set-timer): Fix bug about cancelling + * org-timer.el (org-timer-set-timer): Fix bug about canceling timers. 2010-07-19 David Maus <dmaus@ictsoc.de> @@ -12582,7 +12582,7 @@ buffer and at the position of the given clock. However, changes to the current clock are local and have no effect on the user's active clock. This allows, for example, far any clock to be - cancelled without cancelling the active clock. + canceled without canceling the active clock. (org-clock-clock-in): New inline function that switches the active clock to the given clock. If either the argument RESUME, or the global `org-clock-in-resume', are non-nil, it will resume a clock diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 2f4617f5146..a54f3c4c3d3 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -8331,7 +8331,7 @@ tag and (if present) the flagging note." (org-agenda-remove-flag hdmarker) (let ((win (get-buffer-window "*Flagging Note*"))) (and win (delete-window win))) - (message "Entry unflaged")) + (message "Entry unflagged")) (setq note (org-entry-get hdmarker "THEFLAGGINGNOTE")) (unless note (error "No flagging note")) @@ -8354,7 +8354,7 @@ tag and (if present) the flagging note." (org-entry-delete nil "THEFLAGGINGNOTE") (setq newhead (org-get-heading))) (org-agenda-change-all-lines newhead marker) - (message "Entry unflaged"))) + (message "Entry unflagged"))) (defun org-agenda-get-any-marker (&optional pos) (or (get-text-property (or pos (point-at-bol)) 'org-hd-marker) diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index 6d82d4529b6..09b646d40ba 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -328,7 +328,7 @@ to add an effort property.") "Hook run when stopping the current clock.") (defvar org-clock-cancel-hook nil - "Hook run when cancelling the current clock.") + "Hook run when canceling the current clock.") (defvar org-clock-goto-hook nil "Hook run when selecting the currently clocked-in entry.") (defvar org-clock-has-been-used nil @@ -346,7 +346,7 @@ to add an effort property.") (defvar org-clock-start-time "") (defvar org-clock-leftover-time nil - "If non-nil, user cancelled a clock; this is when leftover time started.") + "If non-nil, user canceled a clock; this is when leftover time started.") (defvar org-clock-effort "" "Effort estimate of the currently clocking task.") diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index a86c145a9ee..72fc71854e2 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el @@ -68,7 +68,7 @@ ;; Computing a list structure can be a costly operation on huge lists ;; (a few thousand lines long). Thus, code should follow the rule : -;; "collect once, use many". As a corollary, it is usally a bad idea +;; "collect once, use many". As a corollary, it is usually a bad idea ;; to use directly an interactive function inside the code, as those, ;; being independent entities, read the whole list structure another ;; time. diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el index 655123cafa9..ca7bfe2a4d0 100644 --- a/lisp/org/org-protocol.el +++ b/lisp/org/org-protocol.el @@ -145,8 +145,8 @@ (defgroup org-protocol nil "Intercept calls from emacsclient to trigger custom actions. -This is done by advising `server-visit-files' to scann the list of filenames -for `org-protocol-the-protocol' and sub-procols defined in +This is done by advising `server-visit-files' to scan the list of filenames +for `org-protocol-the-protocol' and sub-protocols defined in `org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'." :version "22.1" :group 'convenience diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el index 0c924cd9f07..61edef50738 100644 --- a/lisp/org/org-publish.el +++ b/lisp/org/org-publish.el @@ -278,12 +278,12 @@ in the sitemap." :type 'string) (defcustom org-publish-sitemap-file-entry-format "%t" - "How a sitemap file entry is formated. + "How a sitemap file entry is formatted. You could use brackets to delimit on what part the link will be. %t is the title. %a is the author. -%d is the date formated using `org-publish-sitemap-date-format'." +%d is the date formatted using `org-publish-sitemap-date-format'." :group 'org-publish :type 'string) diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el index 1fb3114bf3f..45b16aecf12 100644 --- a/lisp/org/org-taskjuggler.el +++ b/lisp/org/org-taskjuggler.el @@ -571,7 +571,7 @@ with separator \"\n\"." (and filtered-items (mapconcat 'identity filtered-items "\n")))) (defun org-taskjuggler-get-attributes (item attributes) - "Return all attribute as a single formated string. ITEM is an + "Return all attributes as a single formatted string. ITEM is an alist representing either a resource or a task. ATTRIBUTES is a list of symbols. Only entries from ITEM are considered that are listed in ATTRIBUTES." diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el index 4d514d2d0aa..e7ed146b4a1 100644 --- a/lisp/play/gametree.el +++ b/lisp/play/gametree.el @@ -549,7 +549,7 @@ Argument is a character, naming the register." (defun gametree-save-and-hack-layout () "Save the current tree layout and hack the file local variable spec. This function saves the current layout in `gametree-local-layout' and, -if a local file varible specification for this variable exists in the +if a local file variable specification for this variable exists in the buffer, it is replaced by the new value. See the documentation for `gametree-local-layout' for more information." (interactive) diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 8e4ac92d96f..4981bbfd2bc 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -2051,7 +2051,7 @@ function does not require the declaration to contain a brace block." (c-narrow-to-comment-innards range) ; This may move point back. (let* ((here (point)) last - (here-filler ; matches WS and comment-prefices at point. + (here-filler ; matches WS and comment-prefixes at point. (concat "\\=\\(^[ \t]*\\(" c-current-comment-prefix "\\)" "\\|[ \t\n\r\f]\\)*")) (prefix-at-bol-here ; matches WS and prefix at BOL, just before point @@ -2071,7 +2071,7 @@ function does not require the declaration to contain a brace block." ;; Now seek successively earlier sentence ends between PAR-BEG and ;; HERE, until the "start of sentence" following it is earlier than - ;; HERE, or we hit PAR-BEG. Beware of comment prefices! + ;; HERE, or we hit PAR-BEG. Beware of comment prefixes! (while (and (re-search-backward (c-sentence-end) par-beg 'limit) (setq last (point)) (goto-char (match-end 0)) ; tentative beginning of sentence diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el index d855861d552..eeb145e2b1a 100644 --- a/lisp/progmodes/dcl-mode.el +++ b/lisp/progmodes/dcl-mode.el @@ -708,7 +708,7 @@ Returns point of the found command line or nil if not able to move." (setq done t) ; not a label-only line, exit the loop (setq retval (point)))) ;; We couldn't go further back, and we haven't found a command yet. - ;; Return to the start positionn + ;; Return to the start position. (goto-char start) (setq done t) (setq retval nil))) @@ -756,7 +756,7 @@ Returns point of the found command line or nil if not able to move." (setq done t) ; not a label-only line, exit the loop (setq retval (point))))) ;; We couldn't go further back, and we haven't found a command yet. - ;; Return to the start positionn + ;; Return to the start position. (goto-char start) (setq done t) (setq retval nil))) diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index d8715599d74..24deb569d74 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -7866,7 +7866,7 @@ itself." "Display online help about the completion at point." (interactive "eP") ;; Restore last-command for next command, to make - ;; scrolling/cancelling of completions work. + ;; scrolling/canceling of completions work. (setq this-command last-command) (idlwave-do-mouse-completion-help ev)) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 94a9c250fee..f0c86265232 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3000,7 +3000,7 @@ browser, respectively." '(js> ((fifth hitab) "selectedTab") (fourth hitab)) cmds))) - ;; Hilighting whole window + ;; Highlighting whole window ((third hitab) (push '(js! ((third hitab) "document" "documentElement" "setAttribute") diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 3a94601768d..0cf01b1228f 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -1714,7 +1714,7 @@ an absolute path (i.e. all caches can be stored in one global directory)." (defgroup vhdl-menu nil - "Customizations for menues." + "Customizations for menus." :group 'vhdl) (defcustom vhdl-index-menu nil @@ -1844,7 +1844,7 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry ;; Internal variables (defvar vhdl-menu-max-size 20 - "*Specifies the maximum size of a menu before splitting it into submenues.") + "*Specifies the maximum size of a menu before splitting it into submenus.") (defvar vhdl-progress-interval 1 "*Interval used to update progress status during long operations. @@ -2468,7 +2468,7 @@ conversion." (goto-char marker)) (defun vhdl-menu-split (list title) - "Split menu LIST into several submenues, if number of + "Split menu LIST into several submenus, if number of elements > `vhdl-menu-max-size'." (if (> (length list) vhdl-menu-max-size) (let ((remain list) diff --git a/lisp/ses.el b/lisp/ses.el index 6c9d0a7a50d..cceccde3346 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -2273,7 +2273,7 @@ cells." (defun ses-read-printer (prompt default) "Common code for `ses-read-cell-printer', `ses-read-column-printer', and `ses-read-default-printer'. -PROMPT should end with \": \". Result is t if operation was cancelled." +PROMPT should end with \": \". Result is t if operation was canceled." (barf-if-buffer-read-only) (if (eq default t) (setq default "") diff --git a/lisp/simple.el b/lisp/simple.el index 1dc866cf64d..b718546248b 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1582,7 +1582,7 @@ by the new completion." n) ;; next-matching-history-element always puts us at (point-min). ;; Move to the position we were at before changing the buffer contents. - ;; This is still sensical, because the text before point has not changed. + ;; This is still sensible, because the text before point has not changed. (goto-char point-at-start))) (defun previous-complete-history-element (n) @@ -5704,7 +5704,7 @@ At top-level, as an editor command, this simply beeps." (defvar buffer-quit-function nil "Function to call to \"quit\" the current buffer, or nil if none. \\[keyboard-escape-quit] calls this function when its more local actions -\(such as cancelling a prefix argument, minibuffer or region) do not apply.") +\(such as canceling a prefix argument, minibuffer or region) do not apply.") (defun keyboard-escape-quit () "Exit the current \"mode\" (in a generalized sense of the word). @@ -6209,7 +6209,7 @@ BASE-POSITION, says where to insert the completion." choice buffer base-position nil) ;; This remove-text-properties should be unnecessary since `choice' ;; comes from buffer-substring-no-properties. - ;;(remove-text-properties 0 (lenth choice) '(mouse-face nil) choice) + ;;(remove-text-properties 0 (length choice) '(mouse-face nil) choice) ;; Insert the completion into the buffer where it was requested. (funcall (or insert-function completion-list-insert-choice-function) (or (car base-position) (point)) diff --git a/lisp/speedbar.el b/lisp/speedbar.el index b8a734784be..3e79095e52f 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -1862,7 +1862,7 @@ of the special mode functions." (if (not v) (setq speedbar-special-mode-expansion-list t) ;; If it is autoloaded, we need to load it now so that - ;; we have access to the varialbe -speedbar-menu-items. + ;; we have access to the variable -speedbar-menu-items. ;; Is this XEmacs safe? (let ((sf (symbol-function v))) (if (and (listp sf) (eq (car sf) 'autoload)) diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 05e18ed24a0..ac0f833da63 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -126,7 +126,7 @@ a file in the home directory." (defun emacs-session-save () "This function is called when the window system is shutting down. -If this function returns non-nil, the window system shutdown is cancelled. +If this function returns non-nil, the window system shutdown is canceled. When a session manager tells Emacs that the window system is shutting down, this function is called. It calls the functions in the hook diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 0efabc2135a..bd1fcc43d22 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -3960,11 +3960,11 @@ The 2-point shape SHAPE is drawn from X1, Y1 to X2, Y2." ;; Implementation note: This really should honor the interval-fn entry ;; in the master table, `artist-mt', which would mean leaving a timer ;; that calls `draw-fn' every now and then. That timer would then have -;; to be cancelled and reinstalled whenever the user moves the cursor. +;; to be canceled and reinstalled whenever the user moves the cursor. ;; This could be done, but what if the user suddenly switches to another ;; drawing mode, or even kills the buffer! In the mouse case, it is much ;; simpler: when at the end of `artist-mouse-draw-continously', the -;; user has released the button, so the timer will always be cancelled +;; user has released the button, so the timer will always be canceled ;; at that point. (defun artist-key-draw-continously (x y) "Draw current continuous shape at X,Y." @@ -5589,7 +5589,7 @@ The event, EV, is the mouse event." ;; of drawing mode. ;; ;; You should provide these functions. You might think that -;; only you is using your type of mode, so noone will be able +;; only you is using your type of mode, so no one will be able ;; to switch to another operation of the same type of mode, ;; but someone else might base a new drawing mode upon your ;; work. diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index d0967d63740..ba7b84fe1dd 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -2499,7 +2499,7 @@ scrolling the current window. Leave the new window selected." ;; hidden by new window, scroll it to just below new win ;; otherwise set top line of other win so it doesn't scroll. (if (< oldot top) (setq top oldot)) - ;; if frame is unsplitable, temporarily disable that... + ;; if frame is unsplittable, temporarily disable that... (if (cdr (assq 'unsplittable (frame-parameters (selected-frame)))) (let ((frame (selected-frame))) (modify-frame-parameters frame '((unsplittable . nil))) @@ -3979,7 +3979,7 @@ Both should not be used to define a buffer-local dictionary." ; LocalWords: AMStex hspace includeonly nocite epsfig displaymath eqnarray reg ; LocalWords: minipage modeline pers dict unhighlight buf grep sync prev inc ; LocalWords: fn oldot NB AIX msg init read's bufs pt cmd Quinlan eg -; LocalWords: uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable +; LocalWords: uuencoded unidiff sc nn VM SGML eval IspellPersDict ; LocalWords: lns XEmacs HTML casechars Multibyte ;;; ispell.el ends here diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index ff6ffffc382..2aecc34e2b0 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -212,7 +212,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (add-hook 'pre-command-hook 'reftex-highlight-shall-die) (when (eq how 'tmp-window) - ;; Resize window and arrange restauration + ;; Resize window and arrange restoration (shrink-window (1- (- (window-height) 9))) (recenter '(4)) (add-hook 'pre-command-hook 'reftex-restore-window-conf)) diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 65f6d98ef79..1a3c5c22815 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -4293,7 +4293,7 @@ cache buffer into the designated cell in the table buffer." (car (table--get-coordinate (cdr (table--horizontal-cell-list nil t)))) (1+ (cdr (table--get-coordinate (cdr (table--vertical-cell-list nil t)))))))) -(defun table-call-interactively (function &optional recoard-flag keys) +(defun table-call-interactively (function &optional record-flag keys) "Call FUNCTION, or a table version of it if applicable. See `call-interactively' for full description of the arguments." (let ((table-func (intern-soft (format "*table--cell-%s" function)))) @@ -4301,7 +4301,7 @@ See `call-interactively' for full description of the arguments." (if (and table-func (table--point-in-cell-p)) table-func - function) recoard-flag keys))) + function) record-flag keys))) (defun table-funcall (function &rest arguments) "Call FUNCTION, or a table version of it if applicable. diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index a337d6f9f40..b186b02851d 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -2088,11 +2088,11 @@ This command is executed when texinfmt sees @item inside @multitable." (table-entry-height 0) ;; unformatted row looks like: A1 @tab A2 @tab A3 ;; extract-row command deletes the source line in the table. - (unformated-row (texinfo-multitable-extract-row))) + (unformatted-row (texinfo-multitable-extract-row))) ;; Use a temporary buffer (set-buffer (get-buffer-create texinfo-multitable-buffer-name)) (delete-region (point-min) (point-max)) - (insert unformated-row) + (insert unformatted-row) (goto-char (point-min)) ;; 1. Check for correct number of @tab in line. (let ((tab-number 1)) ; one @tab between two columns diff --git a/lisp/time.el b/lisp/time.el index ac4a011bdf8..4955b177545 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -369,7 +369,7 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'." nil))) (with-no-warnings - ;; Warnings are suppresed to avoid "global/dynamic var `X' lacks a prefix". + ;; Warnings are suppressed to avoid "global/dynamic var `X' lacks a prefix". (defvar now) (defvar time) (defvar load) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 48d2caf35f4..b4cd24cc6b9 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1673,7 +1673,7 @@ (url-dav-process-DAV:activelock) (url-dav-process-DAV:lockdiscovery): Can now correctly parse DAV:lockdiscovery nodes, so that we can find out who has a - resource locked and properly parse the reponse to a LOCK request. + resource locked and properly parse the response to a LOCK request. (url-dav-process-DAV:status): Now parses out the numeric status from the HTTP response line. (url-dav-process-response): New function to handle all the diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el index 7d80f2f6725..a3a384b7a90 100644 --- a/lisp/url/url-gw.el +++ b/lisp/url/url-gw.el @@ -72,12 +72,12 @@ This list will be executed as a command after logging in via telnet." :group 'url-gateway) (defcustom url-gateway-telnet-login-prompt "^\r*.?login:" - "Prompt that tells us we should send our username when loggin in w/telnet." + "Prompt that tells us we should send our username when logging in w/telnet." :type 'regexp :group 'url-gateway) (defcustom url-gateway-telnet-password-prompt "^\r*.?password:" - "Prompt that tells us we should send our password when loggin in w/telnet." + "Prompt that tells us we should send our password when logging in w/telnet." :type 'regexp :group 'url-gateway) diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 787a8b7c0f1..d3db66a9e2a 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -370,7 +370,7 @@ It needs to be killed when we quit the session.") this-command))) (defgroup ediff-highlighting nil - "Hilighting of difference regions in Ediff." + "Highlighting of difference regions in Ediff." :prefix "ediff-" :group 'ediff) diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 256719d4c84..9a8be04fc38 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el @@ -322,7 +322,7 @@ The argument is added (or not) to the list of FLAGS and is constructed by appending the branch to ARG which defaults to \"-r\". Since the `cvs-secondary-branch-prefix' is only active if the primary prefix is active, it is important to read the secondary prefix before -the primay since reading the primary can deactivate it." +the primary since reading the primary can deactivate it." (let ((branch (and (cvs-prefix-get 'cvs-branch-prefix 'read-only) (cvs-prefix-get 'cvs-secondary-branch-prefix)))) (if branch (cons (concat (or arg "-r") branch) flags) flags))) diff --git a/lisp/vcursor.el b/lisp/vcursor.el index d4fc35920a9..b8673f2049f 100644 --- a/lisp/vcursor.el +++ b/lisp/vcursor.el @@ -223,7 +223,7 @@ ;; automatically for a PC if Oemacs is detected. This set uses separate ;; control, shift and meta keys with function keys 1 to 10. In ;; particular, movement keys are concentrated on f5 to f8 with (in -;; increasing order of distance travelled) C-, M- and S- as prefixes. +;; increasing order of distance traveled) C-, M- and S- as prefixes. ;; See the actual bindings below (search for C-f1). This is because the ;; C-S- prefix is represented by weird key sequences and the set is ;; incomplete; if you don't mind that, some hints are given in comments diff --git a/lisp/view.el b/lisp/view.el index a5349445964..7703719ba40 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -481,7 +481,7 @@ Entry to view-mode runs the normal hook `view-mode-hook'." ;; sets view-read-only to t as a buffer-local variable ;; after exiting View mode. That arranges that the next toggle-read-only ;; will reenable View mode. - ;; Cancelling View mode in any other way should cancel that, too, + ;; Canceling View mode in any other way should cancel that, too, ;; so that View mode stays off if toggle-read-only is called. (if (local-variable-p 'view-read-only) (kill-local-variable 'view-read-only)) diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index 8c4df9fc9cf..07eccaff4fb 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -295,10 +295,10 @@ minibuffer." (error "Canceled")) value)))) -(defun widget-remove-if (predictate list) +(defun widget-remove-if (predicate list) (let (result (tail list)) (while tail - (or (funcall predictate (car tail)) + (or (funcall predicate (car tail)) (setq result (cons (car tail) result))) (setq tail (cdr tail))) (nreverse result))) @@ -577,7 +577,7 @@ This is only meaningful for radio buttons or checkboxes in a list." "Map FUNCTION over the buttons in BUFFER. FUNCTION is called with the arguments WIDGET and MAPARG. -If FUNCTION returns non-nil, the walk is cancelled. +If FUNCTION returns non-nil, the walk is canceled. The arguments MAPARG, and BUFFER default to nil and (current-buffer), respectively." diff --git a/lisp/window.el b/lisp/window.el index 69276a839bd..112caeeaf0f 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -1211,7 +1211,7 @@ More precisely, cycle through all windows calling the function PREDICATE on each one of them with the window as its sole argument. Return the first window for which PREDICATE returns non-nil. Windows are scanned starting with the window following -the selcted window. If no window satisfies PREDICATE, return +the selected window. If no window satisfies PREDICATE, return DEFAULT. MINIBUF t means include the minibuffer window even if the @@ -5234,7 +5234,7 @@ WINDOW was scrolled." ;; This `condition-case' shouldn't be necessary, but who knows? (condition-case nil (if (zerop delta) - ;; Return zero if DELTA became zero in the proces. + ;; Return zero if DELTA became zero in the process. 0 ;; Don't try to redisplay with the cursor at the end on its ;; own line--that would force a scroll and spoil things. |