aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-12-04 00:02:42 -0800
committerPaul Eggert2011-12-04 00:02:42 -0800
commitc80e3b4aed2e70eb6d8445d786c0df770094e9e1 (patch)
treee44fe2f2604d66890ec2442ea23e73ee5011907a
parenta24bf23e0f6e5cea917b77cc455314cdcc31be5b (diff)
downloademacs-c80e3b4aed2e70eb6d8445d786c0df770094e9e1.tar.gz
emacs-c80e3b4aed2e70eb6d8445d786c0df770094e9e1.zip
Spelling fixes.
-rw-r--r--ChangeLog2
-rwxr-xr-xautogen.sh2
-rw-r--r--doc/misc/calc.texi24
-rw-r--r--doc/misc/idlwave.texi4
-rw-r--r--doc/misc/message.texi2
-rw-r--r--doc/misc/org.texi6
-rw-r--r--doc/misc/tramp.texi2
-rw-r--r--etc/NEWS.192
-rw-r--r--etc/TODO2
-rw-r--r--etc/srecode/template.srt4
-rw-r--r--leim/ChangeLog4
-rw-r--r--leim/quail/greek.el4
-rw-r--r--lisp/ChangeLog.124
-rw-r--r--lisp/ChangeLog.132
-rw-r--r--lisp/ChangeLog.142
-rw-r--r--lisp/ChangeLog.154
-rw-r--r--lisp/ChangeLog.32
-rw-r--r--lisp/ChangeLog.72
-rw-r--r--lisp/calc/calc-menu.el289
-rw-r--r--lisp/calc/calc-yank.el12
-rw-r--r--lisp/calculator.el2
-rw-r--r--lisp/calendar/appt.el4
-rw-r--r--lisp/cedet/inversion.el4
-rw-r--r--lisp/cedet/semantic.el2
-rw-r--r--lisp/cedet/semantic/edit.el2
-rw-r--r--lisp/cedet/semantic/idle.el2
-rw-r--r--lisp/cedet/semantic/lex.el4
-rw-r--r--lisp/cedet/semantic/tag-ls.el2
-rw-r--r--lisp/cedet/srecode/fields.el2
-rw-r--r--lisp/delim-col.el4
-rw-r--r--lisp/delsel.el2
-rw-r--r--lisp/descr-text.el2
-rw-r--r--lisp/dired-x.el2
-rw-r--r--lisp/electric.el2
-rw-r--r--lisp/emacs-lisp/edebug.el2
-rw-r--r--lisp/emacs-lisp/eieio.el2
-rw-r--r--lisp/emulation/cua-base.el2
-rw-r--r--lisp/emulation/cua-gmrk.el2
-rw-r--r--lisp/emulation/vip.el4
-rw-r--r--lisp/emulation/viper-cmd.el16
-rw-r--r--lisp/emulation/viper-init.el2
-rw-r--r--lisp/emulation/viper-macs.el2
-rw-r--r--lisp/emulation/viper.el2
-rw-r--r--lisp/files.el4
-rw-r--r--lisp/follow.el4
-rw-r--r--lisp/gnus/ChangeLog4
-rw-r--r--lisp/gnus/gnus-fun.el6
-rw-r--r--lisp/gnus/gnus-msg.el2
-rw-r--r--lisp/gnus/gnus-sum.el2
-rw-r--r--lisp/gnus/gnus.el2
-rw-r--r--lisp/gnus/message.el4
-rw-r--r--lisp/gnus/nndiary.el6
-rw-r--r--lisp/gnus/nnir.el4
-rw-r--r--lisp/gnus/nntp.el2
-rw-r--r--lisp/ibuffer.el4
-rw-r--r--lisp/international/mule.el2
-rw-r--r--lisp/international/quail.el2
-rw-r--r--lisp/international/titdic-cnv.el4
-rw-r--r--lisp/international/ucs-normalize.el2
-rw-r--r--lisp/kmacro.el2
-rw-r--r--lisp/language/chinese.el14
-rw-r--r--lisp/language/viet-util.el4
-rw-r--r--lisp/man.el2
-rw-r--r--lisp/net/ange-ftp.el2
-rw-r--r--lisp/net/zeroconf.el2
-rw-r--r--lisp/nxml/rng-valid.el4
-rw-r--r--lisp/obsolete/pgg.el2
-rw-r--r--lisp/org/ChangeLog10
-rw-r--r--lisp/org/org-agenda.el4
-rw-r--r--lisp/org/org-clock.el4
-rw-r--r--lisp/org/org-list.el2
-rw-r--r--lisp/org/org-protocol.el4
-rw-r--r--lisp/org/org-publish.el4
-rw-r--r--lisp/org/org-taskjuggler.el2
-rw-r--r--lisp/play/gametree.el2
-rw-r--r--lisp/progmodes/cc-cmds.el4
-rw-r--r--lisp/progmodes/dcl-mode.el4
-rw-r--r--lisp/progmodes/idlwave.el2
-rw-r--r--lisp/progmodes/js.el2
-rw-r--r--lisp/progmodes/vhdl-mode.el6
-rw-r--r--lisp/ses.el2
-rw-r--r--lisp/simple.el6
-rw-r--r--lisp/speedbar.el2
-rw-r--r--lisp/term/x-win.el2
-rw-r--r--lisp/textmodes/artist.el6
-rw-r--r--lisp/textmodes/ispell.el4
-rw-r--r--lisp/textmodes/reftex-dcr.el2
-rw-r--r--lisp/textmodes/table.el4
-rw-r--r--lisp/textmodes/texinfmt.el4
-rw-r--r--lisp/time.el2
-rw-r--r--lisp/url/ChangeLog2
-rw-r--r--lisp/url/url-gw.el4
-rw-r--r--lisp/vc/ediff-init.el2
-rw-r--r--lisp/vc/pcvs.el2
-rw-r--r--lisp/vcursor.el2
-rw-r--r--lisp/view.el2
-rw-r--r--lisp/wid-edit.el6
-rw-r--r--lisp/window.el4
-rw-r--r--nt/addpm.c3
-rw-r--r--src/ChangeLog.102
-rw-r--r--src/ChangeLog.112
-rw-r--r--src/ChangeLog.22
-rw-r--r--src/ChangeLog.84
-rw-r--r--src/ccl.c2
-rw-r--r--src/cm.h4
-rw-r--r--src/emacsgtkfixed.c2
-rw-r--r--src/emacsgtkfixed.h2
-rw-r--r--src/eval.c2
-rw-r--r--src/font.c8
-rw-r--r--src/fontset.c2
-rw-r--r--src/frame.c2
-rw-r--r--src/keyboard.c2
-rw-r--r--src/sysdep.c2
-rw-r--r--src/w32fns.c10
-rw-r--r--src/w32term.h2
-rw-r--r--src/window.c2
-rw-r--r--src/window.h2
-rw-r--r--src/xdisp.c2
-rw-r--r--src/xfns.c2
-rw-r--r--src/xterm.h2
-rw-r--r--test/cedet/tests/test.el2
121 files changed, 351 insertions, 353 deletions
diff --git a/ChangeLog b/ChangeLog
index fe4b74535ae..7ab026afb50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8171,7 +8171,7 @@
81711994-01-08 Roland McGrath (roland@churchy.gnu.ai.mit.edu) 81711994-01-08 Roland McGrath (roland@churchy.gnu.ai.mit.edu)
8172 8172
8173 * configure.in (creating src/Makefile): Put code inside 2nd arg to 8173 * configure.in (creating src/Makefile): Put code inside 2nd arg to
8174 AC_OUTPUT as it should be; hopefully noone will again see fit to 8174 AC_OUTPUT as it should be; hopefully no one will again see fit to
8175 gratuitously break this and not make a change log entry. 8175 gratuitously break this and not make a change log entry.
8176 Optimized sed processing of Makefile.in and cpp output; now 8176 Optimized sed processing of Makefile.in and cpp output; now
8177 preserves comments previously removed from the cpp input. 8177 preserves comments previously removed from the cpp input.
diff --git a/autogen.sh b/autogen.sh
index d15817d0596..4778d6ca2ad 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -67,7 +67,7 @@ minor_version ()
67 67
68## $1 = program 68## $1 = program
69## $2 = minimum version. 69## $2 = minimum version.
70## Return 0 if program is present with version >= minumum version. 70## Return 0 if program is present with version >= minimum version.
71## Return 1 if program is missing. 71## Return 1 if program is missing.
72## Return 2 if program is present but too old. 72## Return 2 if program is present but too old.
73## Return 3 for unexpected error (eg failed to parse version). 73## Return 3 for unexpected error (eg failed to parse version).
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 32311ff5c3e..535efd86270 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -12878,7 +12878,7 @@ To declare specifically that @code{x} is real and non-zero,
12878use @samp{[[-inf .. 0), (0 .. inf]]}. (There is no way in the 12878use @samp{[[-inf .. 0), (0 .. inf]]}. (There is no way in the
12879current notation to say that @code{x} is nonzero but not necessarily 12879current notation to say that @code{x} is nonzero but not necessarily
12880real.) The @kbd{a e} command does ``unsafe'' simplifications, 12880real.) The @kbd{a e} command does ``unsafe'' simplifications,
12881including cancelling @samp{x} from the equation when @samp{x} is 12881including canceling @samp{x} from the equation when @samp{x} is
12882not known to be nonzero. 12882not known to be nonzero.
12883 12883
12884Another set of type symbols distinguish between scalars and vectors. 12884Another set of type symbols distinguish between scalars and vectors.
@@ -21903,7 +21903,7 @@ of our sample formula by selecting it and pressing @kbd{n}
21903@end smallexample 21903@end smallexample
21904 21904
21905Unselecting the sub-formula reveals that the minus sign, which would 21905Unselecting the sub-formula reveals that the minus sign, which would
21906normally have cancelled out with the subtraction automatically, has 21906normally have canceled out with the subtraction automatically, has
21907not been able to do so because the subtraction was not part of the 21907not been able to do so because the subtraction was not part of the
21908selected portion. Pressing @kbd{=} (@code{calc-evaluate}) or doing 21908selected portion. Pressing @kbd{=} (@code{calc-evaluate}) or doing
21909any other mathematical operation on the whole formula will cause it 21909any other mathematical operation on the whole formula will cause it
@@ -22590,7 +22590,7 @@ described for multiplication.
22590 22590
22591Quotients of products cancel only in the leading terms of the 22591Quotients of products cancel only in the leading terms of the
22592numerator and denominator. In other words, @expr{a x b / a y b} 22592numerator and denominator. In other words, @expr{a x b / a y b}
22593is cancelled to @expr{x b / y b} but not to @expr{x / y}. Once 22593is canceled to @expr{x b / y b} but not to @expr{x / y}. Once
22594again this is because full cancellation can be slow; use @kbd{a s} 22594again this is because full cancellation can be slow; use @kbd{a s}
22595to cancel all terms of the quotient. 22595to cancel all terms of the quotient.
22596 22596
@@ -22810,7 +22810,7 @@ the distributive law. For example, @expr{a x^2 b / c x^3 d} will
22810cancel @expr{x^2} from the top and bottom to get @expr{a b / c x d}. 22810cancel @expr{x^2} from the top and bottom to get @expr{a b / c x d}.
22811(The terms in the denominator will then be rearranged to @expr{c d x} 22811(The terms in the denominator will then be rearranged to @expr{c d x}
22812as described above.) If there is any common integer or fractional 22812as described above.) If there is any common integer or fractional
22813factor in the numerator and denominator, it is cancelled out; 22813factor in the numerator and denominator, it is canceled out;
22814for example, @expr{(4 x + 6) / 8 x} simplifies to @expr{(2 x + 3) / 4 x}. 22814for example, @expr{(4 x + 6) / 8 x} simplifies to @expr{(2 x + 3) / 4 x}.
22815 22815
22816Non-constant common factors are not found even by @kbd{a s}. To 22816Non-constant common factors are not found even by @kbd{a s}. To
@@ -22858,7 +22858,7 @@ example, @samp{(x - 23) % 10} is simplified to @samp{(x + 7) % 10}.
22858 22858
22859If the argument is multiplied by a constant, and this constant 22859If the argument is multiplied by a constant, and this constant
22860has a common integer divisor with the modulus, then this factor is 22860has a common integer divisor with the modulus, then this factor is
22861cancelled out. For example, @samp{12 x % 15} is changed to 22861canceled out. For example, @samp{12 x % 15} is changed to
22862@samp{3 (4 x % 5)} by factoring out 3. Also, @samp{(12 x + 1) % 15} 22862@samp{3 (4 x % 5)} by factoring out 3. Also, @samp{(12 x + 1) % 15}
22863is changed to @samp{3 ((4 x + 1:3) % 5)}. While these forms may 22863is changed to @samp{3 ((4 x + 1:3) % 5)}. While these forms may
22864not seem ``simpler,'' they allow Calc to discover useful information 22864not seem ``simpler,'' they allow Calc to discover useful information
@@ -22938,13 +22938,13 @@ function.
22938\bigskip 22938\bigskip
22939@end tex 22939@end tex
22940 22940
22941Equations and inequalities are simplified by cancelling factors 22941Equations and inequalities are simplified by canceling factors
22942of products, quotients, or sums on both sides. Inequalities 22942of products, quotients, or sums on both sides. Inequalities
22943change sign if a negative multiplicative factor is cancelled. 22943change sign if a negative multiplicative factor is canceled.
22944Non-constant multiplicative factors as in @expr{a b = a c} are 22944Non-constant multiplicative factors as in @expr{a b = a c} are
22945cancelled from equations only if they are provably nonzero (generally 22945canceled from equations only if they are provably nonzero (generally
22946because they were declared so; @pxref{Declarations}). Factors 22946because they were declared so; @pxref{Declarations}). Factors
22947are cancelled from inequalities only if they are nonzero and their 22947are canceled from inequalities only if they are nonzero and their
22948sign is known. 22948sign is known.
22949 22949
22950Simplification also replaces an equation or inequality with 22950Simplification also replaces an equation or inequality with
@@ -23035,9 +23035,9 @@ The simplifications of @expr{@tfn{ln}(@tfn{exp}(x))},
23035unsafe because of problems with principal values (although these 23035unsafe because of problems with principal values (although these
23036simplifications are safe if @expr{x} is known to be real). 23036simplifications are safe if @expr{x} is known to be real).
23037 23037
23038Common factors are cancelled from products on both sides of an 23038Common factors are canceled from products on both sides of an
23039equation, even if those factors may be zero: @expr{a x / b x} 23039equation, even if those factors may be zero: @expr{a x / b x}
23040to @expr{a / b}. Such factors are never cancelled from 23040to @expr{a / b}. Such factors are never canceled from
23041inequalities: Even @kbd{a e} is not bold enough to reduce 23041inequalities: Even @kbd{a e} is not bold enough to reduce
23042@expr{a x < b x} to @expr{a < b} (or @expr{a > b}, depending 23042@expr{a x < b x} to @expr{a < b} (or @expr{a > b}, depending
23043on whether you believe @expr{x} is positive or negative). 23043on whether you believe @expr{x} is positive or negative).
@@ -23071,7 +23071,7 @@ If units auto-ranging mode is enabled, products or quotients in
23071which the first argument is a number which is out of range for the 23071which the first argument is a number which is out of range for the
23072leading unit are modified accordingly. 23072leading unit are modified accordingly.
23073 23073
23074When cancelling and combining units in products and quotients, 23074When canceling and combining units in products and quotients,
23075Calc accounts for unit names that differ only in the prefix letter. 23075Calc accounts for unit names that differ only in the prefix letter.
23076For example, @samp{2 km m} is simplified to @samp{2000 m^2}. 23076For example, @samp{2 km m} is simplified to @samp{2000 m^2}.
23077However, compatible but different units like @code{ft} and @code{in} 23077However, compatible but different units like @code{ft} and @code{in}
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 3e13dbb0f23..5149eb91651 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -1580,8 +1580,8 @@ available will be emphasized (e.g. colored blue). For other items, the
1580corresponding source code or DocLib header will be used as the help 1580corresponding source code or DocLib header will be used as the help
1581text. 1581text.
1582 1582
1583@cindex Completion, cancelling 1583@cindex Completion, canceling
1584@cindex Cancelling completion 1584@cindex Canceling completion
1585Completion is not a blocking operation --- you are free to continue 1585Completion is not a blocking operation --- you are free to continue
1586editing, enter commands, or simply ignore the @file{*Completions*} 1586editing, enter commands, or simply ignore the @file{*Completions*}
1587buffer during a completion operation. If, however, the most recent 1587buffer during a completion operation. If, however, the most recent
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index d9062a32572..774bf180266 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1974,7 +1974,7 @@ that look like:
1974Hallvard B Furuseth <h.b.furuseth@@usit.uio.no> writes: 1974Hallvard B Furuseth <h.b.furuseth@@usit.uio.no> writes:
1975@end example 1975@end example
1976 1976
1977@c FIXME: Add `message-insert-formated-citation-line' and 1977@c FIXME: Add `message-insert-formatted-citation-line' and
1978@c `message-citation-line-format' 1978@c `message-citation-line-format'
1979 1979
1980Point will be at the beginning of the body of the message when this 1980Point will be at the beginning of the body of the message when this
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 181e00f8e02..a6fae5e216f 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -11399,16 +11399,16 @@ a file is retrieved with @code{org-publish-find-date}.
11399@tab Should sorting be case-sensitive? Default @code{nil}. 11399@tab Should sorting be case-sensitive? Default @code{nil}.
11400 11400
11401@item @code{:sitemap-file-entry-format} 11401@item @code{:sitemap-file-entry-format}
11402@tab With this option one can tell how a sitemap's entry is formated in the 11402@tab With this option one can tell how a sitemap's entry is formatted in the
11403sitemap. This is a format string with some escape sequences: @code{%t} stands 11403sitemap. This is a format string with some escape sequences: @code{%t} stands
11404for the title of the file, @code{%a} stands for the author of the file and 11404for the title of the file, @code{%a} stands for the author of the file and
11405@code{%d} stands for the date of the file. The date is retrieved with the 11405@code{%d} stands for the date of the file. The date is retrieved with the
11406@code{org-publish-find-date} function and formated with 11406@code{org-publish-find-date} function and formatted with
11407@code{org-publish-sitemap-date-format}. Default @code{%t}. 11407@code{org-publish-sitemap-date-format}. Default @code{%t}.
11408 11408
11409@item @code{:sitemap-date-format} 11409@item @code{:sitemap-date-format}
11410@tab Format string for the @code{format-time-string} function that tells how 11410@tab Format string for the @code{format-time-string} function that tells how
11411a sitemap entry's date is to be formated. This property bypasses 11411a sitemap entry's date is to be formatted. This property bypasses
11412@code{org-publish-sitemap-date-format} which defaults to @code{%Y-%m-%d}. 11412@code{org-publish-sitemap-date-format} which defaults to @code{%Y-%m-%d}.
11413 11413
11414@item @code{:sitemap-sans-extension} 11414@item @code{:sitemap-sans-extension}
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index f7f340074a2..e2c2594b66e 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3704,4 +3704,4 @@ for @value{emacsothername}.
3704@c host and then send commands to it. 3704@c host and then send commands to it.
3705@c * Use `filename' resp. `file name' consistently. 3705@c * Use `filename' resp. `file name' consistently.
3706@c * Use `host' resp. `machine' consistently. 3706@c * Use `host' resp. `machine' consistently.
3707@c * Consistent small or capitalized words especially in menues. 3707@c * Consistent small or capitalized words especially in menus.
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 16a9d9dc4cb..849566e6238 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -4457,7 +4457,7 @@ highlighting, etc.
4457 4457
4458So that such output processing may be done efficiently, there is a new 4458So that such output processing may be done efficiently, there is a new
4459variable, comint-last-output-start, that records the position of the start of 4459variable, comint-last-output-start, that records the position of the start of
4460the lastest output inserted into the buffer (effectively the previous value 4460the last output inserted into the buffer (effectively the previous value
4461of process-mark). Output processing functions should process the text 4461of process-mark). Output processing functions should process the text
4462between comint-last-output-start (or perhaps the beginning of the line that 4462between comint-last-output-start (or perhaps the beginning of the line that
4463the position lies on) and process-mark. 4463the position lies on) and process-mark.
diff --git a/etc/TODO b/etc/TODO
index 5acd8734ad0..2470747bfb5 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -674,7 +674,7 @@ with toolkit-specific code to display the menu bar right to left.
674 674
675*** image-type-header-regexps priorities the jpeg loader over the 675*** image-type-header-regexps priorities the jpeg loader over the
676ImageMagick one. This is not wrong, but how should a user go about 676ImageMagick one. This is not wrong, but how should a user go about
677prefering the ImageMagick loader? The user might like zooming etc in jpegs. 677preferring the ImageMagick loader? The user might like zooming etc in jpegs.
678 678
679Try (setq image-type-header-regexps nil) for a quick hack to prefer 679Try (setq image-type-header-regexps nil) for a quick hack to prefer
680ImageMagick over the jpg loader. 680ImageMagick over the jpg loader.
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt
index 3c9aff7ff0d..adbe554216b 100644
--- a/etc/srecode/template.srt
+++ b/etc/srecode/template.srt
@@ -125,13 +125,13 @@ prompt $?NAME$ "$?PROMPT$"
125bind "p" 125bind "p"
126 126
127template priority :blank 127template priority :blank
128"Insert a priority statemept." 128"Insert a priority statement."
129---- 129----
130set priority $^$ 130set priority $^$
131---- 131----
132 132
133template application :blank 133template application :blank
134"Insert a priority statemept." 134"Insert an application statement."
135---- 135----
136set application "$^$" 136set application "$^$"
137---- 137----
diff --git a/leim/ChangeLog b/leim/ChangeLog
index ed8aec0b16d..11aae483ba2 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1801,7 +1801,7 @@
18011998-07-21 Kenichi Handa <handa@etl.go.jp> 18011998-07-21 Kenichi Handa <handa@etl.go.jp>
1802 1802
1803 * quail/japanese.el (quail-japanese-kanji-kkc): Handle the case 1803 * quail/japanese.el (quail-japanese-kanji-kkc): Handle the case
1804 that conversion is cancelled in kkc-region. 1804 that conversion is canceled in kkc-region.
1805 (quail-japanese-switch-package): Fix previous change. 1805 (quail-japanese-switch-package): Fix previous change.
1806 1806
18071998-07-19 Kenichi Handa <handa@etl.go.jp> 18071998-07-19 Kenichi Handa <handa@etl.go.jp>
@@ -1998,7 +1998,7 @@
1998 (quail-mode-map): Change binding for ethio-insert-ethio-space. 1998 (quail-mode-map): Change binding for ethio-insert-ethio-space.
1999 (quail-mode-hook): Check the current Quail package name. 1999 (quail-mode-hook): Check the current Quail package name.
2000 2000
2001 * quail/latin-post.el: Add rules for cancelling accents by typing 2001 * quail/latin-post.el: Add rules for canceling accents by typing
2002 two accent keys (e.g. a~ => a-tilde, a~~ => a~) to all Quail 2002 two accent keys (e.g. a~ => a-tilde, a~~ => a~) to all Quail
2003 packages. 2003 packages.
2004 2004
diff --git a/leim/quail/greek.el b/leim/quail/greek.el
index 4deeb86fb4d..ab82775ff0e 100644
--- a/leim/quail/greek.el
+++ b/leim/quail/greek.el
@@ -152,7 +152,7 @@ eta H h
152theta Q q 152theta Q q
153iota I i 153iota I i
154kappa K k 154kappa K k
155lamda L l 155lambda L l
156mu M m 156mu M m
157nu N n 157nu N n
158xi X x 158xi X x
@@ -433,7 +433,7 @@ eta H h
433theta J j 433theta J j
434iota I i 434iota I i
435kappa K k 435kappa K k
436lamda L l 436lambda L l
437mu M m 437mu M m
438nu N n 438nu N n
439xi X x 439xi X x
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 @@
71772006-08-20 Chong Yidong <cyd@stupidchicken.com> 71772006-08-20 Chong Yidong <cyd@stupidchicken.com>
7178 7178
7179 * frame.el (blink-cursor-start): Set timer first. 7179 * frame.el (blink-cursor-start): Set timer first.
7180 (blink-cursor-end): Ignore timer cancelling errors. 7180 (blink-cursor-end): Ignore timer canceling errors.
7181 Suggested by Ken Manheimer. 7181 Suggested by Ken Manheimer.
7182 7182
71832006-08-20 Juanma Barranquero <lekktu@gmail.com> 71832006-08-20 Juanma Barranquero <lekktu@gmail.com>
@@ -15842,7 +15842,7 @@
15842 interactive spec from "p" to "P". 15842 interactive spec from "p" to "P".
15843 15843
15844 * progmodes/cc-styles.el: Amend the doc-string of c-set-style, in 15844 * progmodes/cc-styles.el: Amend the doc-string of c-set-style, in
15845 reponse to a report from Joseph Kiniry <kiniry@acm.org> that it 15845 response to a report from Joseph Kiniry <kiniry@acm.org> that it
15846 was difficult to understand. 15846 was difficult to understand.
15847 15847
158482005-12-08 Martin Stjernholm <bug-cc-mode@gnu.org> 158482005-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 @@
80102007-10-31 Juanma Barranquero <lekktu@gmail.com> 80102007-10-31 Juanma Barranquero <lekktu@gmail.com>
8011 8011
8012 * help-at-pt.el (help-at-pt-unload-hook): Remove. 8012 * help-at-pt.el (help-at-pt-unload-hook): Remove.
8013 Timers are automatically cancelled by `unload-feature'. 8013 Timers are automatically canceled by `unload-feature'.
8014 8014
8015 * delsel.el (delsel-unload-hook): Remove function and variable. 8015 * delsel.el (delsel-unload-hook): Remove function and variable.
8016 (delsel-unload-function): New-style unload function, adapted 8016 (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 @@
866 866
867 * calc/calc-embed.el (calc-embedded-restore-original-modes): 867 * calc/calc-embed.el (calc-embedded-restore-original-modes):
868 Add argument for Calculator buffer. 868 Add argument for Calculator buffer.
869 (calc-do-embedded): Use specific Calculator buffer when cancelling 869 (calc-do-embedded): Use specific Calculator buffer when canceling
870 embedded mode. 870 embedded mode.
871 871
872 * calc/calc.el (calc-buffer-list): New variable. 872 * 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 @@
7086 (sql-mode-oracle-font-lock-keywords): Improve SQL*Plus REMARK 7086 (sql-mode-oracle-font-lock-keywords): Improve SQL*Plus REMARK
7087 syntax pattern. 7087 syntax pattern.
7088 (sql-mode-postgres-font-lock-keywords): Support Postgres V9. 7088 (sql-mode-postgres-font-lock-keywords): Support Postgres V9.
7089 (sql-mode-sqlite-font-lock-keywords): Hilight sqlite commands. 7089 (sql-mode-sqlite-font-lock-keywords): Highlight sqlite commands.
7090 7090
70912010-09-10 Lars Magne Ingebrigtsen <larsi@gnus.org> 70912010-09-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
7092 7092
@@ -11908,7 +11908,7 @@
11908 Add new VC methods: vc-log-incoming and vc-log-outgoing. 11908 Add new VC methods: vc-log-incoming and vc-log-outgoing.
11909 * vc.el (vc-print-log-setup-buttons): New function split out from 11909 * vc.el (vc-print-log-setup-buttons): New function split out from
11910 vc-print-log-internal. 11910 vc-print-log-internal.
11911 (vc-log-internal-common): New function, a parametrized version of 11911 (vc-log-internal-common): New function, a parameterized version of
11912 vc-print-log-internal. 11912 vc-print-log-internal.
11913 (vc-print-log-internal): Just call vc-log-internal-common with the 11913 (vc-print-log-internal): Just call vc-log-internal-common with the
11914 right arguments. 11914 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 @@
6305 to "Non-echoed text: ". This conforms with the convention 6305 to "Non-echoed text: ". This conforms with the convention
6306 used by existing prompts, and gives more room to type stuff. 6306 used by existing prompts, and gives more room to type stuff.
6307 6307
6308 * comint.el (comint-last-input-start): New varible. In 6308 * comint.el (comint-last-input-start): New variable. In
6309 particular, this helps support subprocesses that insist on echoing 6309 particular, this helps support subprocesses that insist on echoing
6310 their input. Added comments to porting guide indicating that 6310 their input. Added comments to porting guide indicating that
6311 this should probably not be used for implementing history stuff. 6311 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 @@
8841998-07-21 Kenichi Handa <handa@etl.go.jp> 8841998-07-21 Kenichi Handa <handa@etl.go.jp>
885 885
886 * international/kkc.el (kkc-region): Handled the case that 886 * international/kkc.el (kkc-region): Handled the case that
887 conversion is cancelled. 887 conversion is canceled.
888 (kkc-terminate): Update kkc-overlay-head correctly. 888 (kkc-terminate): Update kkc-overlay-head correctly.
889 (kkc-cancel): Don't call kkc-terminate, but set kkc-converting to nil. 889 (kkc-cancel): Don't call kkc-terminate, but set kkc-converting to nil.
890 890
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 @@
24(defvar calc-arithmetic-menu 24(defvar calc-arithmetic-menu
25 (list "Arithmetic" 25 (list "Arithmetic"
26 (list "Basic" 26 (list "Basic"
27 ["-(1:)" calc-change-sign 27 ["-(1:)" calc-change-sign
28 :keys "n" :active (>= (calc-stack-size) 1)] 28 :keys "n" :active (>= (calc-stack-size) 1)]
29 ["(2:) + (1:)" calc-plus 29 ["(2:) + (1:)" calc-plus
30 :keys "+" :active (>= (calc-stack-size) 2)] 30 :keys "+" :active (>= (calc-stack-size) 2)]
31 ["(2:) - (1:)" calc-minus 31 ["(2:) - (1:)" calc-minus
32 :keys "-" :active (>= (calc-stack-size) 2)] 32 :keys "-" :active (>= (calc-stack-size) 2)]
33 ["(2:) * (1:)" calc-times 33 ["(2:) * (1:)" calc-times
34 :keys "*" :active (>= (calc-stack-size) 2)] 34 :keys "*" :active (>= (calc-stack-size) 2)]
35 ["(2:) / (1:)" calc-divide 35 ["(2:) / (1:)" calc-divide
36 :keys "/" :active (>= (calc-stack-size) 2)] 36 :keys "/" :active (>= (calc-stack-size) 2)]
37 ["(2:) ^ (1:)" calc-power 37 ["(2:) ^ (1:)" calc-power
38 :keys "^" :active (>= (calc-stack-size) 2)] 38 :keys "^" :active (>= (calc-stack-size) 2)]
39 ["(2:) ^ (1/(1:))" 39 ["(2:) ^ (1/(1:))"
40 (progn 40 (progn
41 (require 'calc-ext) 41 (require 'calc-ext)
42 (let ((calc-inverse-flag t)) 42 (let ((calc-inverse-flag t))
@@ -44,8 +44,8 @@
44 :keys "I ^" 44 :keys "I ^"
45 :active (>= (calc-stack-size) 2) 45 :active (>= (calc-stack-size) 2)
46 :help "The (1:)th root of (2:)"] 46 :help "The (1:)th root of (2:)"]
47 ["abs(1:)" 47 ["abs(1:)"
48 (progn 48 (progn
49 (require 'calc-arith) 49 (require 'calc-arith)
50 (call-interactively 'calc-abs)) 50 (call-interactively 'calc-abs))
51 :keys "A" 51 :keys "A"
@@ -57,7 +57,7 @@
57 (call-interactively 'calc-inv)) 57 (call-interactively 'calc-inv))
58 :keys "&" 58 :keys "&"
59 :active (>= (calc-stack-size) 1)] 59 :active (>= (calc-stack-size) 1)]
60 ["sqrt(1:)" 60 ["sqrt(1:)"
61 (progn 61 (progn
62 (require 'calc-math) 62 (require 'calc-math)
63 (call-interactively 'calc-sqrt)) 63 (call-interactively 'calc-sqrt))
@@ -70,7 +70,7 @@
70 :keys "\\" 70 :keys "\\"
71 :active (>= (calc-stack-size) 2) 71 :active (>= (calc-stack-size) 2)
72 :help "The integer quotient of (2:) over (1:)"] 72 :help "The integer quotient of (2:) over (1:)"]
73 ["(2:) mod (1:)" 73 ["(2:) mod (1:)"
74 (progn 74 (progn
75 (require 'calc-misc) 75 (require 'calc-misc)
76 (call-interactively 'calc-mod)) 76 (call-interactively 'calc-mod))
@@ -78,28 +78,28 @@
78 :active (>= (calc-stack-size) 2) 78 :active (>= (calc-stack-size) 2)
79 :help "The remainder when (2:) is divided by (1:)"]) 79 :help "The remainder when (2:) is divided by (1:)"])
80 (list "Rounding" 80 (list "Rounding"
81 ["floor(1:)" 81 ["floor(1:)"
82 (progn 82 (progn
83 (require 'calc-arith) 83 (require 'calc-arith)
84 (call-interactively 'calc-floor)) 84 (call-interactively 'calc-floor))
85 :keys "F" 85 :keys "F"
86 :active (>= (calc-stack-size) 1) 86 :active (>= (calc-stack-size) 1)
87 :help "The greatest integer less than or equal to (1:)"] 87 :help "The greatest integer less than or equal to (1:)"]
88 ["ceiling(1:)" 88 ["ceiling(1:)"
89 (progn 89 (progn
90 (require 'calc-arith) 90 (require 'calc-arith)
91 (call-interactively 'calc-ceiling)) 91 (call-interactively 'calc-ceiling))
92 :keys "I F" 92 :keys "I F"
93 :active (>= (calc-stack-size) 1) 93 :active (>= (calc-stack-size) 1)
94 :help "The smallest integer greater than or equal to (1:)"] 94 :help "The smallest integer greater than or equal to (1:)"]
95 ["round(1:)" 95 ["round(1:)"
96 (progn 96 (progn
97 (require 'calc-arith) 97 (require 'calc-arith)
98 (call-interactively 'calc-round)) 98 (call-interactively 'calc-round))
99 :keys "R" 99 :keys "R"
100 :active (>= (calc-stack-size) 1) 100 :active (>= (calc-stack-size) 1)
101 :help "The nearest integer to (1:)"] 101 :help "The nearest integer to (1:)"]
102 ["truncate(1:)" 102 ["truncate(1:)"
103 (progn 103 (progn
104 (require 'calc-arith) 104 (require 'calc-arith)
105 (call-interactively 'calc-trunc)) 105 (call-interactively 'calc-trunc))
@@ -140,32 +140,32 @@
140 :active (>= (calc-stack-size) 1) 140 :active (>= (calc-stack-size) 1)
141 :help "The argument (polar angle) of (1:)"]) 141 :help "The argument (polar angle) of (1:)"])
142 (list "Conversion" 142 (list "Conversion"
143 ["Convert (1:) to a float" 143 ["Convert (1:) to a float"
144 (progn 144 (progn
145 (require 'calc-ext) 145 (require 'calc-ext)
146 (call-interactively 'calc-float)) 146 (call-interactively 'calc-float))
147 :keys "c f" 147 :keys "c f"
148 :active (>= (calc-stack-size) 1)] 148 :active (>= (calc-stack-size) 1)]
149 ["Convert (1:) to a fraction" 149 ["Convert (1:) to a fraction"
150 (progn 150 (progn
151 (require 'calc-ext) 151 (require 'calc-ext)
152 (call-interactively 'calc-fraction)) 152 (call-interactively 'calc-fraction))
153 :keys "c F" 153 :keys "c F"
154 :active (>= (calc-stack-size) 1)]) 154 :active (>= (calc-stack-size) 1)])
155 (list "Binary" 155 (list "Binary"
156 ["Set word size" 156 ["Set word size"
157 (progn 157 (progn
158 (require 'calc-bin) 158 (require 'calc-bin)
159 (call-interactively 'calc-word-size)) 159 (call-interactively 'calc-word-size))
160 :keys "b w"] 160 :keys "b w"]
161 ["Clip (1:) to word size" 161 ["Clip (1:) to word size"
162 (progn 162 (progn
163 (require 'calc-bin) 163 (require 'calc-bin)
164 (call-interactively 'calc-clip)) 164 (call-interactively 'calc-clip))
165 :keys "b c" 165 :keys "b c"
166 :active (>= (calc-stack-size) 1) 166 :active (>= (calc-stack-size) 1)
167 :help "Reduce (1:) modulo 2^wordsize"] 167 :help "Reduce (1:) modulo 2^wordsize"]
168 ["(2:) and (1:)" 168 ["(2:) and (1:)"
169 (progn 169 (progn
170 (require 'calc-bin) 170 (require 'calc-bin)
171 (call-interactively 'calc-and)) 171 (call-interactively 'calc-and))
@@ -180,13 +180,13 @@
180 :active (>= (calc-stack-size) 2) 180 :active (>= (calc-stack-size) 2)
181 :help "Bitwise inclusive OR [modulo 2^wordsize]"] 181 :help "Bitwise inclusive OR [modulo 2^wordsize]"]
182 ["(2:) xor (1:)" 182 ["(2:) xor (1:)"
183 (progn 183 (progn
184 (require 'calc-bin) 184 (require 'calc-bin)
185 (call-interactively 'calc-xor)) 185 (call-interactively 'calc-xor))
186 :keys "b x" 186 :keys "b x"
187 :active (>= (calc-stack-size) 2) 187 :active (>= (calc-stack-size) 2)
188 :help "Bitwise exclusive OR [modulo 2^wordsize]"] 188 :help "Bitwise exclusive OR [modulo 2^wordsize]"]
189 ["diff(2:,1:)" 189 ["diff(2:,1:)"
190 (progn 190 (progn
191 (require 'calc-bin) 191 (require 'calc-bin)
192 (call-interactively 'calc-diff)) 192 (call-interactively 'calc-diff))
@@ -263,82 +263,82 @@
263 :keys "I P" 263 :keys "I P"
264 :help "Euler's constant"]) 264 :help "Euler's constant"])
265 (list "Logs and Exps" 265 (list "Logs and Exps"
266 ["ln(1:)" 266 ["ln(1:)"
267 (progn 267 (progn
268 (require 'calc-math) 268 (require 'calc-math)
269 (call-interactively 'calc-ln)) 269 (call-interactively 'calc-ln))
270 :keys "L" 270 :keys "L"
271 :active (>= (calc-stack-size) 1) 271 :active (>= (calc-stack-size) 1)
272 :help "The natural logarithm"] 272 :help "The natural logarithm"]
273 ["e^(1:)" 273 ["e^(1:)"
274 (progn 274 (progn
275 (require 'calc-math) 275 (require 'calc-math)
276 (call-interactively 'calc-exp)) 276 (call-interactively 'calc-exp))
277 :keys "E" 277 :keys "E"
278 :active (>= (calc-stack-size) 1)] 278 :active (>= (calc-stack-size) 1)]
279 ["log(1:) [base 10]" 279 ["log(1:) [base 10]"
280 (progn 280 (progn
281 (require 'calc-math) 281 (require 'calc-math)
282 (call-interactively 'calc-log10)) 282 (call-interactively 'calc-log10))
283 :keys "H L" 283 :keys "H L"
284 :active (>= (calc-stack-size) 1) 284 :active (>= (calc-stack-size) 1)
285 :help "The common logarithm"] 285 :help "The common logarithm"]
286 ["10^(1:)" 286 ["10^(1:)"
287 (progn 287 (progn
288 (require 'calc-math) 288 (require 'calc-math)
289 (let ((calc-inverse-flag t)) 289 (let ((calc-inverse-flag t))
290 (call-interactively 'calc-log10))) 290 (call-interactively 'calc-log10)))
291 :keys "I H L" 291 :keys "I H L"
292 :active (>= (calc-stack-size) 1)] 292 :active (>= (calc-stack-size) 1)]
293 ["log(2:) [base(1:)]" 293 ["log(2:) [base(1:)]"
294 (progn 294 (progn
295 (require 'calc-math) 295 (require 'calc-math)
296 (call-interactively 'calc-log)) 296 (call-interactively 'calc-log))
297 :keys "B" 297 :keys "B"
298 :active (>= (calc-stack-size) 2) 298 :active (>= (calc-stack-size) 2)
299 :help "The logarithm with an arbitrary base"] 299 :help "The logarithm with an arbitrary base"]
300 ["(2:) ^ (1:)" 300 ["(2:) ^ (1:)"
301 calc-power 301 calc-power
302 :keys "^" 302 :keys "^"
303 :active (>= (calc-stack-size) 2)]) 303 :active (>= (calc-stack-size) 2)])
304 (list "Trigonometric Functions" 304 (list "Trigonometric Functions"
305 ["sin(1:)" 305 ["sin(1:)"
306 (progn 306 (progn
307 (require 'calc-math) 307 (require 'calc-math)
308 (call-interactively 'calc-sin)) 308 (call-interactively 'calc-sin))
309 :keys "S" 309 :keys "S"
310 :active (>= (calc-stack-size) 1)] 310 :active (>= (calc-stack-size) 1)]
311 ["cos(1:)" 311 ["cos(1:)"
312 (progn 312 (progn
313 (require 'calc-math) 313 (require 'calc-math)
314 (call-interactively 'calc-cos)) 314 (call-interactively 'calc-cos))
315 :keys "C" 315 :keys "C"
316 :active (>= (calc-stack-size) 1)] 316 :active (>= (calc-stack-size) 1)]
317 ["tan(1:)" 317 ["tan(1:)"
318 (progn 318 (progn
319 (require 'calc-math) 319 (require 'calc-math)
320 (call-interactively 'calc-tan)) 320 (call-interactively 'calc-tan))
321 :keys "T" 321 :keys "T"
322 :active (>= (calc-stack-size) 1)] 322 :active (>= (calc-stack-size) 1)]
323 ["arcsin(1:)" 323 ["arcsin(1:)"
324 (progn 324 (progn
325 (require 'calc-math) 325 (require 'calc-math)
326 (call-interactively 'calc-arcsin)) 326 (call-interactively 'calc-arcsin))
327 :keys "I S" 327 :keys "I S"
328 :active (>= (calc-stack-size) 1)] 328 :active (>= (calc-stack-size) 1)]
329 ["arccos(1:)" 329 ["arccos(1:)"
330 (progn 330 (progn
331 (require 'calc-math) 331 (require 'calc-math)
332 (call-interactively 'calc-arccos)) 332 (call-interactively 'calc-arccos))
333 :keys "I C" 333 :keys "I C"
334 :active (>= (calc-stack-size) 1)] 334 :active (>= (calc-stack-size) 1)]
335 ["arctan(1:)" 335 ["arctan(1:)"
336 (progn 336 (progn
337 (require 'calc-math) 337 (require 'calc-math)
338 (call-interactively 'calc-arctan)) 338 (call-interactively 'calc-arctan))
339 :keys "I T" 339 :keys "I T"
340 :active (>= (calc-stack-size) 1)] 340 :active (>= (calc-stack-size) 1)]
341 ["arctan2(2:,1:)" 341 ["arctan2(2:,1:)"
342 (progn 342 (progn
343 (require 'calc-math) 343 (require 'calc-math)
344 (call-interactively 'calc-arctan2)) 344 (call-interactively 'calc-arctan2))
@@ -367,65 +367,65 @@
367 :style radio 367 :style radio
368 :selected (eq calc-angle-mode 'hms)]) 368 :selected (eq calc-angle-mode 'hms)])
369 (list "Hyperbolic Functions" 369 (list "Hyperbolic Functions"
370 ["sinh(1:)" 370 ["sinh(1:)"
371 (progn 371 (progn
372 (require 'calc-math) 372 (require 'calc-math)
373 (call-interactively 'calc-sinh)) 373 (call-interactively 'calc-sinh))
374 :keys "H S" 374 :keys "H S"
375 :active (>= (calc-stack-size) 1)] 375 :active (>= (calc-stack-size) 1)]
376 ["cosh(1:)" 376 ["cosh(1:)"
377 (progn 377 (progn
378 (require 'calc-math) 378 (require 'calc-math)
379 (call-interactively 'calc-cosh)) 379 (call-interactively 'calc-cosh))
380 :keys "H C" 380 :keys "H C"
381 :active (>= (calc-stack-size) 1)] 381 :active (>= (calc-stack-size) 1)]
382 ["tanh(1:)" 382 ["tanh(1:)"
383 (progn 383 (progn
384 (require 'calc-math) 384 (require 'calc-math)
385 (call-interactively 'calc-tanh)) 385 (call-interactively 'calc-tanh))
386 :keys "H T" 386 :keys "H T"
387 :active (>= (calc-stack-size) 1)] 387 :active (>= (calc-stack-size) 1)]
388 ["arcsinh(1:)" 388 ["arcsinh(1:)"
389 (progn 389 (progn
390 (require 'calc-math) 390 (require 'calc-math)
391 (call-interactively 'calc-arcsinh)) 391 (call-interactively 'calc-arcsinh))
392 :keys "I H S" 392 :keys "I H S"
393 :active (>= (calc-stack-size) 1)] 393 :active (>= (calc-stack-size) 1)]
394 ["arccosh(1:)" 394 ["arccosh(1:)"
395 (progn 395 (progn
396 (require 'calc-math) 396 (require 'calc-math)
397 (call-interactively 'calc-arccosh)) 397 (call-interactively 'calc-arccosh))
398 :keys "I H C" 398 :keys "I H C"
399 :active (>= (calc-stack-size) 1)] 399 :active (>= (calc-stack-size) 1)]
400 ["arctanh(1:)" 400 ["arctanh(1:)"
401 (progn 401 (progn
402 (require 'calc-math) 402 (require 'calc-math)
403 (call-interactively 'calc-arctanh)) 403 (call-interactively 'calc-arctanh))
404 :keys "I H T" 404 :keys "I H T"
405 :active (>= (calc-stack-size) 1)]) 405 :active (>= (calc-stack-size) 1)])
406 (list "Advanced Math Functions" 406 (list "Advanced Math Functions"
407 ["Gamma(1:)" 407 ["Gamma(1:)"
408 (progn 408 (progn
409 (require 'calc-comb) 409 (require 'calc-comb)
410 (call-interactively 'calc-gamma)) 410 (call-interactively 'calc-gamma))
411 :keys "f g" 411 :keys "f g"
412 :active (>= (calc-stack-size) 1) 412 :active (>= (calc-stack-size) 1)
413 :help "The Euler Gamma function"] 413 :help "The Euler Gamma function"]
414 ["GammaP(2:,1:)" 414 ["GammaP(2:,1:)"
415 (progn 415 (progn
416 (require 'calc-funcs) 416 (require 'calc-funcs)
417 (call-interactively 'calc-inc-gamma)) 417 (call-interactively 'calc-inc-gamma))
418 :keys "f G" 418 :keys "f G"
419 :active (>= (calc-stack-size) 2) 419 :active (>= (calc-stack-size) 2)
420 :help "The lower incomplete Gamma function"] 420 :help "The lower incomplete Gamma function"]
421 ["Beta(2:,1:)" 421 ["Beta(2:,1:)"
422 (progn 422 (progn
423 (require 'calc-funcs) 423 (require 'calc-funcs)
424 (call-interactively 'calc-beta)) 424 (call-interactively 'calc-beta))
425 :keys "f b" 425 :keys "f b"
426 :active (>= (calc-stack-size) 2) 426 :active (>= (calc-stack-size) 2)
427 :help "The Euler Beta function"] 427 :help "The Euler Beta function"]
428 ["BetaI(3:,2:,1:)" 428 ["BetaI(3:,2:,1:)"
429 (progn 429 (progn
430 (require 'calc-funcs) 430 (require 'calc-funcs)
431 (call-interactively 'calc-inc-beta)) 431 (call-interactively 'calc-inc-beta))
@@ -439,14 +439,14 @@
439 :keys "f e" 439 :keys "f e"
440 :active (>= (calc-stack-size) 1) 440 :active (>= (calc-stack-size) 1)
441 :help "The error function"] 441 :help "The error function"]
442 ["BesselJ(2:,1:)" 442 ["BesselJ(2:,1:)"
443 (progn 443 (progn
444 (require 'calc-funcs) 444 (require 'calc-funcs)
445 (call-interactively 'calc-bessel-J)) 445 (call-interactively 'calc-bessel-J))
446 :keys "f j" 446 :keys "f j"
447 :active (>= (calc-stack-size) 2) 447 :active (>= (calc-stack-size) 2)
448 :help "The Bessel function of the first kind (of order (2:))"] 448 :help "The Bessel function of the first kind (of order (2:))"]
449 ["BesselY(2:,1:)" 449 ["BesselY(2:,1:)"
450 (progn 450 (progn
451 (require 'calc-funcs) 451 (require 'calc-funcs)
452 (call-interactively 'calc-bessel-Y)) 452 (call-interactively 'calc-bessel-Y))
@@ -454,44 +454,44 @@
454 :active (>= (calc-stack-size) 2) 454 :active (>= (calc-stack-size) 2)
455 :help "The Bessel function of the second kind (of order (2:))"]) 455 :help "The Bessel function of the second kind (of order (2:))"])
456 (list "Combinatorial Functions" 456 (list "Combinatorial Functions"
457 ["gcd(2:,1:)" 457 ["gcd(2:,1:)"
458 (progn 458 (progn
459 (require 'calc-comb) 459 (require 'calc-comb)
460 (call-interactively 'calc-gcd)) 460 (call-interactively 'calc-gcd))
461 :keys "k g" 461 :keys "k g"
462 :active (>= (calc-stack-size) 2)] 462 :active (>= (calc-stack-size) 2)]
463 ["lcm(2:,1:)" 463 ["lcm(2:,1:)"
464 (progn 464 (progn
465 (require 'calc-comb) 465 (require 'calc-comb)
466 (call-interactively 'calc-lcm)) 466 (call-interactively 'calc-lcm))
467 :keys "k l" 467 :keys "k l"
468 :active (>= (calc-stack-size) 2)] 468 :active (>= (calc-stack-size) 2)]
469 ["factorial(1:)" 469 ["factorial(1:)"
470 (progn 470 (progn
471 (require 'calc-comb) 471 (require 'calc-comb)
472 (call-interactively 'calc-factorial)) 472 (call-interactively 'calc-factorial))
473 :keys "!" 473 :keys "!"
474 :active (>= (calc-stack-size) 1)] 474 :active (>= (calc-stack-size) 1)]
475 ["(2:) choose (1:)" 475 ["(2:) choose (1:)"
476 (progn 476 (progn
477 (require 'calc-comb) 477 (require 'calc-comb)
478 (call-interactively 'calc-choose)) 478 (call-interactively 'calc-choose))
479 :keys "k c" 479 :keys "k c"
480 :active (>= (calc-stack-size) 2)] 480 :active (>= (calc-stack-size) 2)]
481 ["permutations(2:,1:)" 481 ["permutations(2:,1:)"
482 (progn 482 (progn
483 (require 'calc-comb) 483 (require 'calc-comb)
484 (call-interactively 'calc-perm)) 484 (call-interactively 'calc-perm))
485 :keys "H k c" 485 :keys "H k c"
486 :active (>= (calc-stack-size) 2)] 486 :active (>= (calc-stack-size) 2)]
487 ["Primality test for (1:)" 487 ["Primality test for (1:)"
488 (progn 488 (progn
489 (require 'calc-comb) 489 (require 'calc-comb)
490 (call-interactively 'calc-prime-test)) 490 (call-interactively 'calc-prime-test))
491 :keys "k p" 491 :keys "k p"
492 :active (>= (calc-stack-size) 1) 492 :active (>= (calc-stack-size) 1)
493 :help "For large (1:), a probabilistic test"] 493 :help "For large (1:), a probabilistic test"]
494 ["Factor (1:) into primes" 494 ["Factor (1:) into primes"
495 (progn 495 (progn
496 (require 'calc-comb) 496 (require 'calc-comb)
497 (call-interactively 'calc-prime-factors)) 497 (call-interactively 'calc-prime-factors))
@@ -527,17 +527,17 @@
527 ["Help on Scientific Functions" 527 ["Help on Scientific Functions"
528 (calc-info-goto-node "Scientific Functions")]) 528 (calc-info-goto-node "Scientific Functions")])
529 "Menu for Calc's scientific functions.") 529 "Menu for Calc's scientific functions.")
530 530
531(defvar calc-algebra-menu 531(defvar calc-algebra-menu
532 (list "Algebra" 532 (list "Algebra"
533 (list "Simplification" 533 (list "Simplification"
534 ["Simplify (1:)" 534 ["Simplify (1:)"
535 (progn 535 (progn
536 (require 'calc-alg) 536 (require 'calc-alg)
537 (call-interactively 'calc-simplify)) 537 (call-interactively 'calc-simplify))
538 :keys "a s" 538 :keys "a s"
539 :active (>= (calc-stack-size) 1)] 539 :active (>= (calc-stack-size) 1)]
540 ["Simplify (1:) with extended rules" 540 ["Simplify (1:) with extended rules"
541 (progn 541 (progn
542 (require 'calc-alg) 542 (require 'calc-alg)
543 (call-interactively 'calc-simplify-extended)) 543 (call-interactively 'calc-simplify-extended))
@@ -545,72 +545,72 @@
545 :active (>= (calc-stack-size) 1) 545 :active (>= (calc-stack-size) 1)
546 :help "Apply possibly unsafe simplifications"]) 546 :help "Apply possibly unsafe simplifications"])
547 (list "Manipulation" 547 (list "Manipulation"
548 ["Expand formula (1:)" 548 ["Expand formula (1:)"
549 (progn 549 (progn
550 (require 'calc-alg) 550 (require 'calc-alg)
551 (call-interactively 'calc-expand-formula)) 551 (call-interactively 'calc-expand-formula))
552 :keys "a \"" 552 :keys "a \""
553 :active (>= (calc-stack-size) 1) 553 :active (>= (calc-stack-size) 1)
554 :help "Expand (1:) into its defining formula, if possible"] 554 :help "Expand (1:) into its defining formula, if possible"]
555 ["Evaluate variables in (1:)" 555 ["Evaluate variables in (1:)"
556 (progn 556 (progn
557 (require 'calc-ext) 557 (require 'calc-ext)
558 (call-interactively 'calc-evaluate)) 558 (call-interactively 'calc-evaluate))
559 :keys "=" 559 :keys "="
560 :active (>= (calc-stack-size) 1)] 560 :active (>= (calc-stack-size) 1)]
561 ["Make substitution in (1:)" 561 ["Make substitution in (1:)"
562 (progn 562 (progn
563 (require 'calc-alg) 563 (require 'calc-alg)
564 (call-interactively 'calc-substitute)) 564 (call-interactively 'calc-substitute))
565 :keys "a b" 565 :keys "a b"
566 :active (>= (calc-stack-size) 1) 566 :active (>= (calc-stack-size) 1)
567 :help 567 :help
568 "Substitute all occurrences of a sub-expression with a new sub-expression"]) 568 "Substitute all occurrences of a sub-expression with a new sub-expression"])
569 (list "Polynomials" 569 (list "Polynomials"
570 ["Factor (1:)" 570 ["Factor (1:)"
571 (progn 571 (progn
572 (require 'calc-alg) 572 (require 'calc-alg)
573 (call-interactively 'calc-factor)) 573 (call-interactively 'calc-factor))
574 :keys "a f" 574 :keys "a f"
575 :active (>= (calc-stack-size) 1)] 575 :active (>= (calc-stack-size) 1)]
576 ["Collect terms in (1:)" 576 ["Collect terms in (1:)"
577 (progn 577 (progn
578 (require 'calc-alg) 578 (require 'calc-alg)
579 (call-interactively 'calc-collect)) 579 (call-interactively 'calc-collect))
580 :keys "a c" 580 :keys "a c"
581 :active (>= (calc-stack-size) 1) 581 :active (>= (calc-stack-size) 1)
582 :help "Arrange as a polynomial in a given variable"] 582 :help "Arrange as a polynomial in a given variable"]
583 ["Expand (1:)" 583 ["Expand (1:)"
584 (progn 584 (progn
585 (require 'calc-alg) 585 (require 'calc-alg)
586 (call-interactively 'calc-expand)) 586 (call-interactively 'calc-expand))
587 :keys "a x" 587 :keys "a x"
588 :active (>= (calc-stack-size) 1) 588 :active (>= (calc-stack-size) 1)
589 :help "Apply distributive law everywhere"] 589 :help "Apply distributive law everywhere"]
590 ["Find roots of (1:)" 590 ["Find roots of (1:)"
591 (progn 591 (progn
592 (require 'calcalg2) 592 (require 'calcalg2)
593 (call-interactively 'calc-poly-roots)) 593 (call-interactively 'calc-poly-roots))
594 :keys "a P" 594 :keys "a P"
595 :active (>= (calc-stack-size) 1)]) 595 :active (>= (calc-stack-size) 1)])
596 (list "Calculus" 596 (list "Calculus"
597 ["Differentiate (1:)" 597 ["Differentiate (1:)"
598 (progn 598 (progn
599 (require 'calcalg2) 599 (require 'calcalg2)
600 (call-interactively 'calc-derivative)) 600 (call-interactively 'calc-derivative))
601 :keys "a d" 601 :keys "a d"
602 :active (>= (calc-stack-size) 1)] 602 :active (>= (calc-stack-size) 1)]
603 ["Integrate (1:) [indefinite]" 603 ["Integrate (1:) [indefinite]"
604 (progn 604 (progn
605 (require 'calcalg2) 605 (require 'calcalg2)
606 (call-interactively 'calc-integral)) 606 (call-interactively 'calc-integral))
607 :keys "a i" 607 :keys "a i"
608 :active (>= (calc-stack-size) 1)] 608 :active (>= (calc-stack-size) 1)]
609 ["Integrate (1:) [definite]" 609 ["Integrate (1:) [definite]"
610 (progn 610 (progn
611 (require 'calcalg2) 611 (require 'calcalg2)
612 (let ((var (read-string "Integration variable: "))) 612 (let ((var (read-string "Integration variable: ")))
613 (calc-tabular-command 'calcFunc-integ "Integration" 613 (calc-tabular-command 'calcFunc-integ "Integration"
614 "intg" nil var nil nil))) 614 "intg" nil var nil nil)))
615 :keys "C-u a i" 615 :keys "C-u a i"
616 :active (>= (calc-stack-size) 1)] 616 :active (>= (calc-stack-size) 1)]
@@ -621,20 +621,20 @@
621 :keys "a I" 621 :keys "a I"
622 :active (>= (calc-stack-size) 1) 622 :active (>= (calc-stack-size) 1)
623 :help "Integrate using the open Romberg method"] 623 :help "Integrate using the open Romberg method"]
624 ["Taylor expand (1:)" 624 ["Taylor expand (1:)"
625 (progn 625 (progn
626 (require 'calcalg2) 626 (require 'calcalg2)
627 (call-interactively 'calc-taylor)) 627 (call-interactively 'calc-taylor))
628 :keys "a t" 628 :keys "a t"
629 :active (>= (calc-stack-size) 1)] 629 :active (>= (calc-stack-size) 1)]
630 ["Minimize (2:) [initial guess = (1:)]" 630 ["Minimize (2:) [initial guess = (1:)]"
631 (progn 631 (progn
632 (require 'calcalg3) 632 (require 'calcalg3)
633 (call-interactively 'calc-find-minimum)) 633 (call-interactively 'calc-find-minimum))
634 :keys "a N" 634 :keys "a N"
635 :active (>= (calc-stack-size) 2) 635 :active (>= (calc-stack-size) 2)
636 :help "Find a local minimum"] 636 :help "Find a local minimum"]
637 ["Maximize (2:) [initial guess = (1:)]" 637 ["Maximize (2:) [initial guess = (1:)]"
638 (progn 638 (progn
639 (require 'calcalg3) 639 (require 'calcalg3)
640 (call-interactively 'calc-find-maximum)) 640 (call-interactively 'calc-find-maximum))
@@ -642,26 +642,26 @@
642 :active (>= (calc-stack-size) 2) 642 :active (>= (calc-stack-size) 2)
643 :help "Find a local maximum"]) 643 :help "Find a local maximum"])
644 (list "Solving" 644 (list "Solving"
645 ["Solve equation (1:)" 645 ["Solve equation (1:)"
646 (progn 646 (progn
647 (require 'calcalg2) 647 (require 'calcalg2)
648 (call-interactively 'calc-solve-for)) 648 (call-interactively 'calc-solve-for))
649 :keys "a S" 649 :keys "a S"
650 :active (>= (calc-stack-size) 1)] 650 :active (>= (calc-stack-size) 1)]
651 ["Solve equation (2:) numerically [initial guess = (1:)]" 651 ["Solve equation (2:) numerically [initial guess = (1:)]"
652 (progn 652 (progn
653 (require 'calcalg3) 653 (require 'calcalg3)
654 (call-interactively 'calc-find-root)) 654 (call-interactively 'calc-find-root))
655 :keys "a R" 655 :keys "a R"
656 :active (>= (calc-stack-size) 2)] 656 :active (>= (calc-stack-size) 2)]
657 ["Find roots of polynomial (1:)" 657 ["Find roots of polynomial (1:)"
658 (progn 658 (progn
659 (require 'calcalg2) 659 (require 'calcalg2)
660 (call-interactively 'calc-poly-roots)) 660 (call-interactively 'calc-poly-roots))
661 :keys "a P" 661 :keys "a P"
662 :active (>= (calc-stack-size) 1)]) 662 :active (>= (calc-stack-size) 1)])
663 (list "Curve Fitting" 663 (list "Curve Fitting"
664 ["Fit (1:)=[x values, y values] to a curve" 664 ["Fit (1:)=[x values, y values] to a curve"
665 (progn 665 (progn
666 (require 'calcalg3) 666 (require 'calcalg3)
667 (call-interactively 'calc-curve-fit)) 667 (call-interactively 'calc-curve-fit))
@@ -675,13 +675,13 @@
675 675
676(defvar calc-graphics-menu 676(defvar calc-graphics-menu
677 (list "Graphics" 677 (list "Graphics"
678 ["Graph 2D [(1:)= y values, (2:)= x values]" 678 ["Graph 2D [(1:)= y values, (2:)= x values]"
679 (progn 679 (progn
680 (require 'calc-graph) 680 (require 'calc-graph)
681 (call-interactively 'calc-graph-fast)) 681 (call-interactively 'calc-graph-fast))
682 :keys "g f" 682 :keys "g f"
683 :active (>= (calc-stack-size) 2)] 683 :active (>= (calc-stack-size) 2)]
684 ["Graph 3D [(1:)= z values, (2:)= y values, (3:)= x values]" 684 ["Graph 3D [(1:)= z values, (2:)= y values, (3:)= x values]"
685 (progn 685 (progn
686 (require 'calc-graph) 686 (require 'calc-graph)
687 (call-interactively 'calc-graph-fast-3d)) 687 (call-interactively 'calc-graph-fast-3d))
@@ -696,11 +696,11 @@
696(defvar calc-vectors-menu 696(defvar calc-vectors-menu
697 (list "Matrices/Vectors" 697 (list "Matrices/Vectors"
698 (list "Matrices" 698 (list "Matrices"
699 ["(2:) + (1:)" calc-plus 699 ["(2:) + (1:)" calc-plus
700 :keys "+" :active (>= (calc-stack-size) 2)] 700 :keys "+" :active (>= (calc-stack-size) 2)]
701 ["(2:) - (1:)" calc-minus 701 ["(2:) - (1:)" calc-minus
702 :keys "-" :active (>= (calc-stack-size) 2)] 702 :keys "-" :active (>= (calc-stack-size) 2)]
703 ["(2:) * (1:)" calc-times 703 ["(2:) * (1:)" calc-times
704 :keys "*" :active (>= (calc-stack-size) 2)] 704 :keys "*" :active (>= (calc-stack-size) 2)]
705 ["(1:)^(-1)" 705 ["(1:)^(-1)"
706 (progn 706 (progn
@@ -709,17 +709,17 @@
709 :keys "&" 709 :keys "&"
710 :active (>= (calc-stack-size) 1)] 710 :active (>= (calc-stack-size) 1)]
711 ["Create an identity matrix" 711 ["Create an identity matrix"
712 (progn 712 (progn
713 (require 'calc-vec) 713 (require 'calc-vec)
714 (call-interactively 'calc-ident)) 714 (call-interactively 'calc-ident))
715 :keys "v i"] 715 :keys "v i"]
716 ["transpose(1:)" 716 ["transpose(1:)"
717 (progn 717 (progn
718 (require 'calc-vec) 718 (require 'calc-vec)
719 (call-interactively 'calc-transpose)) 719 (call-interactively 'calc-transpose))
720 :keys "v t" 720 :keys "v t"
721 :active (>= (calc-stack-size) 1)] 721 :active (>= (calc-stack-size) 1)]
722 ["det(1:)" 722 ["det(1:)"
723 (progn 723 (progn
724 (require 'calc-mtx) 724 (require 'calc-mtx)
725 (call-interactively 'calc-mdet)) 725 (call-interactively 'calc-mdet))
@@ -731,19 +731,19 @@
731 (call-interactively 'calc-mtrace)) 731 (call-interactively 'calc-mtrace))
732 :keys "V T" 732 :keys "V T"
733 :active (>= (calc-stack-size) 1)] 733 :active (>= (calc-stack-size) 1)]
734 ["LUD decompose (1:)" 734 ["LUD decompose (1:)"
735 (progn 735 (progn
736 (require 'calc-mtx) 736 (require 'calc-mtx)
737 (call-interactively 'calc-mlud)) 737 (call-interactively 'calc-mlud))
738 :keys "V L" 738 :keys "V L"
739 :active (>= (calc-stack-size) 1)] 739 :active (>= (calc-stack-size) 1)]
740 ["Extract a row from (1:)" 740 ["Extract a row from (1:)"
741 (progn 741 (progn
742 (require 'calc-vec) 742 (require 'calc-vec)
743 (call-interactively 'calc-mrow)) 743 (call-interactively 'calc-mrow))
744 :keys "v r" 744 :keys "v r"
745 :active (>= (calc-stack-size) 1)] 745 :active (>= (calc-stack-size) 1)]
746 ["Extract a column from (1:)" 746 ["Extract a column from (1:)"
747 (progn 747 (progn
748 (require 'calc-vec) 748 (require 'calc-vec)
749 (call-interactively 'calc-mcol)) 749 (call-interactively 'calc-mcol))
@@ -756,13 +756,13 @@
756 (call-interactively 'calc-head)) 756 (call-interactively 'calc-head))
757 :keys "v h" 757 :keys "v h"
758 :active (>= (calc-stack-size) 1)] 758 :active (>= (calc-stack-size) 1)]
759 ["Extract an element from (1:)" 759 ["Extract an element from (1:)"
760 (progn 760 (progn
761 (require 'calc-vec) 761 (require 'calc-vec)
762 (call-interactively 'calc-mrow)) 762 (call-interactively 'calc-mrow))
763 :keys "v r" 763 :keys "v r"
764 :active (>= (calc-stack-size) 1)] 764 :active (>= (calc-stack-size) 1)]
765 ["Reverse (1:)" 765 ["Reverse (1:)"
766 (progn 766 (progn
767 (require 'calc-vec) 767 (require 'calc-vec)
768 (call-interactively 'calc-reverse-vector)) 768 (call-interactively 'calc-reverse-vector))
@@ -775,19 +775,19 @@
775 :keys "v u" 775 :keys "v u"
776 :active (>= (calc-stack-size) 1) 776 :active (>= (calc-stack-size) 1)
777 :help "Separate the elements of (1:)"] 777 :help "Separate the elements of (1:)"]
778 ["(2:) cross (1:)" 778 ["(2:) cross (1:)"
779 (progn 779 (progn
780 (require 'calc-vec) 780 (require 'calc-vec)
781 (call-interactively 'calc-cross)) 781 (call-interactively 'calc-cross))
782 :keys "V C" 782 :keys "V C"
783 :active (>= (calc-stack-size) 2) 783 :active (>= (calc-stack-size) 2)
784 :help "The cross product in R^3"] 784 :help "The cross product in R^3"]
785 ["(2:) dot (1:)" 785 ["(2:) dot (1:)"
786 calc-mult 786 calc-mult
787 :keys "*" 787 :keys "*"
788 :active (>= (calc-stack-size) 2) 788 :active (>= (calc-stack-size) 2)
789 :help "The dot product"] 789 :help "The dot product"]
790 ["Map a function across (1:)" 790 ["Map a function across (1:)"
791 (progn 791 (progn
792 (require 'calc-map) 792 (require 'calc-map)
793 (call-interactively 'calc-map)) 793 (call-interactively 'calc-map))
@@ -795,25 +795,25 @@
795 :active (>= (calc-stack-size) 1) 795 :active (>= (calc-stack-size) 1)
796 :help "Apply a function to each element"]) 796 :help "Apply a function to each element"])
797 (list "Vectors As Sets" 797 (list "Vectors As Sets"
798 ["Remove duplicates from (1:)" 798 ["Remove duplicates from (1:)"
799 (progn 799 (progn
800 (require 'calc-vec) 800 (require 'calc-vec)
801 (call-interactively 'calc-remove-duplicates)) 801 (call-interactively 'calc-remove-duplicates))
802 :keys "V +" 802 :keys "V +"
803 :active (>= (calc-stack-size) 1)] 803 :active (>= (calc-stack-size) 1)]
804 ["(2:) union (1:)" 804 ["(2:) union (1:)"
805 (progn 805 (progn
806 (require 'calc-vec) 806 (require 'calc-vec)
807 (call-interactively 'calc-set-union)) 807 (call-interactively 'calc-set-union))
808 :keys "V V" 808 :keys "V V"
809 :active (>= (calc-stack-size) 2)] 809 :active (>= (calc-stack-size) 2)]
810 ["(2:) intersect (1:)" 810 ["(2:) intersect (1:)"
811 (progn 811 (progn
812 (require 'calc-vec) 812 (require 'calc-vec)
813 (call-interactively 'calc-set-intersect)) 813 (call-interactively 'calc-set-intersect))
814 :keys "V ^" 814 :keys "V ^"
815 :active (>= (calc-stack-size) 2)] 815 :active (>= (calc-stack-size) 2)]
816 ["(2:) \\ (1:)" 816 ["(2:) \\ (1:)"
817 (progn 817 (progn
818 (require 'calc-vec) 818 (require 'calc-vec)
819 (call-interactively 'calc-set-difference)) 819 (call-interactively 'calc-set-difference))
@@ -821,35 +821,35 @@
821 :help "Set difference" 821 :help "Set difference"
822 :active (>= (calc-stack-size) 2)]) 822 :active (>= (calc-stack-size) 2)])
823 (list "Statistics On Vectors" 823 (list "Statistics On Vectors"
824 ["length(1:)" 824 ["length(1:)"
825 (progn 825 (progn
826 (require 'calc-stat) 826 (require 'calc-stat)
827 (call-interactively 'calc-vector-count)) 827 (call-interactively 'calc-vector-count))
828 :keys "u #" 828 :keys "u #"
829 :active (>= (calc-stack-size) 1) 829 :active (>= (calc-stack-size) 1)
830 :help "The number of data values"] 830 :help "The number of data values"]
831 ["sum(1:)" 831 ["sum(1:)"
832 (progn 832 (progn
833 (require 'calc-stat) 833 (require 'calc-stat)
834 (call-interactively 'calc-vector-sum)) 834 (call-interactively 'calc-vector-sum))
835 :keys "u +" 835 :keys "u +"
836 :active (>= (calc-stack-size) 1) 836 :active (>= (calc-stack-size) 1)
837 :help "The sum of the data values"] 837 :help "The sum of the data values"]
838 ["max(1:)" 838 ["max(1:)"
839 (progn 839 (progn
840 (require 'calc-stat) 840 (require 'calc-stat)
841 (call-interactively 'calc-vector-max)) 841 (call-interactively 'calc-vector-max))
842 :keys "u x" 842 :keys "u x"
843 :active (>= (calc-stack-size) 1) 843 :active (>= (calc-stack-size) 1)
844 :help "The maximum of the data values"] 844 :help "The maximum of the data values"]
845 ["min(1:)" 845 ["min(1:)"
846 (progn 846 (progn
847 (require 'calc-stat) 847 (require 'calc-stat)
848 (call-interactively 'calc-vector-min)) 848 (call-interactively 'calc-vector-min))
849 :keys "u N" 849 :keys "u N"
850 :active (>= (calc-stack-size) 1) 850 :active (>= (calc-stack-size) 1)
851 :help "The minumum of the data values"] 851 :help "The minimum of the data values"]
852 ["mean(1:)" 852 ["mean(1:)"
853 (progn 853 (progn
854 (require 'calc-stat) 854 (require 'calc-stat)
855 (call-interactively 'calc-vector-mean)) 855 (call-interactively 'calc-vector-mean))
@@ -863,28 +863,28 @@
863 :keys "I u M" 863 :keys "I u M"
864 :active (>= (calc-stack-size) 1) 864 :active (>= (calc-stack-size) 1)
865 :help "The average (arithmetic mean) of the data values as an error form"] 865 :help "The average (arithmetic mean) of the data values as an error form"]
866 ["sdev(1:)" 866 ["sdev(1:)"
867 (progn 867 (progn
868 (require 'calc-stat) 868 (require 'calc-stat)
869 (call-interactively 'calc-vector-sdev)) 869 (call-interactively 'calc-vector-sdev))
870 :keys "u S" 870 :keys "u S"
871 :active (>= (calc-stack-size) 1) 871 :active (>= (calc-stack-size) 1)
872 :help "The sample sdev, sqrt[sum((values - mean)^2)/(N-1)]"] 872 :help "The sample sdev, sqrt[sum((values - mean)^2)/(N-1)]"]
873 ["variance(1:)" 873 ["variance(1:)"
874 (progn 874 (progn
875 (require 'calc-stat) 875 (require 'calc-stat)
876 (call-interactively 'calc-vector-variance)) 876 (call-interactively 'calc-vector-variance))
877 :keys "H u S" 877 :keys "H u S"
878 :active (>= (calc-stack-size) 1) 878 :active (>= (calc-stack-size) 1)
879 :help "The sample variance, sum((values - mean)^2)/(N-1)"] 879 :help "The sample variance, sum((values - mean)^2)/(N-1)"]
880 ["population sdev(1:)" 880 ["population sdev(1:)"
881 (progn 881 (progn
882 (require 'calc-stat) 882 (require 'calc-stat)
883 (call-interactively 'calc-vector-pop-sdev)) 883 (call-interactively 'calc-vector-pop-sdev))
884 :keys "I u S" 884 :keys "I u S"
885 :active (>= (calc-stack-size) 1) 885 :active (>= (calc-stack-size) 1)
886 :help "The population sdev, sqrt[sum((values - mean)^2)/N]"] 886 :help "The population sdev, sqrt[sum((values - mean)^2)/N]"]
887 ["population variance(1:)" 887 ["population variance(1:)"
888 (progn 888 (progn
889 (require 'calc-stat) 889 (require 'calc-stat)
890 (call-interactively 'calc-vector-pop-variance)) 890 (call-interactively 'calc-vector-pop-variance))
@@ -937,25 +937,25 @@
937 937
938(defvar calc-units-menu 938(defvar calc-units-menu
939 (list "Units" 939 (list "Units"
940 ["Convert units in (1:)" 940 ["Convert units in (1:)"
941 (progn 941 (progn
942 (require 'calc-units) 942 (require 'calc-units)
943 (call-interactively 'calc-convert-units )) 943 (call-interactively 'calc-convert-units ))
944 :keys "u c" 944 :keys "u c"
945 :active (>= (calc-stack-size) 1)] 945 :active (>= (calc-stack-size) 1)]
946 ["Convert temperature in (1:)" 946 ["Convert temperature in (1:)"
947 (progn 947 (progn
948 (require 'calc-units) 948 (require 'calc-units)
949 (call-interactively 'calc-convert-temperature)) 949 (call-interactively 'calc-convert-temperature))
950 :keys "u t" 950 :keys "u t"
951 :active (>= (calc-stack-size) 1)] 951 :active (>= (calc-stack-size) 1)]
952 ["Simplify units in (1:)" 952 ["Simplify units in (1:)"
953 (progn 953 (progn
954 (require 'calc-units) 954 (require 'calc-units)
955 (call-interactively 'calc-simplify-units)) 955 (call-interactively 'calc-simplify-units))
956 :keys "u s" 956 :keys "u s"
957 :active (>= (calc-stack-size) 1)] 957 :active (>= (calc-stack-size) 1)]
958 ["View units table" 958 ["View units table"
959 (progn 959 (progn
960 (require 'calc-units) 960 (require 'calc-units)
961 (call-interactively 'calc-view-units-table)) 961 (call-interactively 'calc-view-units-table))
@@ -1072,40 +1072,40 @@
1072 1072
1073(defvar calc-variables-menu 1073(defvar calc-variables-menu
1074 (list "Variables" 1074 (list "Variables"
1075 ["Store (1:) into a variable" 1075 ["Store (1:) into a variable"
1076 (progn 1076 (progn
1077 (require 'calc-store) 1077 (require 'calc-store)
1078 (call-interactively 'calc-store)) 1078 (call-interactively 'calc-store))
1079 :keys "s s" 1079 :keys "s s"
1080 :active (>= (calc-stack-size) 1)] 1080 :active (>= (calc-stack-size) 1)]
1081 ["Recall a variable value" 1081 ["Recall a variable value"
1082 (progn 1082 (progn
1083 (require 'calc-store) 1083 (require 'calc-store)
1084 (call-interactively 'calc-recall )) 1084 (call-interactively 'calc-recall ))
1085 :keys "s r"] 1085 :keys "s r"]
1086 ["Edit the value of a variable" 1086 ["Edit the value of a variable"
1087 (progn 1087 (progn
1088 (require 'calc-store) 1088 (require 'calc-store)
1089 (call-interactively 'calc-edit-variable)) 1089 (call-interactively 'calc-edit-variable))
1090 :keys "s e"] 1090 :keys "s e"]
1091 ["Exchange (1:) with a variable value" 1091 ["Exchange (1:) with a variable value"
1092 (progn 1092 (progn
1093 (require 'calc-store) 1093 (require 'calc-store)
1094 (call-interactively 'calc-store-exchange)) 1094 (call-interactively 'calc-store-exchange))
1095 :keys "s x" 1095 :keys "s x"
1096 :active (>= (calc-stack-size) 1)] 1096 :active (>= (calc-stack-size) 1)]
1097 ["Clear variable value" 1097 ["Clear variable value"
1098 (progn 1098 (progn
1099 (require 'calc-store) 1099 (require 'calc-store)
1100 (call-interactively 'calc-unstore)) 1100 (call-interactively 'calc-unstore))
1101 :keys "s u"] 1101 :keys "s u"]
1102 ["Evaluate variables in (1:)" 1102 ["Evaluate variables in (1:)"
1103 (progn 1103 (progn
1104 (require 'calc-ext) 1104 (require 'calc-ext)
1105 (call-interactively 'calc-evaluate)) 1105 (call-interactively 'calc-evaluate))
1106 :keys "=" 1106 :keys "="
1107 :active (>= (calc-stack-size) 1)] 1107 :active (>= (calc-stack-size) 1)]
1108 ["Evaluate (1:), assigning a value to a variable" 1108 ["Evaluate (1:), assigning a value to a variable"
1109 (progn 1109 (progn
1110 (require 'calc-store) 1110 (require 'calc-store)
1111 (call-interactively 'calc-let)) 1111 (call-interactively 'calc-let))
@@ -1119,19 +1119,19 @@
1119 1119
1120(defvar calc-stack-menu 1120(defvar calc-stack-menu
1121 (list "Stack" 1121 (list "Stack"
1122 ["Remove (1:)" 1122 ["Remove (1:)"
1123 calc-pop 1123 calc-pop
1124 :keys "DEL" 1124 :keys "DEL"
1125 :active (>= (calc-stack-size) 1)] 1125 :active (>= (calc-stack-size) 1)]
1126 ["Switch (1:) and (2:)" 1126 ["Switch (1:) and (2:)"
1127 calc-roll-down 1127 calc-roll-down
1128 :keys "TAB" 1128 :keys "TAB"
1129 :active (>= (calc-stack-size) 2)] 1129 :active (>= (calc-stack-size) 2)]
1130 ["Duplicate (1:)" 1130 ["Duplicate (1:)"
1131 calc-enter 1131 calc-enter
1132 :keys "RET" 1132 :keys "RET"
1133 :active (>= (calc-stack-size) 1)] 1133 :active (>= (calc-stack-size) 1)]
1134 ["Edit (1:)" 1134 ["Edit (1:)"
1135 (progn 1135 (progn
1136 (require 'calc-yank) 1136 (require 'calc-yank)
1137 (call-interactively calc-edit)) 1137 (call-interactively calc-edit))
@@ -1144,12 +1144,12 @@
1144 1144
1145(defvar calc-errors-menu 1145(defvar calc-errors-menu
1146 (list "Undo" 1146 (list "Undo"
1147 ["Undo" 1147 ["Undo"
1148 (progn 1148 (progn
1149 (require 'calc-undo) 1149 (require 'calc-undo)
1150 (call-interactively 'calc-undo)) 1150 (call-interactively 'calc-undo))
1151 :keys "U"] 1151 :keys "U"]
1152 ["Redo" 1152 ["Redo"
1153 (progn 1153 (progn
1154 (require 'calc-undo) 1154 (require 'calc-undo)
1155 (call-interactively 'calc-redo)) 1155 (call-interactively 'calc-redo))
@@ -1162,7 +1162,7 @@
1162 1162
1163(defvar calc-modes-menu 1163(defvar calc-modes-menu
1164 (list "Modes" 1164 (list "Modes"
1165 ["Precision" 1165 ["Precision"
1166 (progn 1166 (progn
1167 (require 'calc-ext) 1167 (require 'calc-ext)
1168 (call-interactively 'calc-precision)) 1168 (call-interactively 'calc-precision))
@@ -1277,7 +1277,7 @@
1277 ["Binary" 1277 ["Binary"
1278 (progn 1278 (progn
1279 (require 'calc-bin) 1279 (require 'calc-bin)
1280 (call-interactively 1280 (call-interactively
1281 (lambda () (interactive) (calc-binary-radix t)))) 1281 (lambda () (interactive) (calc-binary-radix t))))
1282 :keys "C-u d 2" 1282 :keys "C-u d 2"
1283 :style radio 1283 :style radio
@@ -1330,7 +1330,7 @@
1330 :keys "d e" 1330 :keys "d e"
1331 :style radio 1331 :style radio
1332 :selected (eq (car-safe calc-float-format) 'eng)]) 1332 :selected (eq (car-safe calc-float-format) 'eng)])
1333 (list "Complex Format" 1333 (list "Complex Format"
1334 ["Default" 1334 ["Default"
1335 (progn 1335 (progn
1336 (require 'calc-cplx) 1336 (require 'calc-cplx)
@@ -1522,17 +1522,17 @@
1522 1522
1523(defvar calc-help-menu 1523(defvar calc-help-menu
1524 (list "Help" 1524 (list "Help"
1525 ["Manual" 1525 ["Manual"
1526 calc-info 1526 calc-info
1527 :keys "h i"] 1527 :keys "h i"]
1528 ["Tutorial" 1528 ["Tutorial"
1529 calc-tutorial 1529 calc-tutorial
1530 :keys "h t"] 1530 :keys "h t"]
1531 ["Summary" 1531 ["Summary"
1532 calc-info-summary 1532 calc-info-summary
1533 :keys "h s"] 1533 :keys "h s"]
1534 "----" 1534 "----"
1535 ["Help on Help" 1535 ["Help on Help"
1536 (progn 1536 (progn
1537 (calc-info-goto-node "Introduction") 1537 (calc-info-goto-node "Introduction")
1538 (Info-goto-node "Help Commands"))]) 1538 (Info-goto-node "Help Commands"))])
@@ -1557,7 +1557,7 @@
1557 calc-errors-menu 1557 calc-errors-menu
1558 calc-modes-menu 1558 calc-modes-menu
1559 calc-help-menu 1559 calc-help-menu
1560 ["Reset" 1560 ["Reset"
1561 (progn 1561 (progn
1562 (require 'calc-ext) 1562 (require 'calc-ext)
1563 (call-interactively 'calc-reset)) 1563 (call-interactively 'calc-reset))
@@ -1565,4 +1565,3 @@
1565 ["Quit" calc-quit])) 1565 ["Quit" calc-quit]))
1566 1566
1567(provide 'calc-menu) 1567(provide 'calc-menu)
1568
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 @@
131 val)) 131 val))
132 val)))))))) 132 val))))))))
133 133
134;;; The Calc set- and get-register commands are modified versions of functions 134;;; The Calc set- and get-register commands are modified versions of functions
135;;; in register.el 135;;; in register.el
136 136
137(defvar calc-register-alist nil 137(defvar calc-register-alist nil
@@ -206,7 +206,7 @@ With prefix arg, delete as well."
206 206
207(defun calc-add-to-register (register start end prepend delete-flag) 207(defun calc-add-to-register (register start end prepend delete-flag)
208 "Add the lines in the region to register REGISTER. 208 "Add the lines in the region to register REGISTER.
209If PREPEND is non-nil, add them to the beginning of the register, 209If PREPEND is non-nil, add them to the beginning of the register,
210otherwise the end. If DELETE-FLAG is non-nil, also delete the region." 210otherwise the end. If DELETE-FLAG is non-nil, also delete the region."
211 (let* ((top-num (calc-locate-cursor-element start)) 211 (let* ((top-num (calc-locate-cursor-element start))
212 (top-pos (save-excursion 212 (top-pos (save-excursion
@@ -242,7 +242,7 @@ With prefix arg, also delete the region."
242 (if (eq major-mode 'calc-mode) 242 (if (eq major-mode 'calc-mode)
243 (calc-add-to-register register start end nil delete-flag) 243 (calc-add-to-register register start end nil delete-flag)
244 (append-to-register register start end delete-flag))) 244 (append-to-register register start end delete-flag)))
245 245
246(defun calc-prepend-to-register (register start end &optional delete-flag) 246(defun calc-prepend-to-register (register start end &optional delete-flag)
247 "Copy the lines in the region to the beginning of register REGISTER. 247 "Copy the lines in the region to the beginning of register REGISTER.
248With prefix arg, also delete the region." 248With prefix arg, also delete the region."
@@ -250,7 +250,7 @@ With prefix arg, also delete the region."
250 (if (eq major-mode 'calc-mode) 250 (if (eq major-mode 'calc-mode)
251 (calc-add-to-register register start end t delete-flag) 251 (calc-add-to-register register start end t delete-flag)
252 (prepend-to-register register start end delete-flag))) 252 (prepend-to-register register start end delete-flag)))
253 253
254 254
255 255
256(defun calc-clean-newlines (s) 256(defun calc-clean-newlines (s)
@@ -585,12 +585,12 @@ To cancel the edit, simply kill the *Calc Edit* buffer."
585 (setq calc-allow-ret allow-ret) 585 (setq calc-allow-ret allow-ret)
586 (let ((inhibit-read-only t)) 586 (let ((inhibit-read-only t))
587 (erase-buffer)) 587 (erase-buffer))
588 (add-hook 'kill-buffer-hook (lambda () 588 (add-hook 'kill-buffer-hook (lambda ()
589 (let ((calc-edit-handler nil)) 589 (let ((calc-edit-handler nil))
590 (calc-edit-finish t)) 590 (calc-edit-finish t))
591 (message "(Cancelled)")) t t) 591 (message "(Cancelled)")) t t)
592 (insert (propertize 592 (insert (propertize
593 (concat 593 (concat
594 (or title title "Calc Edit Mode. ") 594 (or title title "Calc Edit Mode. ")
595 "Press `C-c C-c'" 595 "Press `C-c C-c'"
596 (if allow-ret "" " or RET") 596 (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."
81 81
82(defcustom calculator-prompt "Calc=%s> " 82(defcustom calculator-prompt "Calc=%s> "
83 "The prompt used by the Emacs calculator. 83 "The prompt used by the Emacs calculator.
84It should contain a \"%s\" somewhere that will indicate the i/o radixes; 84It should contain a \"%s\" somewhere that will indicate the i/o radices;
85this will be a two-character string as described in the documentation 85this will be a two-character string as described in the documentation
86for `calculator-mode'." 86for `calculator-mode'."
87 :type 'string 87 :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.
508Optional argument WARNTIME is an integer (or string) giving the number 508Optional argument WARNTIME is an integer (or string) giving the number
509of minutes before the appointment at which to start warning. 509of minutes before the appointment at which to start warning.
510The default is `appt-message-warning-time'." 510The default is `appt-message-warning-time'."
511 (interactive "sTime (hh:mm[am/pm]): \nsMessage: 511 (interactive "sTime (hh:mm[am/pm]): \nsMessage:
512sMinutes before the appointment to start warning: ") 512sMinutes before the appointment to start warning: ")
513 (unless (string-match appt-time-regexp time) 513 (unless (string-match appt-time-regexp time)
514 (error "Unacceptable time-string")) 514 (error "Unacceptable time-string"))
@@ -521,7 +521,7 @@ sMinutes before the appointment to start warning: ")
521 (or appt-timer (appt-activate)) 521 (or appt-timer (appt-activate))
522 (let ((time-msg (list (list (appt-convert-time time)) 522 (let ((time-msg (list (list (appt-convert-time time))
523 (concat time " " msg) t))) 523 (concat time " " msg) t)))
524 ;; It is presently non-sensical to have multiple warnings about 524 ;; It is presently nonsensical to have multiple warnings about
525 ;; the same appointment with just different delays, but it might 525 ;; the same appointment with just different delays, but it might
526 ;; not always be so. TODO 526 ;; not always be so. TODO
527 (if warntime (setq time-msg (append time-msg (list warntime)))) 527 (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."
199 (= v1-1 v2-1) 199 (= v1-1 v2-1)
200 (= v1-2 v2-2) 200 (= v1-2 v2-2)
201 (= v1-3 v2-3) 201 (= v1-3 v2-3)
202 v1-4 v2-4 ; all or nothin if elt - is = 202 v1-4 v2-4 ; all or nothing if elt - is =
203 (< v1-4 v2-4)) 203 (< v1-4 v2-4))
204 (and (= v1-0 v2-0) 204 (and (= v1-0 v2-0)
205 (= v1-1 v2-1) 205 (= v1-1 v2-1)
206 (= v1-2 v2-2) 206 (= v1-2 v2-2)
207 v1-3 v2-3 ; all or nothin if elt - is = 207 v1-3 v2-3 ; all or nothing if elt - is =
208 (< v1-3 v2-3)) 208 (< v1-3 v2-3))
209 (and (= v1-1 v2-1) 209 (and (= v1-1 v2-1)
210 (< v1-2 v2-2)) 210 (< 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."
680 (save-excursion (semantic-fetch-tags)) 680 (save-excursion (semantic-fetch-tags))
681 nil) 681 nil)
682 ;; If we are here, it is because the lexical step failed, 682 ;; If we are here, it is because the lexical step failed,
683 ;; proably due to unterminated lists or something like that. 683 ;; probably due to unterminated lists or something like that.
684 684
685 ;; We do nothing, and just wait for the next idle timer 685 ;; We do nothing, and just wait for the next idle timer
686 ;; to go off. In the meantime, remember this, and make sure 686 ;; 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."
859 (setq cacheend chil) 859 (setq cacheend chil)
860 (while (and cacheend (not (eq last (car cacheend)))) 860 (while (and cacheend (not (eq last (car cacheend))))
861 (setq cacheend (cdr cacheend))) 861 (setq cacheend (cdr cacheend)))
862 ;; The splicable part is after cacheend.. so move cacheend 862 ;; The spliceable part is after cacheend.. so move cacheend
863 ;; one more tag. 863 ;; one more tag.
864 (setq cacheend (cdr cacheend)) 864 (setq cacheend (cdr cacheend))
865 ;; Splice the found end tag into the cons cell 865 ;; 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."
515 (save-excursion (semantic-fetch-tags)) 515 (save-excursion (semantic-fetch-tags))
516 nil) 516 nil)
517 ;; If we are here, it is because the lexical step failed, 517 ;; If we are here, it is because the lexical step failed,
518 ;; proably due to unterminated lists or something like that. 518 ;; probably due to unterminated lists or something like that.
519 519
520 ;; We do nothing, and just wait for the next idle timer 520 ;; We do nothing, and just wait for the next idle timer
521 ;; to go off. In the meantime, remember this, and make sure 521 ;; 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."
1248 (if (eq (semantic-lex-token-class (car semantic-lex-token-stream)) 1248 (if (eq (semantic-lex-token-class (car semantic-lex-token-stream))
1249 'whitespace) 1249 'whitespace)
1250 ;; Merge whitespace tokens together if they are adjacent. Two 1250 ;; Merge whitespace tokens together if they are adjacent. Two
1251 ;; whitespace tokens may be sperated by a comment which is not in 1251 ;; whitespace tokens may be separated by a comment which is not in
1252 ;; the token stream. 1252 ;; the token stream.
1253 (setcdr (semantic-lex-token-bounds (car semantic-lex-token-stream)) 1253 (setcdr (semantic-lex-token-bounds (car semantic-lex-token-stream))
1254 (match-end 0)) 1254 (match-end 0))
@@ -1271,7 +1271,7 @@ they are comment end characters)."
1271 (if (eq (semantic-lex-token-class (car semantic-lex-token-stream)) 1271 (if (eq (semantic-lex-token-class (car semantic-lex-token-stream))
1272 'whitespace) 1272 'whitespace)
1273 ;; Merge whitespace tokens together if they are adjacent. Two 1273 ;; Merge whitespace tokens together if they are adjacent. Two
1274 ;; whitespace tokens may be sperated by a comment which is not in 1274 ;; whitespace tokens may be separated by a comment which is not in
1275 ;; the token stream. 1275 ;; the token stream.
1276 (progn 1276 (progn
1277 (setq semantic-lex-end-point (match-end 0)) 1277 (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'."
195;;;###autoload 195;;;###autoload
196(define-overloadable-function semantic-tag-prototype-p (tag) 196(define-overloadable-function semantic-tag-prototype-p (tag)
197 "Return non nil if TAG is a prototype. 197 "Return non nil if TAG is a prototype.
198For some laguages, such as C, a prototype is a declaration of 198For some languages, such as C, a prototype is a declaration of
199something without an implementation." 199something without an implementation."
200 ) 200 )
201 201
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.")
324 ) 324 )
325 325
326(defvar srecode-field-replication-max-size 100 326(defvar srecode-field-replication-max-size 100
327 "Maximum size of a field before cancelling replication.") 327 "Maximum size of a field before canceling replication.")
328 328
329(defun srecode-field-mod-hook (ol after start end &optional pre-len) 329(defun srecode-field-mod-hook (ol after start end &optional pre-len)
330 "Modification hook for the field overlay. 330 "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."
206 :group 'columns) 206 :group 'columns)
207 207
208(defcustom delimit-columns-start 0 208(defcustom delimit-columns-start 0
209 "Specify column number to start prettifing. 209 "Specify column number to start prettifying.
210 210
211See also `delimit-columns-end' for documentation. 211See also `delimit-columns-end' for documentation.
212 212
@@ -221,7 +221,7 @@ column (column 0) is located at left corner."
221 :group 'columns) 221 :group 'columns)
222 222
223(defcustom delimit-columns-end 1000000 223(defcustom delimit-columns-end 1000000
224 "Specify column number to end prettifing. 224 "Specify column number to end prettifying.
225 225
226See also `delimit-columns-start' for documentation. 226See also `delimit-columns-start' for documentation.
227 227
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."
144(put 'newline 'delete-selection t) 144(put 'newline 'delete-selection t)
145(put 'open-line 'delete-selection 'kill) 145(put 'open-line 'delete-selection 'kill)
146 146
147;; This is very useful for cancelling a selection in the minibuffer without 147;; This is very useful for canceling a selection in the minibuffer without
148;; aborting the minibuffer. 148;; aborting the minibuffer.
149(defun minibuffer-keyboard-quit () 149(defun minibuffer-keyboard-quit ()
150 "Abort recursive edit. 150 "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'."
358 (compose-string (string ch) 0 1 (format "\t%c\t" ch)) 358 (compose-string (string ch) 0 1 (format "\t%c\t" ch))
359 (string ch))) 359 (string ch)))
360 360
361;; Return a nicely formated list of categories; extended category 361;; Return a nicely formatted list of categories; extended category
362;; description is added to the category name as a tooltip 362;; description is added to the category name as a tooltip
363(defsubst describe-char-categories (category-set) 363(defsubst describe-char-categories (category-set)
364 (let ((mnemonics (category-set-mnemonics category-set))) 364 (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."
1392;; Apparently people do use it. - lrd 12/22/97. 1392;; Apparently people do use it. - lrd 12/22/97.
1393 1393
1394(with-no-warnings 1394(with-no-warnings
1395 ;; Warnings are suppresed to avoid "global/dynamic var `X' lacks a prefix". 1395 ;; Warnings are suppressed to avoid "global/dynamic var `X' lacks a prefix".
1396 ;; This is unbearably ugly, but not more than having global variables 1396 ;; This is unbearably ugly, but not more than having global variables
1397 ;; named size, time, name or s, however practical it can be while writing 1397 ;; named size, time, name or s, however practical it can be while writing
1398 ;; `dired-mark-sexp' predicates. 1398 ;; `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 @@
85 (eq last-input-event ?\C-g)) 85 (eq last-input-event ?\C-g))
86 (progn (setq unread-command-events nil 86 (progn (setq unread-command-events nil
87 prefix-arg nil) 87 prefix-arg nil)
88 ;; If it wasn't cancelling a prefix character, then quit. 88 ;; If it wasn't canceling a prefix character, then quit.
89 (if (or (= (length (this-command-keys)) 1) 89 (if (or (= (length (this-command-keys)) 1)
90 (not inhibit-quit)) ; safety 90 (not inhibit-quit)) ; safety
91 (progn (ding) 91 (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."
3448(defun edebug-on-entry (function &optional flag) 3448(defun edebug-on-entry (function &optional flag)
3449 "Cause Edebug to stop when FUNCTION is called. 3449 "Cause Edebug to stop when FUNCTION is called.
3450With prefix argument, make this temporary so it is automatically 3450With prefix argument, make this temporary so it is automatically
3451cancelled the first time the function is entered." 3451canceled the first time the function is entered."
3452 (interactive "aEdebug on entry to: \nP") 3452 (interactive "aEdebug on entry to: \nP")
3453 ;; Could store this in the edebug data instead. 3453 ;; Could store this in the edebug data instead.
3454 (put function 'edebug-on-entry (if flag 'temp t))) 3454 (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 @@
57 57
58(eval-and-compile 58(eval-and-compile
59;; About the above. EIEIO must process its own code when it compiles 59;; About the above. EIEIO must process its own code when it compiles
60;; itself, thus, by eval-and-compiling outselves, we solve the problem. 60;; itself, thus, by eval-and-compiling ourselves, we solve the problem.
61 61
62;; Compatibility 62;; Compatibility
63(if (fboundp 'compiled-function-arglist) 63(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."
1242 1242
1243 ;; Handle shifted cursor keys and other movement commands. 1243 ;; Handle shifted cursor keys and other movement commands.
1244 ;; If region is not active, region is activated if key is shifted. 1244 ;; If region is not active, region is activated if key is shifted.
1245 ;; If region is active, region is cancelled if key is unshifted 1245 ;; If region is active, region is canceled if key is unshifted
1246 ;; (and region not started with C-SPC). 1246 ;; (and region not started with C-SPC).
1247 ;; If rectangle is active, expand rectangle in specified direction and 1247 ;; If rectangle is active, expand rectangle in specified direction and
1248 ;; ignore the movement. 1248 ;; 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
94global marker is in another buffer. 94global marker is in another buffer.
95If the global marker isn't set, set the global marker at point in the current 95If the global marker isn't set, set the global marker at point in the current
96buffer. Otherwise jump to the global marker position and cancel it. 96buffer. Otherwise jump to the global marker position and cancel it.
97With prefix argument, don't jump to global mark when cancelling it." 97With prefix argument, don't jump to global mark when canceling it."
98 (interactive "P") 98 (interactive "P")
99 (unless cua--global-mark-initialized 99 (unless cua--global-mark-initialized
100 (cua--init-global-mark)) 100 (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")
420 (goto-char (point-min)) 420 (goto-char (point-min))
421 (if (y-or-n-p "Inhibit VIP startup message? ") 421 (if (y-or-n-p "Inhibit VIP startup message? ")
422 (progn 422 (progn
423 (with-current-buffer 423 (with-current-buffer
424 (find-file-noselect 424 (find-file-noselect
425 (substitute-in-file-name vip-startup-file)) 425 (substitute-in-file-name vip-startup-file))
426 (goto-char (point-max)) 426 (goto-char (point-max))
@@ -877,7 +877,7 @@ is the name of the register for COM."
877 (if (> beg end) (exchange-point-and-mark))) 877 (if (> beg end) (exchange-point-and-mark)))
878 878
879(defun vip-global-execute () 879(defun vip-global-execute ()
880 "Call last keyboad macro for each line in the region." 880 "Call last keyboard macro for each line in the region."
881 (if (> (point) (mark)) (exchange-point-and-mark)) 881 (if (> (point) (mark)) (exchange-point-and-mark))
882 (beginning-of-line) 882 (beginning-of-line)
883 (call-last-kbd-macro) 883 (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 @@
716 (error 716 (error
717 (viper-message-conditions conds)))) 717 (viper-message-conditions conds))))
718 718
719;; escape to emacs mode termporarily 719;; escape to emacs mode temporarily
720(defun viper-escape-to-emacs (arg &optional events) 720(defun viper-escape-to-emacs (arg &optional events)
721 "Escape to Emacs state from Vi state for one Emacs command. 721 "Escape to Emacs state from Vi state for one Emacs command.
722ARG is used as the prefix value for the executed command. If 722ARG 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."
726 (message "Switched to EMACS state for the next command...")) 726 (message "Switched to EMACS state for the next command..."))
727 (viper-escape-to-state arg events 'emacs-state)) 727 (viper-escape-to-state arg events 'emacs-state))
728 728
729;; escape to Vi mode termporarily 729;; escape to Vi mode temporarily
730(defun viper-escape-to-vi (arg) 730(defun viper-escape-to-vi (arg)
731 "Escape from Emacs state to Vi state for one Vi 1-character command. 731 "Escape from Emacs state to Vi state for one Vi 1-character command.
732If the Vi command that the user types has a prefix argument, e.g., `d2w', then 732If the Vi command that the user types has a prefix argument, e.g., `d2w', then
@@ -2407,7 +2407,7 @@ problems."
2407 t 'local) 2407 t 'local)
2408 (add-hook 2408 (add-hook
2409 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) 2409 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local)
2410 ;; guard against a smartie who switched from R-replace to normal replace 2410 ;; guard against a smarty who switched from R-replace to normal replace
2411 (remove-hook 2411 (remove-hook
2412 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local) 2412 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local)
2413 (if overwrite-mode (overwrite-mode -1)) 2413 (if overwrite-mode (overwrite-mode -1))
@@ -2531,7 +2531,7 @@ problems."
2531 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local) 2531 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local)
2532 (add-hook 2532 (add-hook
2533 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) 2533 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local)
2534 ;; guard against a smartie who switched from R-replace to normal replace 2534 ;; guard against a smarty who switched from R-replace to normal replace
2535 (remove-hook 2535 (remove-hook
2536 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) 2536 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local)
2537 ) 2537 )
@@ -3767,7 +3767,7 @@ If MAJOR-MODE is set, set the macros only in that major mode."
3767 "//" 'vi-state 3767 "//" 'vi-state
3768 [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] 3768 [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]
3769 scope) 3769 scope)
3770 ;; toggle regexp/vanila search 3770 ;; toggle regexp/vanilla search
3771 (viper-record-kbd-macro 3771 (viper-record-kbd-macro
3772 "///" 'vi-state 3772 "///" 'vi-state
3773 [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] 3773 [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.
3824 "//" 'emacs-state 3824 "//" 'emacs-state
3825 [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] 3825 [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]
3826 (or arg-majormode major-mode)) 3826 (or arg-majormode major-mode))
3827 ;; toggle regexp/vanila search 3827 ;; toggle regexp/vanilla search
3828 (viper-record-kbd-macro 3828 (viper-record-kbd-macro
3829 "///" 'emacs-state 3829 "///" 'emacs-state
3830 [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] 3830 [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."
4017 (setq viper-prefix-commands 4017 (setq viper-prefix-commands
4018 (cons viper-buffer-search-char viper-prefix-commands))) 4018 (cons viper-buffer-search-char viper-prefix-commands)))
4019 4019
4020;; This is a Viper wraper for isearch-forward. 4020;; This is a Viper wrapper for isearch-forward.
4021(defun viper-isearch-forward (arg) 4021(defun viper-isearch-forward (arg)
4022 "Do incremental search forward." 4022 "Do incremental search forward."
4023 (interactive "P") 4023 (interactive "P")
@@ -4025,7 +4025,7 @@ Null string will repeat previous search."
4025 (if (listp arg) (setq arg (car arg))) 4025 (if (listp arg) (setq arg (car arg)))
4026 (viper-exec-form-in-emacs (list 'isearch-forward arg))) 4026 (viper-exec-form-in-emacs (list 'isearch-forward arg)))
4027 4027
4028;; This is a Viper wraper for isearch-backward." 4028;; This is a Viper wrapper for isearch-backward."
4029(defun viper-isearch-backward (arg) 4029(defun viper-isearch-backward (arg)
4030 "Do incremental search backward." 4030 "Do incremental search backward."
4031 (interactive "P") 4031 (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."
818;;; Face-saving tricks 818;;; Face-saving tricks
819 819
820(defgroup viper-highlighting nil 820(defgroup viper-highlighting nil
821 "Hilighting of replace region, search pattern, minibuffer, etc." 821 "Highlighting of replace region, search pattern, minibuffer, etc."
822 :prefix "viper-" 822 :prefix "viper-"
823 :group 'viper) 823 :group 'viper)
824 824
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."
921 921
922 922
923(defun viper-global-execute () 923(defun viper-global-execute ()
924 "Call last keyboad macro for each line in the region." 924 "Call last keyboard macro for each line in the region."
925 (if (> (point) (mark t)) (exchange-point-and-mark)) 925 (if (> (point) (mark t)) (exchange-point-and-mark))
926 (beginning-of-line) 926 (beginning-of-line)
927 (call-last-kbd-macro) 927 (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."
491 ) 491 )
492 "List specifying how to modify the various major modes to enable some Viperisms. 492 "List specifying how to modify the various major modes to enable some Viperisms.
493The list has the structure: ((mode viper-state keymap) (mode viper-state 493The list has the structure: ((mode viper-state keymap) (mode viper-state
494keymap) ...). If `mode' is on the list, the `kemap' will be made active (on 494keymap) ...). If `mode' is on the list, the `keymap' will be made active (on
495the minor-mode-map-alist) in the specified viper state. 495the minor-mode-map-alist) in the specified viper state.
496If you change this list, have to restart Emacs for the change to take effect. 496If you change this list, have to restart Emacs for the change to take effect.
497However, if you did the change through the customization widget, then Emacs 497However, 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."
4866 directory 'full directory-files-no-dot-files-regexp)) 4866 directory 'full directory-files-no-dot-files-regexp))
4867 (error "Directory is not empty, not moving to trash") 4867 (error "Directory is not empty, not moving to trash")
4868 (move-file-to-trash directory))) 4868 (move-file-to-trash directory)))
4869 ;; Otherwise, call outselves recursively if needed. 4869 ;; Otherwise, call ourselves recursively if needed.
4870 (t 4870 (t
4871 (if (and recursive (not (file-symlink-p directory))) 4871 (if (and recursive (not (file-symlink-p directory)))
4872 (mapc (lambda (file) 4872 (mapc (lambda (file)
@@ -6110,7 +6110,7 @@ message to that effect instead of signaling an error."
6110 6110
6111(defvar kill-emacs-query-functions nil 6111(defvar kill-emacs-query-functions nil
6112 "Functions to call with no arguments to query about killing Emacs. 6112 "Functions to call with no arguments to query about killing Emacs.
6113If any of these functions returns nil, killing Emacs is cancelled. 6113If any of these functions returns nil, killing Emacs is canceled.
6114`save-buffers-kill-emacs' calls these functions, but `kill-emacs', 6114`save-buffers-kill-emacs' calls these functions, but `kill-emacs',
6115the low level primitive, does not. See also `kill-emacs-hook'.") 6115the low level primitive, does not. See also `kill-emacs-hook'.")
6116 6116
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."
1129;;{{{ Redisplay 1129;;{{{ Redisplay
1130 1130
1131;; Redraw all the windows on the screen, starting with the top window. 1131;; Redraw all the windows on the screen, starting with the top window.
1132;; The window used as as marker is WIN, or the selcted window if WIN 1132;; The window used as as marker is WIN, or the selected window if WIN
1133;; is nil. Start every window directly after the end of the previous 1133;; is nil. Start every window directly after the end of the previous
1134;; window, to make sure long lines are displayed correctly. 1134;; window, to make sure long lines are displayed correctly.
1135 1135
@@ -1993,7 +1993,7 @@ report this using the `report-emacs-bug' function."
1993;; going to be recentered at the next redisplay, unless we do a 1993;; going to be recentered at the next redisplay, unless we do a
1994;; read-and-write cycle to update the `force' flag inside the windows. 1994;; read-and-write cycle to update the `force' flag inside the windows.
1995;; 1995;;
1996;; In 19.30, a new varible `window-scroll-functions' is called every 1996;; In 19.30, a new variable `window-scroll-functions' is called every
1997;; time a window is recentered. It is not perfect for our situation, 1997;; time a window is recentered. It is not perfect for our situation,
1998;; since when it is called for a tail window, it is to late. However, 1998;; since when it is called for a tail window, it is to late. However,
1999;; if it is called for another window, we can try to update our 1999;; 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 @@
365 (message-mail-other-window, message-mail-other-frame) 365 (message-mail-other-window, message-mail-other-frame)
366 (message-news-other-window, message-news-other-frame): 366 (message-news-other-window, message-news-other-frame):
367 Use switch-to-buffer-other-frame and switch-to-buffer-other-window 367 Use switch-to-buffer-other-frame and switch-to-buffer-other-window
368 instead of setting buffer display varibles. 368 instead of setting buffer display variables.
369 369
3702011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org> 3702011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
371 371
@@ -7128,7 +7128,7 @@
7128 7128
7129 * gnus-start.el (gnus-activate-group): Take an optional parameter to 7129 * gnus-start.el (gnus-activate-group): Take an optional parameter to
7130 say that you don't want to call gnus-request-group with don-check, but 7130 say that you don't want to call gnus-request-group with don-check, but
7131 do check the reponse. This is for virtual groups only. 7131 do check the response. This is for virtual groups only.
7132 (gnus-get-unread-articles): Count the archive groups as secondary, so 7132 (gnus-get-unread-articles): Count the archive groups as secondary, so
7133 that they're activated the same way as before. 7133 that they're activated the same way as before.
7134 7134
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."
274 result)) 274 result))
275 275
276(defun gnus-fun-ppm-change-string () 276(defun gnus-fun-ppm-change-string ()
277 (let* ((possibilites '("%02x0000" "00%02x00" "0000%02x" 277 (let* ((possibilities '("%02x0000" "00%02x00" "0000%02x"
278 "%02x%02x00" "00%02x%02x" "%02x00%02x")) 278 "%02x%02x00" "00%02x%02x" "%02x00%02x"))
279 (format (concat "'#%02x%02x%02x' '#" 279 (format (concat "'#%02x%02x%02x' '#"
280 (nth (random 6) possibilites) 280 (nth (random 6) possibilities)
281 "'")) 281 "'"))
282 (values nil)) 282 (values nil))
283 (dotimes (i 255) 283 (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."
1588 ;; BUG: We really need to get the charset for 1588 ;; BUG: We really need to get the charset for
1589 ;; each name in the Newsgroups and Followup-To 1589 ;; each name in the Newsgroups and Followup-To
1590 ;; lines to allow crossposting between group 1590 ;; lines to allow crossposting between group
1591 ;; namess with incompatible character sets. 1591 ;; names with incompatible character sets.
1592 ;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2001-10-08. 1592 ;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2001-10-08.
1593 (group-field-charset 1593 (group-field-charset
1594 (gnus-group-name-charset 1594 (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."
7087(defun gnus-summary-find-for-reselect () 7087(defun gnus-summary-find-for-reselect ()
7088 "Return the number of an article to stay on across a reselect. 7088 "Return the number of an article to stay on across a reselect.
7089The current article is considered, then following articles, then previous 7089The current article is considered, then following articles, then previous
7090articles. An article is sought which is not cancelled and isn't a temporary 7090articles. An article is sought which is not canceled and isn't a temporary
7091insertion from another group. If there's no such then return a dummy 0." 7091insertion from another group. If there's no such then return a dummy 0."
7092 (let (found) 7092 (let (found)
7093 (dolist (rev '(nil t)) 7093 (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."
700(defface gnus-summary-cancelled 700(defface gnus-summary-cancelled
701 '((((class color)) 701 '((((class color))
702 (:foreground "yellow" :background "black"))) 702 (:foreground "yellow" :background "black")))
703 "Face used for cancelled articles." 703 "Face used for canceled articles."
704 :group 'gnus-summary) 704 :group 'gnus-summary)
705;; backward-compatibility alias 705;; backward-compatibility alias
706(put 'gnus-summary-cancelled-face 'face-alias 'gnus-summary-cancelled) 706(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."
906 :type 'hook) 906 :type 'hook)
907 907
908(defcustom message-cancel-hook nil 908(defcustom message-cancel-hook nil
909 "Hook run when cancelling articles." 909 "Hook run when canceling articles."
910 :group 'message-various 910 :group 'message-various
911 :link '(custom-manual "(message)Various Message Variables") 911 :link '(custom-manual "(message)Various Message Variables")
912 :type 'hook) 912 :type 'hook)
@@ -4840,7 +4840,7 @@ Otherwise, generate and save a value for `canlock-password' first."
4840 (message-fetch-field "Followup-To"))) 4840 (message-fetch-field "Followup-To")))
4841 ;; BUG: We really need to get the charset for each name in the 4841 ;; BUG: We really need to get the charset for each name in the
4842 ;; Newsgroups and Followup-To lines to allow crossposting 4842 ;; Newsgroups and Followup-To lines to allow crossposting
4843 ;; between group namess with incompatible character sets. 4843 ;; between group names with incompatible character sets.
4844 ;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2001-10-08. 4844 ;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2001-10-08.
4845 (group-field-charset 4845 (group-field-charset
4846 (gnus-group-name-charset method newsgroups-field)) 4846 (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.")
353 ;; List of NNDiary headers that specify the time spec. Each header name is 353 ;; List of NNDiary headers that specify the time spec. Each header name is
354 ;; followed by either two integers (specifying a range of possible values 354 ;; followed by either two integers (specifying a range of possible values
355 ;; for this header) or one list (specifying all the possible values for this 355 ;; for this header) or one list (specifying all the possible values for this
356 ;; header). In the latter case, the list does NOT include the unspecifyed 356 ;; header). In the latter case, the list does NOT include the unspecified
357 ;; spec (*). 357 ;; spec (*).
358 ;; For time zone values, we have symbolic time zone names associated with 358 ;; For time zone values, we have symbolic time zone names associated with
359 ;; the (relative) number of seconds ahead GMT. 359 ;; the (relative) number of seconds ahead GMT.
@@ -1163,9 +1163,9 @@ all. This may very well take some time.")
1163 ;; Parse the schedule string STR, or signal an error. 1163 ;; Parse the schedule string STR, or signal an error.
1164 ;; Signals are caught by `nndary-schedule'. 1164 ;; Signals are caught by `nndary-schedule'.
1165 (if (string-match "[ \t]*\\*[ \t]*" str) 1165 (if (string-match "[ \t]*\\*[ \t]*" str)
1166 ;; unspecifyed 1166 ;; unspecified
1167 nil 1167 nil
1168 ;; specifyed 1168 ;; specified
1169 (if (listp min-or-values) 1169 (if (listp min-or-values)
1170 ;; min-or-values is values 1170 ;; min-or-values is values
1171 ;; #### NOTE: this is actually only a hack for time zones. 1171 ;; #### 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."
1273 (message "Doing hyrex-search query \"%s\"...done" qstring) 1273 (message "Doing hyrex-search query \"%s\"...done" qstring)
1274 (sit-for 0) 1274 (sit-for 0)
1275 ;; nnir-search returns: 1275 ;; nnir-search returns:
1276 ;; for nnml/nnfolder: "filename mailid weigth" 1276 ;; for nnml/nnfolder: "filename mailid weight"
1277 ;; for nnimap: "group mailid weigth" 1277 ;; for nnimap: "group mailid weight"
1278 (goto-char (point-min)) 1278 (goto-char (point-min))
1279 (delete-non-matching-lines "^\\S + [0-9]+ [0-9]+$") 1279 (delete-non-matching-lines "^\\S + [0-9]+ [0-9]+$")
1280 ;; HyREX doesn't search directly in groups -- so filter out here. 1280 ;; 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."
665 (process-buffer -process)))) 665 (process-buffer -process))))
666 ;; When I an able to identify the 666 ;; When I an able to identify the
667 ;; connection to the server AND I've 667 ;; connection to the server AND I've
668 ;; received NO reponse for 668 ;; received NO response for
669 ;; nntp-connection-timeout seconds. 669 ;; nntp-connection-timeout seconds.
670 (when (and -buffer (eq 0 (buffer-size -buffer))) 670 (when (and -buffer (eq 0 (buffer-size -buffer)))
671 ;; Close the connection. Take no 671 ;; 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'."
426 '(menu-item "Save current filter groups permanently..." 426 '(menu-item "Save current filter groups permanently..."
427 ibuffer-save-filter-groups 427 ibuffer-save-filter-groups
428 :enable (and (featurep 'ibuf-ext) ibuffer-filter-groups) 428 :enable (and (featurep 'ibuf-ext) ibuffer-filter-groups)
429 :help "Use a mnemnonic name to store current filter groups")) 429 :help "Use a mnemonic name to store current filter groups"))
430 (define-key-after groups-map [switch-to-saved-filter-groups] 430 (define-key-after groups-map [switch-to-saved-filter-groups]
431 '(menu-item "Restore permanently saved filters..." 431 '(menu-item "Restore permanently saved filters..."
432 ibuffer-switch-to-saved-filter-groups 432 ibuffer-switch-to-saved-filter-groups
@@ -676,7 +676,7 @@ directory, like `default-directory'."
676 (define-key-after map [menu-bar view filter save-filters] 676 (define-key-after map [menu-bar view filter save-filters]
677 '(menu-item "Save current filters permanently..." ibuffer-save-filters 677 '(menu-item "Save current filters permanently..." ibuffer-save-filters
678 :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers) 678 :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers)
679 :help "Use a mnemnonic name to store current filter stack")) 679 :help "Use a mnemonic name to store current filter stack"))
680 (define-key-after map [menu-bar view filter switch-to-saved-filters] 680 (define-key-after map [menu-bar view filter switch-to-saved-filters]
681 '(menu-item "Restore permanently saved filters..." 681 '(menu-item "Restore permanently saved filters..."
682 ibuffer-switch-to-saved-filters 682 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
1785succeed, it checks to see if any function in `auto-coding-functions' 1785succeed, it checks to see if any function in `auto-coding-functions'
1786gives a match. 1786gives a match.
1787 1787
1788If a coding system is specifed, the return value is a cons 1788If a coding system is specified, the return value is a cons
1789\(CODING . SOURCE), where CODING is the specified coding system and 1789\(CODING . SOURCE), where CODING is the specified coding system and
1790SOURCE is a symbol `auto-coding-alist', `auto-coding-regexp-alist', 1790SOURCE is a symbol `auto-coding-alist', `auto-coding-regexp-alist',
1791`:coding', or `auto-coding-functions' indicating by what CODING is 1791`: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
2703 2703
2704;; Generate a half-cooked decode map (char-table) for the current 2704;; Generate a half-cooked decode map (char-table) for the current
2705;; Quail map. An element for a character C is a key string or a list 2705;; Quail map. An element for a character C is a key string or a list
2706;; of a key strings to type to input C. The lenth of key string is at 2706;; of a key strings to type to input C. The length of key string is at
2707;; most 2. If it is 2, more keys may be required to input C. 2707;; most 2. If it is 2, more keys may be required to input C.
2708 2708
2709(defun quail-gen-decode-map () 2709(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.
122 122
123In this input method, you enter a Chinese character by first typing 123In this input method, you enter a Chinese character by first typing
124keys corresponding to Zhuyin symbols (see the above table) followed by 124keys corresponding to Zhuyin symbols (see the above table) followed by
125SPC, 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, 125SPC, 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,
1264:$(0(+Vy(B). 1264:$(0(+Vy(B).
127 127
128\\<quail-translation-docstring>") 128\\<quail-translation-docstring>")
@@ -203,7 +203,7 @@ compose a Chinese character.
203 203
204In this input method, you enter a Chinese character by first typing 204In this input method, you enter a Chinese character by first typing
205keys corresponding to Zhuyin symbols (see the above table) followed by 205keys corresponding to Zhuyin symbols (see the above table) followed by
206SPC, 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, 206SPC, 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,
2077:$(0M=Vy(B). 2077:$(0M=Vy(B).
208 208
209\\<quail-translation-docstring>"))) 209\\<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.")
227 (eval-when-compile decomposition-pair-to-composition))) 227 (eval-when-compile decomposition-pair-to-composition)))
228 228
229(defun ucs-normalize-primary-composite (decomposition-pair composition-predicate) 229(defun ucs-normalize-primary-composite (decomposition-pair composition-predicate)
230 "Convert DECOMPOSITION-PAIR to primay composite using COMPOSITION-PREDICATE." 230 "Convert DECOMPOSITION-PAIR to primary composite using COMPOSITION-PREDICATE."
231 (let ((char (or (gethash decomposition-pair 231 (let ((char (or (gethash decomposition-pair
232 ucs-normalize-decomposition-pair-to-primary-composite) 232 ucs-normalize-decomposition-pair-to-primary-composite)
233 (and (<= #x1100 (car decomposition-pair)) 233 (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."
747;; Create a separate keymap installed as a minor-mode keymap (e.g. in 747;; Create a separate keymap installed as a minor-mode keymap (e.g. in
748;; the emulation-mode-map-alists) in which macro bindings are made 748;; the emulation-mode-map-alists) in which macro bindings are made
749;; independent of any other bindings. When first binding is made, 749;; independent of any other bindings. When first binding is made,
750;; the kemap is created, installed, and enabled. Key seq. C-x C-k + 750;; the keymap is created, installed, and enabled. Key seq. C-x C-k +
751;; can then be used to toggle the use of this keymap on and off. 751;; can then be used to toggle the use of this keymap on and off.
752;; This means that it would be safe(r) to bind ordinary keys like 752;; This means that it would be safe(r) to bind ordinary keys like
753;; letters and digits, provided that we inhibit the keymap while 753;; 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 @@
125(define-coding-system 'chinese-big5 125(define-coding-system 'chinese-big5
126 "BIG5 8-bit encoding for Chinese (MIME:Big5)" 126 "BIG5 8-bit encoding for Chinese (MIME:Big5)"
127 :coding-type 'big5 127 :coding-type 'big5
128 :mnemonic ?B 128 :mnemonic ?B
129 :charset-list '(ascii big5) 129 :charset-list '(ascii big5)
130 :mime-charset 'big5) 130 :mime-charset 'big5)
131 131
@@ -152,7 +152,7 @@
152(define-coding-system 'chinese-big5-hkscs 152(define-coding-system 'chinese-big5-hkscs
153 "BIG5-HKSCS 8-bit encoding for Chinese, Hong Kong supplement (MIME:Big5-HKSCS)" 153 "BIG5-HKSCS 8-bit encoding for Chinese, Hong Kong supplement (MIME:Big5-HKSCS)"
154 :coding-type 'charset 154 :coding-type 'charset
155 :mnemonic ?B 155 :mnemonic ?B
156 :charset-list '(ascii big5-hkscs) 156 :charset-list '(ascii big5-hkscs)
157 :mime-charset 'big5-hkscs) 157 :mime-charset 'big5-hkscs)
158(define-coding-system-alias 'big5-hkscs 'chinese-big5-hkscs) 158(define-coding-system-alias 'big5-hkscs 'chinese-big5-hkscs)
@@ -191,7 +191,7 @@
191 chinese-cns11643-5 chinese-cns11643-6 191 chinese-cns11643-5 chinese-cns11643-6
192 chinese-cns11643-7) 192 chinese-cns11643-7)
193 (iso639-language . zh) 193 (iso639-language . zh)
194 (setup-function . (lambda () 194 (setup-function . (lambda ()
195 (use-cjk-char-width-table 'zh_TW))) 195 (use-cjk-char-width-table 'zh_TW)))
196 (exit-function . use-default-char-width-table) 196 (exit-function . use-default-char-width-table)
197 (coding-system iso-2022-cn euc-tw) 197 (coding-system iso-2022-cn euc-tw)
@@ -211,7 +211,7 @@ accepts Big5 for input also (which is then converted to CNS)."))
211 chinese-cns11643-5 chinese-cns11643-6 211 chinese-cns11643-5 chinese-cns11643-6
212 chinese-cns11643-7 chinese-big5-1 chinese-big5-2) 212 chinese-cns11643-7 chinese-big5-1 chinese-big5-2)
213 (iso639-language . zh) 213 (iso639-language . zh)
214 (setup-function . (lambda () 214 (setup-function . (lambda ()
215 (use-cjk-char-width-table 'zh_TW))) 215 (use-cjk-char-width-table 'zh_TW)))
216 (exit-function . use-default-char-width-table) 216 (exit-function . use-default-char-width-table)
217 (coding-system euc-tw iso-2022-cn) 217 (coding-system euc-tw iso-2022-cn)
@@ -220,7 +220,7 @@ accepts Big5 for input also (which is then converted to CNS)."))
220 (features china-util) 220 (features china-util)
221 (input-method . "chinese-cns-quick") 221 (input-method . "chinese-cns-quick")
222 (documentation . "\ 222 (documentation . "\
223Support for Chinese, prefering the EUC-TW character set. Note that 223Support for Chinese, preferring the EUC-TW character set. Note that
224the EUC-TW coding system accepts Big5 for input also (which is then 224the EUC-TW coding system accepts Big5 for input also (which is then
225converted to CNS).")) 225converted to CNS)."))
226 '("Chinese")) 226 '("Chinese"))
@@ -241,13 +241,13 @@ converted to CNS)."))
241(set-language-info-alist 241(set-language-info-alist
242 "Chinese-GBK" '((charset chinese-gbk) 242 "Chinese-GBK" '((charset chinese-gbk)
243 (iso639-language . zh) 243 (iso639-language . zh)
244 (setup-function . (lambda () 244 (setup-function . (lambda ()
245 (use-cjk-char-width-table 'zh_CN))) 245 (use-cjk-char-width-table 'zh_CN)))
246 (exit-function . use-default-char-width-table) 246 (exit-function . use-default-char-width-table)
247 (coding-system chinese-gbk) 247 (coding-system chinese-gbk)
248 (coding-priority gbk iso-2022-cn chinese-big5 248 (coding-priority gbk iso-2022-cn chinese-big5
249 chinese-iso-8bit) ; fixme? 249 chinese-iso-8bit) ; fixme?
250 (ctext-non-standard-encodings "gbk-0") 250 (ctext-non-standard-encodings "gbk-0")
251 (input-method . "chinese-py-punct") ; fixme? 251 (input-method . "chinese-py-punct") ; fixme?
252 (sample-text . "Chinese ($BCfJ8(B,$BIaDL$A;0(B,$A::So(B) $(D95$B9%(B") 252 (sample-text . "Chinese ($BCfJ8(B,$BIaDL$A;0(B,$A::So(B) $(D95$B9%(B")
253 (features china-util) 253 (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 @@
34;; for representing these characters: VISCII, TCVN-5712, VPS, VIQR, 34;; for representing these characters: VISCII, TCVN-5712, VPS, VIQR,
35;; and Unicode. VISCII, TCVN-5712 and VPS are simple 1-byte code 35;; and Unicode. VISCII, TCVN-5712 and VPS are simple 1-byte code
36;; which assigns 134 unique characters in control-code area 36;; which assigns 134 unique characters in control-code area
37;; (0x00..0x1F) and right half area (0x80..0xFF). VIQR is a menmonic 37;; (0x00..0x1F) and right half area (0x80..0xFF). VIQR is a mnemonic
38;; encoding specification representing diacritical marks by following 38;; encoding specification representing diacritical marks by following
39;; ASCII characters. 39;; ASCII characters.
40 40
@@ -47,7 +47,7 @@
47 "Return VISCII character code of CHAR if appropriate." 47 "Return VISCII character code of CHAR if appropriate."
48 (encode-char char 'viscii)) 48 (encode-char char 'viscii))
49 49
50;; VIQR is a menmonic encoding specification for Vietnamese. 50;; VIQR is a mnemonic encoding specification for Vietnamese.
51;; It represents diacritical marks by ASCII characters as follows: 51;; It represents diacritical marks by ASCII characters as follows:
52;; ------------+----------+-------- 52;; ------------+----------+--------
53;; mark | mnemonic | example 53;; 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'."
687 ;; Otherwise record the current column and look backwards. 687 ;; Otherwise record the current column and look backwards.
688 (setq column (current-column)) 688 (setq column (current-column))
689 (skip-chars-backward ",; \t") 689 (skip-chars-backward ",; \t")
690 ;; Record the distance travelled. 690 ;; Record the distance traveled.
691 (setq distance (- column (current-column))) 691 (setq distance (- column (current-column)))
692 (when (looking-back 692 (when (looking-back
693 (concat "([ \t]*\\(?:" Man-section-regexp "\\)[ \t]*)")) 693 (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."
1664 (if (not (and seen-prompt ange-ftp-pending-error-line)) 1664 (if (not (and seen-prompt ange-ftp-pending-error-line))
1665 (ange-ftp-process-handle-line line proc) 1665 (ange-ftp-process-handle-line line proc)
1666 ;; If we've seen a potential error message and it 1666 ;; If we've seen a potential error message and it
1667 ;; hasn't been cancelled by a good message before 1667 ;; hasn't been canceled by a good message before
1668 ;; seeing a prompt, then the error was real. 1668 ;; seeing a prompt, then the error was real.
1669 (delete-process proc) 1669 (delete-process proc)
1670 (setq ange-ftp-process-busy nil 1670 (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 @@
82 82
83;; The function `zeroconf-publish-service' publishes a new service to 83;; The function `zeroconf-publish-service' publishes a new service to
84;; the Avahi daemon. Although the domain, where to the service is 84;; the Avahi daemon. Although the domain, where to the service is
85;; published, can be specified by this function, it is usally the 85;; published, can be specified by this function, it is usually the
86;; default domain "local" (also written as nil or ""). 86;; default domain "local" (also written as nil or "").
87 87
88;; (zeroconf-publish-service 88;; (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'."
377(defun rng-kill-timers () 377(defun rng-kill-timers ()
378 ;; rng-validate-timer and rng-validate-quick-timer have the 378 ;; rng-validate-timer and rng-validate-quick-timer have the
379 ;; permanent-local property, so that the timers can be 379 ;; permanent-local property, so that the timers can be
380 ;; cancelled even after changing mode. 380 ;; canceled even after changing mode.
381 ;; This function takes care of cancelling the timers and 381 ;; This function takes care of canceling the timers and
382 ;; then killing the local variables. 382 ;; then killing the local variables.
383 (when (local-variable-p 'rng-validate-timer) 383 (when (local-variable-p 'rng-validate-timer)
384 (when rng-validate-timer 384 (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."
174(defvar pgg-pending-timers (make-vector 7 0) 174(defvar pgg-pending-timers (make-vector 7 0)
175 "Hash table for managing scheduled pgg cache management timers. 175 "Hash table for managing scheduled pgg cache management timers.
176 176
177We associate key and timer, so the timer can be cancelled if a new 177We associate key and timer, so the timer can be canceled if a new
178timeout for the key is set while an old one is still pending.") 178timeout for the key is set while an old one is still pending.")
179 179
180(defun pgg-read-passphrase (prompt &optional key notruncate) 180(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 @@
278 278
279 * org-archive.el (org-archive-subtree): While it might be possible 279 * org-archive.el (org-archive-subtree): While it might be possible
280 to archive an headline of a temporary buffer (i.e. not visiting a 280 to archive an headline of a temporary buffer (i.e. not visiting a
281 file), it wouldn't be really sensical. 281 file), it wouldn't be really sensible.
282 282
2832011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> 2832011-07-28 Nicolas Goaziou <n.goaziou@gmail.com>
284 284
@@ -4008,7 +4008,7 @@
4008 * org-list.el (org-list-blocks): New variable. 4008 * org-list.el (org-list-blocks): New variable.
4009 (org-list-context): New function. 4009 (org-list-context): New function.
4010 (org-list-full-item-re): New variable. 4010 (org-list-full-item-re): New variable.
4011 (org-list-struct-assoc-at-point): Use new varible. 4011 (org-list-struct-assoc-at-point): Use new variable.
4012 (org-list-struct): Rewrite of function. Now, list data is 4012 (org-list-struct): Rewrite of function. Now, list data is
4013 collected by looking at the list line after line. It reads the 4013 collected by looking at the list line after line. It reads the
4014 whole list each time because reading only a subtree was not enough 4014 whole list each time because reading only a subtree was not enough
@@ -8139,7 +8139,7 @@
81392010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 81392010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
8140 8140
8141 * org-list.el (org-insert-item-internal): New function to handle 8141 * org-list.el (org-insert-item-internal): New function to handle
8142 positionning and contents of an item being inserted at a specific 8142 positioning and contents of an item being inserted at a specific
8143 pos. It is not possible anymore to split a term in a description 8143 pos. It is not possible anymore to split a term in a description
8144 list or a checkbox when inserting a new item. 8144 list or a checkbox when inserting a new item.
8145 8145
@@ -9758,7 +9758,7 @@
9758 9758
97592010-07-19 Bastien Guerry <bzg@altern.org> 97592010-07-19 Bastien Guerry <bzg@altern.org>
9760 9760
9761 * org-timer.el (org-timer-set-timer): Fix bug about cancelling 9761 * org-timer.el (org-timer-set-timer): Fix bug about canceling
9762 timers. 9762 timers.
9763 9763
97642010-07-19 David Maus <dmaus@ictsoc.de> 97642010-07-19 David Maus <dmaus@ictsoc.de>
@@ -12582,7 +12582,7 @@
12582 buffer and at the position of the given clock. However, changes 12582 buffer and at the position of the given clock. However, changes
12583 to the current clock are local and have no effect on the user's 12583 to the current clock are local and have no effect on the user's
12584 active clock. This allows, for example, far any clock to be 12584 active clock. This allows, for example, far any clock to be
12585 cancelled without cancelling the active clock. 12585 canceled without canceling the active clock.
12586 (org-clock-clock-in): New inline function that switches the active 12586 (org-clock-clock-in): New inline function that switches the active
12587 clock to the given clock. If either the argument RESUME, or the 12587 clock to the given clock. If either the argument RESUME, or the
12588 global `org-clock-in-resume', are non-nil, it will resume a clock 12588 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."
8331 (org-agenda-remove-flag hdmarker) 8331 (org-agenda-remove-flag hdmarker)
8332 (let ((win (get-buffer-window "*Flagging Note*"))) 8332 (let ((win (get-buffer-window "*Flagging Note*")))
8333 (and win (delete-window win))) 8333 (and win (delete-window win)))
8334 (message "Entry unflaged")) 8334 (message "Entry unflagged"))
8335 (setq note (org-entry-get hdmarker "THEFLAGGINGNOTE")) 8335 (setq note (org-entry-get hdmarker "THEFLAGGINGNOTE"))
8336 (unless note 8336 (unless note
8337 (error "No flagging note")) 8337 (error "No flagging note"))
@@ -8354,7 +8354,7 @@ tag and (if present) the flagging note."
8354 (org-entry-delete nil "THEFLAGGINGNOTE") 8354 (org-entry-delete nil "THEFLAGGINGNOTE")
8355 (setq newhead (org-get-heading))) 8355 (setq newhead (org-get-heading)))
8356 (org-agenda-change-all-lines newhead marker) 8356 (org-agenda-change-all-lines newhead marker)
8357 (message "Entry unflaged"))) 8357 (message "Entry unflagged")))
8358 8358
8359(defun org-agenda-get-any-marker (&optional pos) 8359(defun org-agenda-get-any-marker (&optional pos)
8360 (or (get-text-property (or pos (point-at-bol)) 'org-hd-marker) 8360 (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.")
328 "Hook run when stopping the current clock.") 328 "Hook run when stopping the current clock.")
329 329
330(defvar org-clock-cancel-hook nil 330(defvar org-clock-cancel-hook nil
331 "Hook run when cancelling the current clock.") 331 "Hook run when canceling the current clock.")
332(defvar org-clock-goto-hook nil 332(defvar org-clock-goto-hook nil
333 "Hook run when selecting the currently clocked-in entry.") 333 "Hook run when selecting the currently clocked-in entry.")
334(defvar org-clock-has-been-used nil 334(defvar org-clock-has-been-used nil
@@ -346,7 +346,7 @@ to add an effort property.")
346(defvar org-clock-start-time "") 346(defvar org-clock-start-time "")
347 347
348(defvar org-clock-leftover-time nil 348(defvar org-clock-leftover-time nil
349 "If non-nil, user cancelled a clock; this is when leftover time started.") 349 "If non-nil, user canceled a clock; this is when leftover time started.")
350 350
351(defvar org-clock-effort "" 351(defvar org-clock-effort ""
352 "Effort estimate of the currently clocking task.") 352 "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 @@
68 68
69;; Computing a list structure can be a costly operation on huge lists 69;; Computing a list structure can be a costly operation on huge lists
70;; (a few thousand lines long). Thus, code should follow the rule : 70;; (a few thousand lines long). Thus, code should follow the rule :
71;; "collect once, use many". As a corollary, it is usally a bad idea 71;; "collect once, use many". As a corollary, it is usually a bad idea
72;; to use directly an interactive function inside the code, as those, 72;; to use directly an interactive function inside the code, as those,
73;; being independent entities, read the whole list structure another 73;; being independent entities, read the whole list structure another
74;; time. 74;; 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 @@
145(defgroup org-protocol nil 145(defgroup org-protocol nil
146 "Intercept calls from emacsclient to trigger custom actions. 146 "Intercept calls from emacsclient to trigger custom actions.
147 147
148This is done by advising `server-visit-files' to scann the list of filenames 148This is done by advising `server-visit-files' to scan the list of filenames
149for `org-protocol-the-protocol' and sub-procols defined in 149for `org-protocol-the-protocol' and sub-protocols defined in
150`org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'." 150`org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'."
151 :version "22.1" 151 :version "22.1"
152 :group 'convenience 152 :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."
278 :type 'string) 278 :type 'string)
279 279
280(defcustom org-publish-sitemap-file-entry-format "%t" 280(defcustom org-publish-sitemap-file-entry-format "%t"
281 "How a sitemap file entry is formated. 281 "How a sitemap file entry is formatted.
282You could use brackets to delimit on what part the link will be. 282You could use brackets to delimit on what part the link will be.
283 283
284%t is the title. 284%t is the title.
285%a is the author. 285%a is the author.
286%d is the date formated using `org-publish-sitemap-date-format'." 286%d is the date formatted using `org-publish-sitemap-date-format'."
287 :group 'org-publish 287 :group 'org-publish
288 :type 'string) 288 :type 'string)
289 289
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\"."
571 (and filtered-items (mapconcat 'identity filtered-items "\n")))) 571 (and filtered-items (mapconcat 'identity filtered-items "\n"))))
572 572
573(defun org-taskjuggler-get-attributes (item attributes) 573(defun org-taskjuggler-get-attributes (item attributes)
574 "Return all attribute as a single formated string. ITEM is an 574 "Return all attributes as a single formatted string. ITEM is an
575alist representing either a resource or a task. ATTRIBUTES is a 575alist representing either a resource or a task. ATTRIBUTES is a
576list of symbols. Only entries from ITEM are considered that are 576list of symbols. Only entries from ITEM are considered that are
577listed in ATTRIBUTES." 577listed 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."
549(defun gametree-save-and-hack-layout () 549(defun gametree-save-and-hack-layout ()
550 "Save the current tree layout and hack the file local variable spec. 550 "Save the current tree layout and hack the file local variable spec.
551This function saves the current layout in `gametree-local-layout' and, 551This function saves the current layout in `gametree-local-layout' and,
552if a local file varible specification for this variable exists in the 552if a local file variable specification for this variable exists in the
553buffer, it is replaced by the new value. See the documentation for 553buffer, it is replaced by the new value. See the documentation for
554`gametree-local-layout' for more information." 554`gametree-local-layout' for more information."
555 (interactive) 555 (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."
2051 (c-narrow-to-comment-innards range) ; This may move point back. 2051 (c-narrow-to-comment-innards range) ; This may move point back.
2052 (let* ((here (point)) 2052 (let* ((here (point))
2053 last 2053 last
2054 (here-filler ; matches WS and comment-prefices at point. 2054 (here-filler ; matches WS and comment-prefixes at point.
2055 (concat "\\=\\(^[ \t]*\\(" c-current-comment-prefix "\\)" 2055 (concat "\\=\\(^[ \t]*\\(" c-current-comment-prefix "\\)"
2056 "\\|[ \t\n\r\f]\\)*")) 2056 "\\|[ \t\n\r\f]\\)*"))
2057 (prefix-at-bol-here ; matches WS and prefix at BOL, just before point 2057 (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."
2071 2071
2072 ;; Now seek successively earlier sentence ends between PAR-BEG and 2072 ;; Now seek successively earlier sentence ends between PAR-BEG and
2073 ;; HERE, until the "start of sentence" following it is earlier than 2073 ;; HERE, until the "start of sentence" following it is earlier than
2074 ;; HERE, or we hit PAR-BEG. Beware of comment prefices! 2074 ;; HERE, or we hit PAR-BEG. Beware of comment prefixes!
2075 (while (and (re-search-backward (c-sentence-end) par-beg 'limit) 2075 (while (and (re-search-backward (c-sentence-end) par-beg 'limit)
2076 (setq last (point)) 2076 (setq last (point))
2077 (goto-char (match-end 0)) ; tentative beginning of sentence 2077 (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."
708 (setq done t) ; not a label-only line, exit the loop 708 (setq done t) ; not a label-only line, exit the loop
709 (setq retval (point)))) 709 (setq retval (point))))
710 ;; We couldn't go further back, and we haven't found a command yet. 710 ;; We couldn't go further back, and we haven't found a command yet.
711 ;; Return to the start positionn 711 ;; Return to the start position.
712 (goto-char start) 712 (goto-char start)
713 (setq done t) 713 (setq done t)
714 (setq retval nil))) 714 (setq retval nil)))
@@ -756,7 +756,7 @@ Returns point of the found command line or nil if not able to move."
756 (setq done t) ; not a label-only line, exit the loop 756 (setq done t) ; not a label-only line, exit the loop
757 (setq retval (point))))) 757 (setq retval (point)))))
758 ;; We couldn't go further back, and we haven't found a command yet. 758 ;; We couldn't go further back, and we haven't found a command yet.
759 ;; Return to the start positionn 759 ;; Return to the start position.
760 (goto-char start) 760 (goto-char start)
761 (setq done t) 761 (setq done t)
762 (setq retval nil))) 762 (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."
7866 "Display online help about the completion at point." 7866 "Display online help about the completion at point."
7867 (interactive "eP") 7867 (interactive "eP")
7868 ;; Restore last-command for next command, to make 7868 ;; Restore last-command for next command, to make
7869 ;; scrolling/cancelling of completions work. 7869 ;; scrolling/canceling of completions work.
7870 (setq this-command last-command) 7870 (setq this-command last-command)
7871 (idlwave-do-mouse-completion-help ev)) 7871 (idlwave-do-mouse-completion-help ev))
7872 7872
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."
3000 '(js> ((fifth hitab) "selectedTab") (fourth hitab)) 3000 '(js> ((fifth hitab) "selectedTab") (fourth hitab))
3001 cmds))) 3001 cmds)))
3002 3002
3003 ;; Hilighting whole window 3003 ;; Highlighting whole window
3004 ((third hitab) 3004 ((third hitab)
3005 (push '(js! ((third hitab) "document" 3005 (push '(js! ((third hitab) "document"
3006 "documentElement" "setAttribute") 3006 "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)."
1714 1714
1715 1715
1716(defgroup vhdl-menu nil 1716(defgroup vhdl-menu nil
1717 "Customizations for menues." 1717 "Customizations for menus."
1718 :group 'vhdl) 1718 :group 'vhdl)
1719 1719
1720(defcustom vhdl-index-menu nil 1720(defcustom vhdl-index-menu nil
@@ -1844,7 +1844,7 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry
1844;; Internal variables 1844;; Internal variables
1845 1845
1846(defvar vhdl-menu-max-size 20 1846(defvar vhdl-menu-max-size 20
1847 "*Specifies the maximum size of a menu before splitting it into submenues.") 1847 "*Specifies the maximum size of a menu before splitting it into submenus.")
1848 1848
1849(defvar vhdl-progress-interval 1 1849(defvar vhdl-progress-interval 1
1850 "*Interval used to update progress status during long operations. 1850 "*Interval used to update progress status during long operations.
@@ -2468,7 +2468,7 @@ conversion."
2468 (goto-char marker)) 2468 (goto-char marker))
2469 2469
2470(defun vhdl-menu-split (list title) 2470(defun vhdl-menu-split (list title)
2471 "Split menu LIST into several submenues, if number of 2471 "Split menu LIST into several submenus, if number of
2472elements > `vhdl-menu-max-size'." 2472elements > `vhdl-menu-max-size'."
2473 (if (> (length list) vhdl-menu-max-size) 2473 (if (> (length list) vhdl-menu-max-size)
2474 (let ((remain list) 2474 (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."
2273 2273
2274(defun ses-read-printer (prompt default) 2274(defun ses-read-printer (prompt default)
2275 "Common code for `ses-read-cell-printer', `ses-read-column-printer', and `ses-read-default-printer'. 2275 "Common code for `ses-read-cell-printer', `ses-read-column-printer', and `ses-read-default-printer'.
2276PROMPT should end with \": \". Result is t if operation was cancelled." 2276PROMPT should end with \": \". Result is t if operation was canceled."
2277 (barf-if-buffer-read-only) 2277 (barf-if-buffer-read-only)
2278 (if (eq default t) 2278 (if (eq default t)
2279 (setq default "") 2279 (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."
1582 n) 1582 n)
1583 ;; next-matching-history-element always puts us at (point-min). 1583 ;; next-matching-history-element always puts us at (point-min).
1584 ;; Move to the position we were at before changing the buffer contents. 1584 ;; Move to the position we were at before changing the buffer contents.
1585 ;; This is still sensical, because the text before point has not changed. 1585 ;; This is still sensible, because the text before point has not changed.
1586 (goto-char point-at-start))) 1586 (goto-char point-at-start)))
1587 1587
1588(defun previous-complete-history-element (n) 1588(defun previous-complete-history-element (n)
@@ -5704,7 +5704,7 @@ At top-level, as an editor command, this simply beeps."
5704(defvar buffer-quit-function nil 5704(defvar buffer-quit-function nil
5705 "Function to call to \"quit\" the current buffer, or nil if none. 5705 "Function to call to \"quit\" the current buffer, or nil if none.
5706\\[keyboard-escape-quit] calls this function when its more local actions 5706\\[keyboard-escape-quit] calls this function when its more local actions
5707\(such as cancelling a prefix argument, minibuffer or region) do not apply.") 5707\(such as canceling a prefix argument, minibuffer or region) do not apply.")
5708 5708
5709(defun keyboard-escape-quit () 5709(defun keyboard-escape-quit ()
5710 "Exit the current \"mode\" (in a generalized sense of the word). 5710 "Exit the current \"mode\" (in a generalized sense of the word).
@@ -6209,7 +6209,7 @@ BASE-POSITION, says where to insert the completion."
6209 choice buffer base-position nil) 6209 choice buffer base-position nil)
6210 ;; This remove-text-properties should be unnecessary since `choice' 6210 ;; This remove-text-properties should be unnecessary since `choice'
6211 ;; comes from buffer-substring-no-properties. 6211 ;; comes from buffer-substring-no-properties.
6212 ;;(remove-text-properties 0 (lenth choice) '(mouse-face nil) choice) 6212 ;;(remove-text-properties 0 (length choice) '(mouse-face nil) choice)
6213 ;; Insert the completion into the buffer where it was requested. 6213 ;; Insert the completion into the buffer where it was requested.
6214 (funcall (or insert-function completion-list-insert-choice-function) 6214 (funcall (or insert-function completion-list-insert-choice-function)
6215 (or (car base-position) (point)) 6215 (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."
1862 (if (not v) 1862 (if (not v)
1863 (setq speedbar-special-mode-expansion-list t) 1863 (setq speedbar-special-mode-expansion-list t)
1864 ;; If it is autoloaded, we need to load it now so that 1864 ;; If it is autoloaded, we need to load it now so that
1865 ;; we have access to the varialbe -speedbar-menu-items. 1865 ;; we have access to the variable -speedbar-menu-items.
1866 ;; Is this XEmacs safe? 1866 ;; Is this XEmacs safe?
1867 (let ((sf (symbol-function v))) 1867 (let ((sf (symbol-function v)))
1868 (if (and (listp sf) (eq (car sf) 'autoload)) 1868 (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."
126 126
127(defun emacs-session-save () 127(defun emacs-session-save ()
128 "This function is called when the window system is shutting down. 128 "This function is called when the window system is shutting down.
129If this function returns non-nil, the window system shutdown is cancelled. 129If this function returns non-nil, the window system shutdown is canceled.
130 130
131When a session manager tells Emacs that the window system is shutting 131When a session manager tells Emacs that the window system is shutting
132down, this function is called. It calls the functions in the hook 132down, 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."
3960;; Implementation note: This really should honor the interval-fn entry 3960;; Implementation note: This really should honor the interval-fn entry
3961;; in the master table, `artist-mt', which would mean leaving a timer 3961;; in the master table, `artist-mt', which would mean leaving a timer
3962;; that calls `draw-fn' every now and then. That timer would then have 3962;; that calls `draw-fn' every now and then. That timer would then have
3963;; to be cancelled and reinstalled whenever the user moves the cursor. 3963;; to be canceled and reinstalled whenever the user moves the cursor.
3964;; This could be done, but what if the user suddenly switches to another 3964;; This could be done, but what if the user suddenly switches to another
3965;; drawing mode, or even kills the buffer! In the mouse case, it is much 3965;; drawing mode, or even kills the buffer! In the mouse case, it is much
3966;; simpler: when at the end of `artist-mouse-draw-continously', the 3966;; simpler: when at the end of `artist-mouse-draw-continously', the
3967;; user has released the button, so the timer will always be cancelled 3967;; user has released the button, so the timer will always be canceled
3968;; at that point. 3968;; at that point.
3969(defun artist-key-draw-continously (x y) 3969(defun artist-key-draw-continously (x y)
3970 "Draw current continuous shape at X,Y." 3970 "Draw current continuous shape at X,Y."
@@ -5589,7 +5589,7 @@ The event, EV, is the mouse event."
5589;; of drawing mode. 5589;; of drawing mode.
5590;; 5590;;
5591;; You should provide these functions. You might think that 5591;; You should provide these functions. You might think that
5592;; only you is using your type of mode, so noone will be able 5592;; only you is using your type of mode, so no one will be able
5593;; to switch to another operation of the same type of mode, 5593;; to switch to another operation of the same type of mode,
5594;; but someone else might base a new drawing mode upon your 5594;; but someone else might base a new drawing mode upon your
5595;; work. 5595;; 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."
2499 ;; hidden by new window, scroll it to just below new win 2499 ;; hidden by new window, scroll it to just below new win
2500 ;; otherwise set top line of other win so it doesn't scroll. 2500 ;; otherwise set top line of other win so it doesn't scroll.
2501 (if (< oldot top) (setq top oldot)) 2501 (if (< oldot top) (setq top oldot))
2502 ;; if frame is unsplitable, temporarily disable that... 2502 ;; if frame is unsplittable, temporarily disable that...
2503 (if (cdr (assq 'unsplittable (frame-parameters (selected-frame)))) 2503 (if (cdr (assq 'unsplittable (frame-parameters (selected-frame))))
2504 (let ((frame (selected-frame))) 2504 (let ((frame (selected-frame)))
2505 (modify-frame-parameters frame '((unsplittable . nil))) 2505 (modify-frame-parameters frame '((unsplittable . nil)))
@@ -3979,7 +3979,7 @@ Both should not be used to define a buffer-local dictionary."
3979; LocalWords: AMStex hspace includeonly nocite epsfig displaymath eqnarray reg 3979; LocalWords: AMStex hspace includeonly nocite epsfig displaymath eqnarray reg
3980; LocalWords: minipage modeline pers dict unhighlight buf grep sync prev inc 3980; LocalWords: minipage modeline pers dict unhighlight buf grep sync prev inc
3981; LocalWords: fn oldot NB AIX msg init read's bufs pt cmd Quinlan eg 3981; LocalWords: fn oldot NB AIX msg init read's bufs pt cmd Quinlan eg
3982; LocalWords: uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable 3982; LocalWords: uuencoded unidiff sc nn VM SGML eval IspellPersDict
3983; LocalWords: lns XEmacs HTML casechars Multibyte 3983; LocalWords: lns XEmacs HTML casechars Multibyte
3984 3984
3985;;; ispell.el ends here 3985;;; 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'."
212 (add-hook 'pre-command-hook 'reftex-highlight-shall-die) 212 (add-hook 'pre-command-hook 'reftex-highlight-shall-die)
213 213
214 (when (eq how 'tmp-window) 214 (when (eq how 'tmp-window)
215 ;; Resize window and arrange restauration 215 ;; Resize window and arrange restoration
216 (shrink-window (1- (- (window-height) 9))) 216 (shrink-window (1- (- (window-height) 9)))
217 (recenter '(4)) 217 (recenter '(4))
218 (add-hook 'pre-command-hook 'reftex-restore-window-conf)) 218 (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."
4293 (car (table--get-coordinate (cdr (table--horizontal-cell-list nil t)))) 4293 (car (table--get-coordinate (cdr (table--horizontal-cell-list nil t))))
4294 (1+ (cdr (table--get-coordinate (cdr (table--vertical-cell-list nil t)))))))) 4294 (1+ (cdr (table--get-coordinate (cdr (table--vertical-cell-list nil t))))))))
4295 4295
4296(defun table-call-interactively (function &optional recoard-flag keys) 4296(defun table-call-interactively (function &optional record-flag keys)
4297 "Call FUNCTION, or a table version of it if applicable. 4297 "Call FUNCTION, or a table version of it if applicable.
4298See `call-interactively' for full description of the arguments." 4298See `call-interactively' for full description of the arguments."
4299 (let ((table-func (intern-soft (format "*table--cell-%s" function)))) 4299 (let ((table-func (intern-soft (format "*table--cell-%s" function))))
@@ -4301,7 +4301,7 @@ See `call-interactively' for full description of the arguments."
4301 (if (and table-func 4301 (if (and table-func
4302 (table--point-in-cell-p)) 4302 (table--point-in-cell-p))
4303 table-func 4303 table-func
4304 function) recoard-flag keys))) 4304 function) record-flag keys)))
4305 4305
4306(defun table-funcall (function &rest arguments) 4306(defun table-funcall (function &rest arguments)
4307 "Call FUNCTION, or a table version of it if applicable. 4307 "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."
2088 (table-entry-height 0) 2088 (table-entry-height 0)
2089 ;; unformatted row looks like: A1 @tab A2 @tab A3 2089 ;; unformatted row looks like: A1 @tab A2 @tab A3
2090 ;; extract-row command deletes the source line in the table. 2090 ;; extract-row command deletes the source line in the table.
2091 (unformated-row (texinfo-multitable-extract-row))) 2091 (unformatted-row (texinfo-multitable-extract-row)))
2092 ;; Use a temporary buffer 2092 ;; Use a temporary buffer
2093 (set-buffer (get-buffer-create texinfo-multitable-buffer-name)) 2093 (set-buffer (get-buffer-create texinfo-multitable-buffer-name))
2094 (delete-region (point-min) (point-max)) 2094 (delete-region (point-min) (point-max))
2095 (insert unformated-row) 2095 (insert unformatted-row)
2096 (goto-char (point-min)) 2096 (goto-char (point-min))
2097;; 1. Check for correct number of @tab in line. 2097;; 1. Check for correct number of @tab in line.
2098 (let ((tab-number 1)) ; one @tab between two columns 2098 (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)'."
369 nil))) 369 nil)))
370 370
371(with-no-warnings 371(with-no-warnings
372 ;; Warnings are suppresed to avoid "global/dynamic var `X' lacks a prefix". 372 ;; Warnings are suppressed to avoid "global/dynamic var `X' lacks a prefix".
373 (defvar now) 373 (defvar now)
374 (defvar time) 374 (defvar time)
375 (defvar load) 375 (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 @@
1673 (url-dav-process-DAV:activelock) 1673 (url-dav-process-DAV:activelock)
1674 (url-dav-process-DAV:lockdiscovery): Can now correctly parse 1674 (url-dav-process-DAV:lockdiscovery): Can now correctly parse
1675 DAV:lockdiscovery nodes, so that we can find out who has a 1675 DAV:lockdiscovery nodes, so that we can find out who has a
1676 resource locked and properly parse the reponse to a LOCK request. 1676 resource locked and properly parse the response to a LOCK request.
1677 (url-dav-process-DAV:status): Now parses out the numeric status 1677 (url-dav-process-DAV:status): Now parses out the numeric status
1678 from the HTTP response line. 1678 from the HTTP response line.
1679 (url-dav-process-response): New function to handle all the 1679 (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."
72 :group 'url-gateway) 72 :group 'url-gateway)
73 73
74(defcustom url-gateway-telnet-login-prompt "^\r*.?login:" 74(defcustom url-gateway-telnet-login-prompt "^\r*.?login:"
75 "Prompt that tells us we should send our username when loggin in w/telnet." 75 "Prompt that tells us we should send our username when logging in w/telnet."
76 :type 'regexp 76 :type 'regexp
77 :group 'url-gateway) 77 :group 'url-gateway)
78 78
79(defcustom url-gateway-telnet-password-prompt "^\r*.?password:" 79(defcustom url-gateway-telnet-password-prompt "^\r*.?password:"
80 "Prompt that tells us we should send our password when loggin in w/telnet." 80 "Prompt that tells us we should send our password when logging in w/telnet."
81 :type 'regexp 81 :type 'regexp
82 :group 'url-gateway) 82 :group 'url-gateway)
83 83
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.")
370 this-command))) 370 this-command)))
371 371
372(defgroup ediff-highlighting nil 372(defgroup ediff-highlighting nil
373 "Hilighting of difference regions in Ediff." 373 "Highlighting of difference regions in Ediff."
374 :prefix "ediff-" 374 :prefix "ediff-"
375 :group 'ediff) 375 :group 'ediff)
376 376
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
322by appending the branch to ARG which defaults to \"-r\". 322by appending the branch to ARG which defaults to \"-r\".
323Since the `cvs-secondary-branch-prefix' is only active if the primary 323Since the `cvs-secondary-branch-prefix' is only active if the primary
324prefix is active, it is important to read the secondary prefix before 324prefix is active, it is important to read the secondary prefix before
325the primay since reading the primary can deactivate it." 325the primary since reading the primary can deactivate it."
326 (let ((branch (and (cvs-prefix-get 'cvs-branch-prefix 'read-only) 326 (let ((branch (and (cvs-prefix-get 'cvs-branch-prefix 'read-only)
327 (cvs-prefix-get 'cvs-secondary-branch-prefix)))) 327 (cvs-prefix-get 'cvs-secondary-branch-prefix))))
328 (if branch (cons (concat (or arg "-r") branch) flags) flags))) 328 (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 @@
223;; automatically for a PC if Oemacs is detected. This set uses separate 223;; automatically for a PC if Oemacs is detected. This set uses separate
224;; control, shift and meta keys with function keys 1 to 10. In 224;; control, shift and meta keys with function keys 1 to 10. In
225;; particular, movement keys are concentrated on f5 to f8 with (in 225;; particular, movement keys are concentrated on f5 to f8 with (in
226;; increasing order of distance travelled) C-, M- and S- as prefixes. 226;; increasing order of distance traveled) C-, M- and S- as prefixes.
227;; See the actual bindings below (search for C-f1). This is because the 227;; See the actual bindings below (search for C-f1). This is because the
228;; C-S- prefix is represented by weird key sequences and the set is 228;; C-S- prefix is represented by weird key sequences and the set is
229;; incomplete; if you don't mind that, some hints are given in comments 229;; 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'."
481 ;; sets view-read-only to t as a buffer-local variable 481 ;; sets view-read-only to t as a buffer-local variable
482 ;; after exiting View mode. That arranges that the next toggle-read-only 482 ;; after exiting View mode. That arranges that the next toggle-read-only
483 ;; will reenable View mode. 483 ;; will reenable View mode.
484 ;; Cancelling View mode in any other way should cancel that, too, 484 ;; Canceling View mode in any other way should cancel that, too,
485 ;; so that View mode stays off if toggle-read-only is called. 485 ;; so that View mode stays off if toggle-read-only is called.
486 (if (local-variable-p 'view-read-only) 486 (if (local-variable-p 'view-read-only)
487 (kill-local-variable 'view-read-only)) 487 (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."
295 (error "Canceled")) 295 (error "Canceled"))
296 value)))) 296 value))))
297 297
298(defun widget-remove-if (predictate list) 298(defun widget-remove-if (predicate list)
299 (let (result (tail list)) 299 (let (result (tail list))
300 (while tail 300 (while tail
301 (or (funcall predictate (car tail)) 301 (or (funcall predicate (car tail))
302 (setq result (cons (car tail) result))) 302 (setq result (cons (car tail) result)))
303 (setq tail (cdr tail))) 303 (setq tail (cdr tail)))
304 (nreverse result))) 304 (nreverse result)))
@@ -577,7 +577,7 @@ This is only meaningful for radio buttons or checkboxes in a list."
577 "Map FUNCTION over the buttons in BUFFER. 577 "Map FUNCTION over the buttons in BUFFER.
578FUNCTION is called with the arguments WIDGET and MAPARG. 578FUNCTION is called with the arguments WIDGET and MAPARG.
579 579
580If FUNCTION returns non-nil, the walk is cancelled. 580If FUNCTION returns non-nil, the walk is canceled.
581 581
582The arguments MAPARG, and BUFFER default to nil and (current-buffer), 582The arguments MAPARG, and BUFFER default to nil and (current-buffer),
583respectively." 583respectively."
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
1211PREDICATE on each one of them with the window as its sole 1211PREDICATE on each one of them with the window as its sole
1212argument. Return the first window for which PREDICATE returns 1212argument. Return the first window for which PREDICATE returns
1213non-nil. Windows are scanned starting with the window following 1213non-nil. Windows are scanned starting with the window following
1214the selcted window. If no window satisfies PREDICATE, return 1214the selected window. If no window satisfies PREDICATE, return
1215DEFAULT. 1215DEFAULT.
1216 1216
1217MINIBUF t means include the minibuffer window even if the 1217MINIBUF t means include the minibuffer window even if the
@@ -5234,7 +5234,7 @@ WINDOW was scrolled."
5234 ;; This `condition-case' shouldn't be necessary, but who knows? 5234 ;; This `condition-case' shouldn't be necessary, but who knows?
5235 (condition-case nil 5235 (condition-case nil
5236 (if (zerop delta) 5236 (if (zerop delta)
5237 ;; Return zero if DELTA became zero in the proces. 5237 ;; Return zero if DELTA became zero in the process.
5238 0 5238 0
5239 ;; Don't try to redisplay with the cursor at the end on its 5239 ;; Don't try to redisplay with the cursor at the end on its
5240 ;; own line--that would force a scroll and spoil things. 5240 ;; own line--that would force a scroll and spoil things.
diff --git a/nt/addpm.c b/nt/addpm.c
index d7919d36f80..c45b4aef68d 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -250,7 +250,7 @@ main (int argc, char *argv[])
250 MB_OKCANCEL | MB_ICONQUESTION); 250 MB_OKCANCEL | MB_ICONQUESTION);
251 if (result != IDOK) 251 if (result != IDOK)
252 { 252 {
253 fprintf (stderr, "Install cancelled\n"); 253 fprintf (stderr, "Install canceled\n");
254 exit (1); 254 exit (1);
255 } 255 }
256 } 256 }
@@ -365,4 +365,3 @@ main (int argc, char *argv[])
365 365
366 return 0; 366 return 0;
367} 367}
368
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 7d2f48a03ea..e759183724e 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -516,7 +516,7 @@
516 * w32fns.c (current_popup_menu): Use from w32menu.c. 516 * w32fns.c (current_popup_menu): Use from w32menu.c.
517 (w32_wnd_proc) <WM_EXITMENULOOP, WM_TIMER>: Use menubar_active 517 (w32_wnd_proc) <WM_EXITMENULOOP, WM_TIMER>: Use menubar_active
518 and current_popup_menu to determine whether a menubar menu has 518 and current_popup_menu to determine whether a menubar menu has
519 been cancelled. 519 been canceled.
520 520
521 * w32term.h (w32_output): Remove menu_command_in_progress. 521 * w32term.h (w32_output): Remove menu_command_in_progress.
522 522
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 7c46dea675c..f9fd442da3f 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -23182,7 +23182,7 @@
23182 * font.c (font_prop_validate_symbol, font_prop_validate_style) 23182 * font.c (font_prop_validate_symbol, font_prop_validate_style)
23183 (font_prop_validate_non_neg, font_prop_validate_spacing): 23183 (font_prop_validate_non_neg, font_prop_validate_spacing):
23184 Delete argument prop_index. 23184 Delete argument prop_index.
23185 (font_property_table): Change arguments to validater. Change Callers. 23185 (font_property_table): Change arguments to validator. Change Callers.
23186 (font_lispy_object): Delete. 23186 (font_lispy_object): Delete.
23187 (font_at): Use font_find_object instead fo font_lispy_object. 23187 (font_at): Use font_find_object instead fo font_lispy_object.
23188 23188
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 62e3de22b09..ba61c337efc 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -1811,7 +1811,7 @@
18111987-03-13 Richard M. Stallman (rms@prep) 18111987-03-13 Richard M. Stallman (rms@prep)
1812 1812
1813 * sysdep.c: Don't redefine TCSETAW if already defined. 1813 * sysdep.c: Don't redefine TCSETAW if already defined.
1814 (Cancelled by change on March 17). 1814 (Canceled by change on March 17).
1815 1815
1816 * sunfns.c: New file containing interface to Sun windows. 1816 * sunfns.c: New file containing interface to Sun windows.
1817 This is enabled by the switch HAVE_SUN_WINDOWS. 1817 This is enabled by the switch HAVE_SUN_WINDOWS.
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 2f3ee45a1ac..6a48b09e64b 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -12583,7 +12583,7 @@
12583 quit_char is typed, in order to break out of potential deadlocks. 12583 quit_char is typed, in order to break out of potential deadlocks.
12584 (cancel_all_deferred_msgs): New function. 12584 (cancel_all_deferred_msgs): New function.
12585 (complete_deferred_msg): Don't abort if msg not found; may have 12585 (complete_deferred_msg): Don't abort if msg not found; may have
12586 been cancelled. 12586 been canceled.
12587 (Fw32_reconstruct_hot_key): Use pre-interned symbols. 12587 (Fw32_reconstruct_hot_key): Use pre-interned symbols.
12588 (Fw32_send_sys_command): Wait for system command to 12588 (Fw32_send_sys_command): Wait for system command to
12589 complete before returning. 12589 complete before returning.
@@ -13701,7 +13701,7 @@
13701 * ccl.c (CCL_WRITE_CHAR): Don't use bcopy. 13701 * ccl.c (CCL_WRITE_CHAR): Don't use bcopy.
13702 (ccl_driver): If BUFFER-MAGNIFICATION of the CCL program is 0, 13702 (ccl_driver): If BUFFER-MAGNIFICATION of the CCL program is 0,
13703 cause error if the program is going to output some bytes. When 13703 cause error if the program is going to output some bytes. When
13704 outputing a string to notify an error, check the case that 13704 outputting a string to notify an error, check the case that
13705 DST_BYTES is zero. 13705 DST_BYTES is zero.
13706 13706
13707 * coding.h (CODING_FINISH_INTERRUPT): New macro. 13707 * coding.h (CODING_FINISH_INTERRUPT): New macro.
diff --git a/src/ccl.c b/src/ccl.c
index b7228a4d1cd..491b925d75c 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -552,7 +552,7 @@ static Lisp_Object Vccl_program_table;
552 But, when VALm is mapped to VALn and VALn is not a number, the 552 But, when VALm is mapped to VALn and VALn is not a number, the
553 mapping proceed as below: 553 mapping proceed as below:
554 554
555 If VALn is nil, the lastest map is ignored and the mapping of VALm 555 If VALn is nil, the last map is ignored and the mapping of VALm
556 proceed to the next map. 556 proceed to the next map.
557 557
558 In VALn is t, VALm is reverted to reg[rrr] and the mapping of VALm 558 In VALn is t, VALm is reverted to reg[rrr] and the mapping of VALm
diff --git a/src/cm.h b/src/cm.h
index dbf0820b94c..a8c7e0d7c4b 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -16,7 +16,7 @@ GNU General Public License for more details.
16You should have received a copy of the GNU General Public License 16You should have received a copy of the GNU General Public License
17along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 17along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
18 18
19/* Holds the minimum and maximum costs for the parametrized capabilities. */ 19/* Holds the minimum and maximum costs for the parameterized capabilities. */
20struct parmcap 20struct parmcap
21 { 21 {
22 int mincost, maxcost; 22 int mincost, maxcost;
@@ -79,7 +79,7 @@ struct cm
79 struct parmcap cc_multiright; /* multiple right (RI) */ 79 struct parmcap cc_multiright; /* multiple right (RI) */
80#endif 80#endif
81 81
82 /* Costs for the non-parametrized capabilities */ 82 /* Costs for the non-parameterized capabilities */
83 int cc_up; /* cost for up */ 83 int cc_up; /* cost for up */
84 int cc_down; /* etc. */ 84 int cc_down; /* etc. */
85 int cc_left; 85 int cc_left;
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index aef1ffdf783..d9084bf9a98 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -1,4 +1,4 @@
1/* A Gtk Widget that inherits GtkFixed, but can be shrinked. 1/* A Gtk Widget that inherits GtkFixed, but can be shrunk.
2This file is only use when compiling with Gtk+ 3. 2This file is only use when compiling with Gtk+ 3.
3 3
4Copyright (C) 2011 Free Software Foundation, Inc. 4Copyright (C) 2011 Free Software Foundation, Inc.
diff --git a/src/emacsgtkfixed.h b/src/emacsgtkfixed.h
index dbac136bd7f..c70e9a3efe3 100644
--- a/src/emacsgtkfixed.h
+++ b/src/emacsgtkfixed.h
@@ -1,4 +1,4 @@
1/* A Gtk Widget that inherits GtkFixed, but can be shrinked. 1/* A Gtk Widget that inherits GtkFixed, but can be shrunk.
2This file is only use when compiling with Gtk+ 3. 2This file is only use when compiling with Gtk+ 3.
3 3
4Copyright (C) 2011 Free Software Foundation, Inc. 4Copyright (C) 2011 Free Software Foundation, Inc.
diff --git a/src/eval.c b/src/eval.c
index 32b9d366fc3..9b9beabc7c1 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3733,7 +3733,7 @@ When lexical binding is not being used, this variable is nil.
3733A value of `(t)' indicates an empty environment, otherwise it is an 3733A value of `(t)' indicates an empty environment, otherwise it is an
3734alist of active lexical bindings. */); 3734alist of active lexical bindings. */);
3735 Vinternal_interpreter_environment = Qnil; 3735 Vinternal_interpreter_environment = Qnil;
3736 /* Don't export this variable to Elisp, so noone can mess with it 3736 /* Don't export this variable to Elisp, so no one can mess with it
3737 (Just imagine if someone makes it buffer-local). */ 3737 (Just imagine if someone makes it buffer-local). */
3738 Funintern (Qinternal_interpreter_environment, Qnil); 3738 Funintern (Qinternal_interpreter_environment, Qnil);
3739 3739
diff --git a/src/font.c b/src/font.c
index 35f5703e32e..6ab65281a48 100644
--- a/src/font.c
+++ b/src/font.c
@@ -614,7 +614,7 @@ static const struct
614 /* Function to validate PROP's value VAL, or NULL if any value is 614 /* Function to validate PROP's value VAL, or NULL if any value is
615 ok. The value is VAL or its regularized value if VAL is valid, 615 ok. The value is VAL or its regularized value if VAL is valid,
616 and Qerror if not. */ 616 and Qerror if not. */
617 Lisp_Object (*validater) (Lisp_Object prop, Lisp_Object val); 617 Lisp_Object (*validator) (Lisp_Object prop, Lisp_Object val);
618} font_property_table[] = 618} font_property_table[] =
619 { { &QCtype, font_prop_validate_symbol }, 619 { { &QCtype, font_prop_validate_symbol },
620 { &QCfoundry, font_prop_validate_symbol }, 620 { &QCfoundry, font_prop_validate_symbol },
@@ -672,7 +672,7 @@ font_prop_validate (int idx, Lisp_Object prop, Lisp_Object val)
672 if (idx < 0) 672 if (idx < 0)
673 return val; 673 return val;
674 } 674 }
675 validated = (font_property_table[idx].validater) (prop, val); 675 validated = (font_property_table[idx].validator) (prop, val);
676 if (EQ (validated, Qerror)) 676 if (EQ (validated, Qerror))
677 signal_error ("invalid font property", Fcons (prop, val)); 677 signal_error ("invalid font property", Fcons (prop, val));
678 return validated; 678 return validated;
@@ -825,7 +825,7 @@ font_expand_wildcards (Lisp_Object *field, int n)
825 range_mask = (range_mask << 1) | 1; 825 range_mask = (range_mask << 1) | 1;
826 826
827 /* The triplet RANGE_FROM, RANGE_TO, and RANGE_MASK is a 827 /* The triplet RANGE_FROM, RANGE_TO, and RANGE_MASK is a
828 position-based retriction for FIELD[I]. */ 828 position-based restriction for FIELD[I]. */
829 for (i = 0, range_from = 0, range_to = 14 - n; i < n; 829 for (i = 0, range_from = 0, range_to = 14 - n; i < n;
830 i++, range_from++, range_to++, range_mask <<= 1) 830 i++, range_from++, range_to++, range_mask <<= 1)
831 { 831 {
@@ -842,7 +842,7 @@ font_expand_wildcards (Lisp_Object *field, int n)
842 else 842 else
843 { 843 {
844 /* The triplet FROM, TO, and MASK is a value-based 844 /* The triplet FROM, TO, and MASK is a value-based
845 retriction for FIELD[I]. */ 845 restriction for FIELD[I]. */
846 int from, to; 846 int from, to;
847 unsigned mask; 847 unsigned mask;
848 848
diff --git a/src/fontset.c b/src/fontset.c
index 7592521cc7d..605d807aa3c 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -166,7 +166,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
166 These structures are hidden from the other codes than this file. 166 These structures are hidden from the other codes than this file.
167 The other codes handle fontsets only by their ID numbers. They 167 The other codes handle fontsets only by their ID numbers. They
168 usually use the variable name `fontset' for IDs. But, in this 168 usually use the variable name `fontset' for IDs. But, in this
169 file, we always use varialbe name `id' for IDs, and name `fontset' 169 file, we always use variable name `id' for IDs, and name `fontset'
170 for an actual fontset object, i.e., char-table. 170 for an actual fontset object, i.e., char-table.
171 171
172*/ 172*/
diff --git a/src/frame.c b/src/frame.c
index 039ed6543cb..bd97c5f18c7 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1929,7 +1929,7 @@ request a switch to FOCUS-FRAME, and `last-event-frame' will be
1929FOCUS-FRAME after reading an event typed at FRAME. 1929FOCUS-FRAME after reading an event typed at FRAME.
1930 1930
1931If FOCUS-FRAME is omitted or nil, any existing redirection is 1931If FOCUS-FRAME is omitted or nil, any existing redirection is
1932cancelled, and the frame again receives its own keystrokes. 1932canceled, and the frame again receives its own keystrokes.
1933 1933
1934Focus redirection is useful for temporarily redirecting keystrokes to 1934Focus redirection is useful for temporarily redirecting keystrokes to
1935a surrogate minibuffer frame when a frame doesn't have its own 1935a surrogate minibuffer frame when a frame doesn't have its own
diff --git a/src/keyboard.c b/src/keyboard.c
index 8f316c5e446..7da0348cb25 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -12245,7 +12245,7 @@ text in the region before modifying the buffer. The next
12245 DEFVAR_LISP ("debug-on-event", 12245 DEFVAR_LISP ("debug-on-event",
12246 Vdebug_on_event, 12246 Vdebug_on_event,
12247 doc: /* Enter debugger on this event. When Emacs 12247 doc: /* Enter debugger on this event. When Emacs
12248receives the special event specifed by this variable, it will try to 12248receives the special event specified by this variable, it will try to
12249break into the debugger as soon as possible instead of processing the 12249break into the debugger as soon as possible instead of processing the
12250event normally through `special-event-map'. 12250event normally through `special-event-map'.
12251 12251
diff --git a/src/sysdep.c b/src/sysdep.c
index ae200308bf3..b111fa1324c 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -433,7 +433,7 @@ child_setup_tty (int out)
433#endif /* AIX */ 433#endif /* AIX */
434 434
435 /* We originally enabled ICANON (and set VEOF to 04), and then had 435 /* We originally enabled ICANON (and set VEOF to 04), and then had
436 proces.c send additional EOF chars to flush the output when faced 436 process.c send additional EOF chars to flush the output when faced
437 with long lines, but this leads to weird effects when the 437 with long lines, but this leads to weird effects when the
438 subprocess has disabled ICANON and ends up seeing those spurious 438 subprocess has disabled ICANON and ends up seeing those spurious
439 extra EOFs. So we don't send EOFs any more in 439 extra EOFs. So we don't send EOFs any more in
diff --git a/src/w32fns.c b/src/w32fns.c
index 7a17c108d4d..822e3530bb6 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2417,7 +2417,7 @@ complete_deferred_msg (HWND hwnd, UINT msg, LRESULT result)
2417 deferred_msg * msg_buf = find_deferred_msg (hwnd, msg); 2417 deferred_msg * msg_buf = find_deferred_msg (hwnd, msg);
2418 2418
2419 if (msg_buf == NULL) 2419 if (msg_buf == NULL)
2420 /* Message may have been cancelled, so don't abort. */ 2420 /* Message may have been canceled, so don't abort. */
2421 return; 2421 return;
2422 2422
2423 msg_buf->result = result; 2423 msg_buf->result = result;
@@ -2538,7 +2538,7 @@ post_character_message (HWND hwnd, UINT msg,
2538 the lisp thread to respond. 2538 the lisp thread to respond.
2539 2539
2540 Note that we don't want to block the input thread waiting for 2540 Note that we don't want to block the input thread waiting for
2541 a reponse from the lisp thread (although that would at least 2541 a response from the lisp thread (although that would at least
2542 solve the deadlock problem above), because we want to be able 2542 solve the deadlock problem above), because we want to be able
2543 to receive C-g to interrupt the lisp thread. */ 2543 to receive C-g to interrupt the lisp thread. */
2544 cancel_all_deferred_msgs (); 2544 cancel_all_deferred_msgs ();
@@ -3749,7 +3749,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
3749 flags |= TPM_RIGHTBUTTON; 3749 flags |= TPM_RIGHTBUTTON;
3750 3750
3751 /* Remember we did a SetCapture on the initial mouse down event, 3751 /* Remember we did a SetCapture on the initial mouse down event,
3752 so for safety, we make sure the capture is cancelled now. */ 3752 so for safety, we make sure the capture is canceled now. */
3753 ReleaseCapture (); 3753 ReleaseCapture ();
3754 button_state = 0; 3754 button_state = 0;
3755 3755
@@ -4951,7 +4951,7 @@ If TYPE is nil or omitted, get the property as a string.
4951Otherwise TYPE is the name of the atom that denotes the type expected. 4951Otherwise TYPE is the name of the atom that denotes the type expected.
4952If SOURCE is non-nil, get the property on that window instead of from 4952If SOURCE is non-nil, get the property on that window instead of from
4953FRAME. The number 0 denotes the root window. 4953FRAME. The number 0 denotes the root window.
4954If DELETE_P is non-nil, delete the property after retreiving it. 4954If DELETE_P is non-nil, delete the property after retrieving it.
4955If VECTOR_RET_P is non-nil, don't return a string but a vector of values. 4955If VECTOR_RET_P is non-nil, don't return a string but a vector of values.
4956 4956
4957Value is nil if FRAME hasn't a property with name PROP or if PROP has 4957Value is nil if FRAME hasn't a property with name PROP or if PROP has
@@ -6032,7 +6032,7 @@ Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories. */)
6032 6032
6033 file = DECODE_FILE (build_string (filename)); 6033 file = DECODE_FILE (build_string (filename));
6034 } 6034 }
6035 /* User cancelled the dialog without making a selection. */ 6035 /* User canceled the dialog without making a selection. */
6036 else if (!CommDlgExtendedError ()) 6036 else if (!CommDlgExtendedError ())
6037 file = Qnil; 6037 file = Qnil;
6038 /* An error occurred, fallback on reading from the mini-buffer. */ 6038 /* An error occurred, fallback on reading from the mini-buffer. */
diff --git a/src/w32term.h b/src/w32term.h
index 6c73daba601..f587ee11af9 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -229,7 +229,7 @@ enum
229{ 229{
230 /* Values for focus_state, used as bit mask. 230 /* Values for focus_state, used as bit mask.
231 EXPLICIT means we received a FocusIn for the frame and know it has 231 EXPLICIT means we received a FocusIn for the frame and know it has
232 the focus. IMPLICIT means we recevied an EnterNotify and the frame 232 the focus. IMPLICIT means we received an EnterNotify and the frame
233 may have the focus if no window manager is running. 233 may have the focus if no window manager is running.
234 FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */ 234 FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */
235 FOCUS_NONE = 0, 235 FOCUS_NONE = 0,
diff --git a/src/window.c b/src/window.c
index af4fad054a2..b908749ea4a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5767,7 +5767,7 @@ get_leaf_windows (struct window *w, struct window **flat, int i)
5767 5767
5768 5768
5769/* Return a pointer to the glyph W's physical cursor is on. Value is 5769/* Return a pointer to the glyph W's physical cursor is on. Value is
5770 null if W's current matrix is invalid, so that no meaningfull glyph 5770 null if W's current matrix is invalid, so that no meaningful glyph
5771 can be returned. */ 5771 can be returned. */
5772struct glyph * 5772struct glyph *
5773get_phys_cursor_glyph (struct window *w) 5773get_phys_cursor_glyph (struct window *w)
diff --git a/src/window.h b/src/window.h
index df29ca1368f..b4e268b1a34 100644
--- a/src/window.h
+++ b/src/window.h
@@ -877,7 +877,7 @@ extern int buffer_shared;
877extern void check_frame_size (struct frame *frame, int *rows, int *cols); 877extern void check_frame_size (struct frame *frame, int *rows, int *cols);
878 878
879/* Return a pointer to the glyph W's physical cursor is on. Value is 879/* Return a pointer to the glyph W's physical cursor is on. Value is
880 null if W's current matrix is invalid, so that no meaningfull glyph 880 null if W's current matrix is invalid, so that no meaningful glyph
881 can be returned. */ 881 can be returned. */
882 882
883struct glyph *get_phys_cursor_glyph (struct window *w); 883struct glyph *get_phys_cursor_glyph (struct window *w);
diff --git a/src/xdisp.c b/src/xdisp.c
index 7708b9c40fa..52f73785e2d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10234,7 +10234,7 @@ current_message_1 (EMACS_INT a1, Lisp_Object a2, EMACS_INT a3, EMACS_INT a4)
10234} 10234}
10235 10235
10236 10236
10237/* Push the current message on Vmessage_stack for later restauration 10237/* Push the current message on Vmessage_stack for later restoration
10238 by restore_message. Value is non-zero if the current message isn't 10238 by restore_message. Value is non-zero if the current message isn't
10239 empty. This is a relatively infrequent operation, so it's not 10239 empty. This is a relatively infrequent operation, so it's not
10240 worth optimizing. */ 10240 worth optimizing. */
diff --git a/src/xfns.c b/src/xfns.c
index 323b272e9f0..95154395e9c 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4286,7 +4286,7 @@ If TYPE is nil or omitted, get the property as a string.
4286Otherwise TYPE is the name of the atom that denotes the type expected. 4286Otherwise TYPE is the name of the atom that denotes the type expected.
4287If SOURCE is non-nil, get the property on that window instead of from 4287If SOURCE is non-nil, get the property on that window instead of from
4288FRAME. The number 0 denotes the root window. 4288FRAME. The number 0 denotes the root window.
4289If DELETE_P is non-nil, delete the property after retreiving it. 4289If DELETE_P is non-nil, delete the property after retrieving it.
4290If VECTOR_RET_P is non-nil, don't return a string but a vector of values. 4290If VECTOR_RET_P is non-nil, don't return a string but a vector of values.
4291 4291
4292Value is nil if FRAME hasn't a property with name PROP or if PROP has 4292Value is nil if FRAME hasn't a property with name PROP or if PROP has
diff --git a/src/xterm.h b/src/xterm.h
index 4385b1a467d..9e0e1acca92 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -643,7 +643,7 @@ enum
643{ 643{
644 /* Values for focus_state, used as bit mask. 644 /* Values for focus_state, used as bit mask.
645 EXPLICIT means we received a FocusIn for the frame and know it has 645 EXPLICIT means we received a FocusIn for the frame and know it has
646 the focus. IMPLICIT means we recevied an EnterNotify and the frame 646 the focus. IMPLICIT means we received an EnterNotify and the frame
647 may have the focus if no window manager is running. 647 may have the focus if no window manager is running.
648 FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */ 648 FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */
649 FOCUS_NONE = 0, 649 FOCUS_NONE = 0,
diff --git a/test/cedet/tests/test.el b/test/cedet/tests/test.el
index 8a95572c497..57056b8065b 100644
--- a/test/cedet/tests/test.el
+++ b/test/cedet/tests/test.el
@@ -144,7 +144,7 @@
144 this 144 this
145 that) 145 that)
146 146
147(define-mode-local-override a-overriden-function 147(define-mode-local-override a-overridden-function
148 emacs-lisp-mode (tag) 148 emacs-lisp-mode (tag)
149 "A function that is overloaded." 149 "A function that is overloaded."
150 nil) 150 nil)