aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-11-26 20:43:11 -0800
committerPaul Eggert2011-11-26 20:43:11 -0800
commite47695319fc758da7ff07d7084386258b6c8b677 (patch)
treec1cd573850e4dd66b8df696835d52513f10dfc94
parent83aca1cb6970314dcc6c35c1432ebcac42811926 (diff)
downloademacs-e47695319fc758da7ff07d7084386258b6c8b677.tar.gz
emacs-e47695319fc758da7ff07d7084386258b6c8b677.zip
Spelling fixes.
-rw-r--r--admin/charsets/cp51932.awk2
-rw-r--r--doc/emacs/building.texi2
-rw-r--r--doc/lispref/spellfile2
-rw-r--r--doc/misc/calc.texi2
-rw-r--r--doc/misc/eieio.texi2
-rw-r--r--doc/misc/gnus.texi2
-rw-r--r--doc/misc/idlwave.texi184
-rw-r--r--etc/NEWS.1-172
-rw-r--r--etc/NEWS.222
-rw-r--r--etc/NEWS.232
-rw-r--r--etc/TODO2
-rw-r--r--etc/e/eterm-color.ti2
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/ChangeLog.106
-rw-r--r--lisp/ChangeLog.124
-rw-r--r--lisp/ChangeLog.52
-rw-r--r--lisp/ChangeLog.74
-rw-r--r--lisp/ChangeLog.82
-rw-r--r--lisp/allout.el2
-rw-r--r--lisp/bookmark.el2
-rw-r--r--lisp/cedet/ede/autoconf-edit.el2
-rw-r--r--lisp/cedet/ede/proj.el4
-rw-r--r--lisp/cedet/semantic/analyze.el2
-rw-r--r--lisp/composite.el2
-rw-r--r--lisp/dframe.el2
-rw-r--r--lisp/emacs-lisp/byte-opt.el2
-rw-r--r--lisp/emacs-lisp/bytecomp.el4
-rw-r--r--lisp/emacs-lisp/cconv.el2
-rw-r--r--lisp/emacs-lisp/smie.el2
-rw-r--r--lisp/filesets.el4
-rw-r--r--lisp/follow.el2
-rw-r--r--lisp/gnus/ChangeLog4
-rw-r--r--lisp/gnus/ChangeLog.12
-rw-r--r--lisp/gnus/ChangeLog.26
-rw-r--r--lisp/gnus/mm-bodies.el4
-rw-r--r--lisp/gnus/mml.el2
-rw-r--r--lisp/gnus/nnml.el2
-rw-r--r--lisp/gnus/pop3.el6
-rw-r--r--lisp/ido.el4
-rw-r--r--lisp/international/cp51932.el3
-rw-r--r--lisp/ldefs-boot.el6
-rw-r--r--lisp/man.el4
-rw-r--r--lisp/mh-e/ChangeLog.12
-rw-r--r--lisp/mpc.el2
-rw-r--r--lisp/net/ange-ftp.el2
-rw-r--r--lisp/nxml/rng-valid.el2
-rw-r--r--lisp/org/org-agenda.el2
-rw-r--r--lisp/play/gomoku.el2
-rw-r--r--lisp/play/landmark.el2
-rw-r--r--lisp/progmodes/ada-mode.el4
-rw-r--r--lisp/progmodes/cc-langs.el2
-rw-r--r--lisp/progmodes/cperl-mode.el4
-rw-r--r--lisp/progmodes/f90.el2
-rw-r--r--lisp/progmodes/fortran.el2
-rw-r--r--lisp/progmodes/gud.el2
-rw-r--r--lisp/progmodes/idlw-shell.el2
-rw-r--r--lisp/progmodes/sql.el12
-rw-r--r--lisp/replace.el2
-rw-r--r--lisp/speedbar.el2
-rw-r--r--lisp/term.el4
-rw-r--r--lisp/term/common-win.el4
-rw-r--r--lisp/textmodes/conf-mode.el6
-rw-r--r--lisp/textmodes/ispell.el5
-rw-r--r--lisp/textmodes/reftex-sel.el4
-rw-r--r--lisp/textmodes/rst.el2
-rw-r--r--lisp/textmodes/tex-mode.el2
-rw-r--r--lisp/url/ChangeLog3
-rw-r--r--lisp/vc/ediff-help.el10
-rw-r--r--lisp/window.el4
-rw-r--r--src/ChangeLog.102
-rw-r--r--src/ChangeLog.114
-rw-r--r--src/ChangeLog.32
-rw-r--r--src/ChangeLog.82
-rw-r--r--src/buffer.c4
-rw-r--r--src/charset.c4
-rw-r--r--src/dispextern.h2
-rw-r--r--src/gtkutil.h4
-rw-r--r--src/lisp.h4
-rw-r--r--src/lread.c2
-rw-r--r--src/nsterm.m2
-rw-r--r--src/w32fns.c3
-rw-r--r--src/widget.c2
-rw-r--r--src/widget.h3
-rw-r--r--src/window.c4
-rw-r--r--src/xdisp.c3
-rw-r--r--src/xfaces.c4
86 files changed, 221 insertions, 223 deletions
diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk
index b611def710d..c8879b30200 100644
--- a/admin/charsets/cp51932.awk
+++ b/admin/charsets/cp51932.awk
@@ -32,7 +32,7 @@
32 32
33BEGIN { 33BEGIN {
34 print ";;; cp51932.el -- translation table for CP51932. -*- no-byte-compile: t -*-"; 34 print ";;; cp51932.el -- translation table for CP51932. -*- no-byte-compile: t -*-";
35 print ";;; Automatically genrated from CP932-2BYTE.map"; 35 print ";;; Automatically generated from CP932-2BYTE.map";
36 print "(let ((map"; 36 print "(let ((map";
37 printf " '(;JISEXT<->UNICODE"; 37 printf " '(;JISEXT<->UNICODE";
38} 38}
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index ac62e2d9652..9c5b2e7dcd7 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -995,7 +995,7 @@ breakpoint}, the breakpoint which point is on.
995Enable/disable current breakpoint (@code{gdb-toggle-breakpoint}). 995Enable/disable current breakpoint (@code{gdb-toggle-breakpoint}).
996On a graphical display, this changes the color of a bullet in the 996On a graphical display, this changes the color of a bullet in the
997margin of a source buffer at the relevant line. This is red when 997margin of a source buffer at the relevant line. This is red when
998the breakpoint is enabled and grey when it is disabled. Text-only 998the breakpoint is enabled and gray when it is disabled. Text-only
999terminals correspondingly display a @samp{B} or @samp{b}. 999terminals correspondingly display a @samp{B} or @samp{b}.
1000 1000
1001@item D 1001@item D
diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile
index 1f4a6905505..e0d77ee0541 100644
--- a/doc/lispref/spellfile
+++ b/doc/lispref/spellfile
@@ -253,7 +253,6 @@ deletable
253deletion' 253deletion'
254delq 254delq
255depiction 255depiction
256descendents
257deselecting 256deselecting
258destructive' 257destructive'
259destructively' 258destructively'
@@ -299,7 +298,6 @@ excess'
299exec 298exec
300exitcode 299exitcode
301expression' 300expression'
302extendible
303extra' 301extra'
304fails' 302fails'
305fascist 303fascist
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index b84212afa74..32311ff5c3e 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -25644,7 +25644,7 @@ equivalent expression involving intervals: @samp{b in [a .. c)}.
25644of @samp{<} and @samp{<=} are allowed, or any of the four combinations 25644of @samp{<} and @samp{<=} are allowed, or any of the four combinations
25645of @samp{>} and @samp{>=}. Four-argument constructions like 25645of @samp{>} and @samp{>=}. Four-argument constructions like
25646@samp{a < b < c < d}, and mixtures like @w{@samp{a < b = c}} that 25646@samp{a < b < c < d}, and mixtures like @w{@samp{a < b = c}} that
25647involve both equalities and inequalities, are not allowed. 25647involve both equations and inequalities, are not allowed.
25648 25648
25649@kindex a . 25649@kindex a .
25650@pindex calc-remove-equal 25650@pindex calc-remove-equal
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index 7b4945027d3..d65c7a15f7b 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -1458,7 +1458,7 @@ Useful methods to define for your new class include:
1458 1458
1459@defmethod eieio-speedbar eieio-speedbar-derive-line-path obj depth 1459@defmethod eieio-speedbar eieio-speedbar-derive-line-path obj depth
1460Return a string representing a directory associated with an instance 1460Return a string representing a directory associated with an instance
1461of @var{obj}. @var{depth} can be used to indice how many levels of 1461of @var{obj}. @var{depth} can be used to index how many levels of
1462indentation have been opened by the user where @var{obj} is shown. 1462indentation have been opened by the user where @var{obj} is shown.
1463@end defmethod 1463@end defmethod
1464 1464
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 3aa923cc346..a1da74710a4 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -27408,7 +27408,7 @@ considered home score and adapt files (@pxref{Home Score File}) have
27408been added. 27408been added.
27409 27409
27410@item 27410@item
27411@code{nndoc} was rewritten to be easily extendable (@pxref{Document 27411@code{nndoc} was rewritten to be easily extensible (@pxref{Document
27412Server Internals}). 27412Server Internals}).
27413 27413
27414@item 27414@item
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 8e172301915..3e13dbb0f23 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -62,7 +62,7 @@ developing GNU and promoting software freedom.''
62IDLWAVE is a package which supports editing source code written in the 62IDLWAVE is a package which supports editing source code written in the
63Interactive Data Language (IDL), and running IDL as an inferior shell. 63Interactive Data Language (IDL), and running IDL as an inferior shell.
64 64
65@insertcopying 65@insertcopying
66@end ifnottex 66@end ifnottex
67 67
68@menu 68@menu
@@ -72,8 +72,8 @@ Interactive Data Language (IDL), and running IDL as an inferior shell.
72* The IDLWAVE Major Mode:: The mode for editing IDL programs 72* The IDLWAVE Major Mode:: The mode for editing IDL programs
73* The IDLWAVE Shell:: The mode for running IDL as an inferior program 73* The IDLWAVE Shell:: The mode for running IDL as an inferior program
74* Acknowledgements:: Who did what 74* Acknowledgements:: Who did what
75* Sources of Routine Info:: How does IDLWAVE know about routine XYZ 75* Sources of Routine Info:: How does IDLWAVE know about routine XYZ
76* HTML Help Browser Tips:: 76* HTML Help Browser Tips::
77* Configuration Examples:: The user is king 77* Configuration Examples:: The user is king
78* Windows and MacOS:: What still works, and how 78* Windows and MacOS:: What still works, and how
79* Troubleshooting:: When good computers turn bad 79* Troubleshooting:: When good computers turn bad
@@ -85,9 +85,9 @@ Interactive Data Language (IDL), and running IDL as an inferior shell.
85 85
86Getting Started (Tutorial) 86Getting Started (Tutorial)
87 87
88* Lesson I -- Development Cycle:: 88* Lesson I -- Development Cycle::
89* Lesson II -- Customization:: 89* Lesson II -- Customization::
90* Lesson III -- User Catalog:: 90* Lesson III -- User Catalog::
91 91
92The IDLWAVE Major Mode 92The IDLWAVE Major Mode
93 93
@@ -107,7 +107,7 @@ The IDLWAVE Major Mode
107Code Formatting 107Code Formatting
108 108
109* Code Indentation:: Reflecting the logical structure 109* Code Indentation:: Reflecting the logical structure
110* Continued Statement Indentation:: 110* Continued Statement Indentation::
111* Comment Indentation:: Special indentation for comment lines 111* Comment Indentation:: Special indentation for comment lines
112* Continuation Lines:: Splitting statements over lines 112* Continuation Lines:: Splitting statements over lines
113* Syntax Highlighting:: Font-lock support 113* Syntax Highlighting:: Font-lock support
@@ -115,14 +115,14 @@ Code Formatting
115 115
116Online Help 116Online Help
117 117
118* Help with HTML Documentation:: 118* Help with HTML Documentation::
119* Help with Source:: 119* Help with Source::
120 120
121Completion 121Completion
122 122
123* Case of Completed Words:: CaseOFcomPletedWords 123* Case of Completed Words:: CaseOFcomPletedWords
124* Object Method Completion and Class Ambiguity:: obj->Method, what? 124* Object Method Completion and Class Ambiguity:: obj->Method, what?
125* Object Method Completion in the Shell:: 125* Object Method Completion in the Shell::
126* Class and Keyword Inheritance:: obj->Method, _EXTRA=e 126* Class and Keyword Inheritance:: obj->Method, _EXTRA=e
127* Structure Tag Completion:: Completing state.Tag 127* Structure Tag Completion:: Completing state.Tag
128 128
@@ -136,32 +136,32 @@ The IDLWAVE Shell
136 136
137* Starting the Shell:: How to launch IDL as a subprocess 137* Starting the Shell:: How to launch IDL as a subprocess
138* Using the Shell:: Interactively working with the Shell 138* Using the Shell:: Interactively working with the Shell
139* Commands Sent to the Shell:: 139* Commands Sent to the Shell::
140* Debugging IDL Programs:: 140* Debugging IDL Programs::
141* Examining Variables:: 141* Examining Variables::
142* Custom Expression Examination:: 142* Custom Expression Examination::
143 143
144Debugging IDL Programs 144Debugging IDL Programs
145 145
146* A Tale of Two Modes:: 146* A Tale of Two Modes::
147* Debug Key Bindings:: 147* Debug Key Bindings::
148* Breakpoints and Stepping:: 148* Breakpoints and Stepping::
149* Compiling Programs:: 149* Compiling Programs::
150* Walking the Calling Stack:: 150* Walking the Calling Stack::
151* Electric Debug Mode:: 151* Electric Debug Mode::
152 152
153Sources of Routine Info 153Sources of Routine Info
154 154
155* Routine Definitions:: Where IDL Routines are defined. 155* Routine Definitions:: Where IDL Routines are defined.
156* Routine Information Sources:: So how does IDLWAVE know about... 156* Routine Information Sources:: So how does IDLWAVE know about...
157* Catalogs:: 157* Catalogs::
158* Load-Path Shadows:: Routines defined in several places 158* Load-Path Shadows:: Routines defined in several places
159* Documentation Scan:: Scanning the IDL Manuals 159* Documentation Scan:: Scanning the IDL Manuals
160 160
161Catalogs 161Catalogs
162 162
163* Library Catalogs:: 163* Library Catalogs::
164* User Catalog:: 164* User Catalog::
165 165
166@end detailmenu 166@end detailmenu
167@end menu 167@end menu
@@ -193,13 +193,13 @@ form a complete development environment. Here is a brief summary of
193what IDLWAVE does: 193what IDLWAVE does:
194 194
195@itemize @bullet 195@itemize @bullet
196@item 196@item
197Smart code indentation and automatic-formatting. 197Smart code indentation and automatic-formatting.
198@item 198@item
199Three level syntax highlighting support. 199Three level syntax highlighting support.
200@item 200@item
201Context-sensitive display of calling sequences and keywords for more 201Context-sensitive display of calling sequences and keywords for more
202than 1000 native IDL routines, extendible to any additional number of 202than 1000 native IDL routines, extensible to any additional number of
203local routines, and already available with many pre-scanned libraries. 203local routines, and already available with many pre-scanned libraries.
204@item 204@item
205Fast, context-sensitive online HTML help, or source-header help for 205Fast, context-sensitive online HTML help, or source-header help for
@@ -373,9 +373,9 @@ at point.
373@cindex Getting Started 373@cindex Getting Started
374 374
375@menu 375@menu
376* Lesson I -- Development Cycle:: 376* Lesson I -- Development Cycle::
377* Lesson II -- Customization:: 377* Lesson II -- Customization::
378* Lesson III -- User Catalog:: 378* Lesson III -- User Catalog::
379@end menu 379@end menu
380 380
381@node Lesson I -- Development Cycle, Lesson II -- Customization, Getting Started, Getting Started 381@node Lesson I -- Development Cycle, Lesson II -- Customization, Getting Started, Getting Started
@@ -418,13 +418,13 @@ function daynr,d,m,y
418 y1 = y * delta 418 y1 = y * delta
419 return, d + floor(m1*30.6)+floor(y1*365.25)+5 419 return, d + floor(m1*30.6)+floor(y1*365.25)+5
420end 420end
421 421
422function weekday,day,month,year 422function weekday,day,month,year
423 ;; compute weekday number for date 423 ;; compute weekday number for date
424 nr = daynr(day,month,year) 424 nr = daynr(day,month,year)
425 return, nr mod 7 425 return, nr mod 7
426end 426end
427 427
428pro plot_wday,day,month 428pro plot_wday,day,month
429 ;; Plot the weekday of a date in the first 10 years of this century. 429 ;; Plot the weekday of a date in the first 10 years of this century.
430 years = 2000,+indgen(10) 430 years = 2000,+indgen(10)
@@ -753,7 +753,7 @@ them.
753 753
754@menu 754@menu
755* Code Indentation:: Reflecting the logical structure 755* Code Indentation:: Reflecting the logical structure
756* Continued Statement Indentation:: 756* Continued Statement Indentation::
757* Comment Indentation:: Special indentation for comment lines 757* Comment Indentation:: Special indentation for comment lines
758* Continuation Lines:: Splitting statements over lines 758* Continuation Lines:: Splitting statements over lines
759* Syntax Highlighting:: Font-lock support 759* Syntax Highlighting:: Font-lock support
@@ -797,7 +797,7 @@ subprogram). The command @kbd{C-M-q} reindents the entire current
797routine. @xref{Actions}, for information how to impose additional 797routine. @xref{Actions}, for information how to impose additional
798formatting conventions on foreign code. 798formatting conventions on foreign code.
799 799
800@defopt idlwave-main-block-indent (@code{2}) 800@defopt idlwave-main-block-indent (@code{2})
801Extra indentation for the main block of code. That is the block between 801Extra indentation for the main block of code. That is the block between
802the FUNCTION/PRO statement and the END statement for that program 802the FUNCTION/PRO statement and the END statement for that program
803unit. 803unit.
@@ -998,7 +998,7 @@ in the first line of a comment paragraph.
998 998
999@defopt idlwave-use-last-hang-indent (@code{nil}) 999@defopt idlwave-use-last-hang-indent (@code{nil})
1000Non-@code{nil} means use last match on line for 1000Non-@code{nil} means use last match on line for
1001@code{idlwave-indent-regexp}. 1001@code{idlwave-indent-regexp}.
1002@end defopt 1002@end defopt
1003 1003
1004@node Syntax Highlighting, Octals and Highlighting, Continuation Lines, Code Formatting 1004@node Syntax Highlighting, Octals and Highlighting, Continuation Lines, Code Formatting
@@ -1026,7 +1026,7 @@ for highlighting using the variable
1026 1026
1027@defopt idlwave-default-font-lock-items 1027@defopt idlwave-default-font-lock-items
1028Items which should be fontified on the default fontification level 1028Items which should be fontified on the default fontification level
10292. 10292.
1030@end defopt 1030@end defopt
1031 1031
1032@node Octals and Highlighting, , Syntax Highlighting, Code Formatting 1032@node Octals and Highlighting, , Syntax Highlighting, Code Formatting
@@ -1104,7 +1104,7 @@ plot,x,alog(x+5*sin(x) + 2),
1104On positions 1,2 and 8, information about the @samp{plot} procedure will 1104On positions 1,2 and 8, information about the @samp{plot} procedure will
1105be shown. On positions 3,4, and 7, the @samp{alog} function will be 1105be shown. On positions 3,4, and 7, the @samp{alog} function will be
1106described, while positions 5 and 6 will investigate the @samp{sin} 1106described, while positions 5 and 6 will investigate the @samp{sin}
1107function. 1107function.
1108 1108
1109When you ask for routine information about an object method, and the 1109When you ask for routine information about an object method, and the
1110method exists in several classes, IDLWAVE queries for the class of the 1110method exists in several classes, IDLWAVE queries for the class of the
@@ -1162,7 +1162,7 @@ will automatically split into the next two.
1162@item @i{Other} 1162@item @i{Other}
1163@tab Any other routine with a file not known to be on the search path. 1163@tab Any other routine with a file not known to be on the search path.
1164@item @i{Unresolved} 1164@item @i{Unresolved}
1165@tab An otherwise unknown routine the shell lists as unresolved 1165@tab An otherwise unknown routine the shell lists as unresolved
1166(referenced, but not compiled). 1166(referenced, but not compiled).
1167@end multitable 1167@end multitable
1168 1168
@@ -1198,7 +1198,7 @@ with the middle mouse button inserts keywords or visits files:
1198@item @i{Usage} 1198@item @i{Usage}
1199@tab If online help is installed, a click with the @emph{right} mouse 1199@tab If online help is installed, a click with the @emph{right} mouse
1200button on the @i{Usage:} line will access the help for the 1200button on the @i{Usage:} line will access the help for the
1201routine (@pxref{Online Help}). 1201routine (@pxref{Online Help}).
1202@item @i{Keyword} 1202@item @i{Keyword}
1203@tab Online help about keywords is also available with the 1203@tab Online help about keywords is also available with the
1204@emph{right} mouse button. Clicking on a keyword with the @emph{middle} 1204@emph{right} mouse button. Clicking on a keyword with the @emph{middle}
@@ -1340,8 +1340,8 @@ directly in the originating source file.
1340 1340
1341 1341
1342@menu 1342@menu
1343* Help with HTML Documentation:: 1343* Help with HTML Documentation::
1344* Help with Source:: 1344* Help with Source::
1345@end menu 1345@end menu
1346 1346
1347@node Help with HTML Documentation, Help with Source, Online Help, Online Help 1347@node Help with HTML Documentation, Help with Source, Online Help, Online Help
@@ -1393,7 +1393,7 @@ configuring a browser for use with IDL's HTML help system.
1393Relative directory of the system-supplied HTML help directory, 1393Relative directory of the system-supplied HTML help directory,
1394considered with respect to @code{idlwave-system-directory}. Relevant 1394considered with respect to @code{idlwave-system-directory}. Relevant
1395for IDL 6.2 and greater. Should not change. 1395for IDL 6.2 and greater. Should not change.
1396@end defopt 1396@end defopt
1397 1397
1398@defopt idlwave-html-help-location @file{/usr/local/etc/} 1398@defopt idlwave-html-help-location @file{/usr/local/etc/}
1399The directory where the @file{idl_html_help} HTML directory live. 1399The directory where the @file{idl_html_help} HTML directory live.
@@ -1613,7 +1613,7 @@ available.
1613@menu 1613@menu
1614* Case of Completed Words:: CaseOFcomPletedWords 1614* Case of Completed Words:: CaseOFcomPletedWords
1615* Object Method Completion and Class Ambiguity:: obj->Method, what? 1615* Object Method Completion and Class Ambiguity:: obj->Method, what?
1616* Object Method Completion in the Shell:: 1616* Object Method Completion in the Shell::
1617* Class and Keyword Inheritance:: obj->Method, _EXTRA=e 1617* Class and Keyword Inheritance:: obj->Method, _EXTRA=e
1618* Structure Tag Completion:: Completing state.Tag 1618* Structure Tag Completion:: Completing state.Tag
1619@end menu 1619@end menu
@@ -1681,7 +1681,7 @@ narrow down the number of possible completions. The variable
1681@code{idlwave-query-class} can be configured to make such prompting the 1681@code{idlwave-query-class} can be configured to make such prompting the
1682default for all methods (not recommended), or selectively for very 1682default for all methods (not recommended), or selectively for very
1683common methods for which the number of completing keywords would be too 1683common methods for which the number of completing keywords would be too
1684large (e.g. @code{Init,SetProperty,GetProperty}). 1684large (e.g. @code{Init,SetProperty,GetProperty}).
1685 1685
1686@cindex Saving object class on @code{->} 1686@cindex Saving object class on @code{->}
1687@cindex @code{->} 1687@cindex @code{->}
@@ -1729,7 +1729,7 @@ routine info, or online help within a method routine, a query is sent to
1729determine the class of the object. If this query is successful, the 1729determine the class of the object. If this query is successful, the
1730class found will be used to select appropriate completions, routine 1730class found will be used to select appropriate completions, routine
1731info, or help. If unsuccessful, information from all known classes will 1731info, or help. If unsuccessful, information from all known classes will
1732be used (as in the buffer). 1732be used (as in the buffer).
1733 1733
1734@node Class and Keyword Inheritance, Structure Tag Completion, Object Method Completion in the Shell, Completion 1734@node Class and Keyword Inheritance, Structure Tag Completion, Object Method Completion in the Shell, Completion
1735@subsection Class and Keyword Inheritance 1735@subsection Class and Keyword Inheritance
@@ -1772,7 +1772,7 @@ keywords based on their originating class.
1772Non-@code{nil} means consider inheritance during completion, online help etc. 1772Non-@code{nil} means consider inheritance during completion, online help etc.
1773@end defopt 1773@end defopt
1774 1774
1775@defopt idlwave-keyword-class-inheritance 1775@defopt idlwave-keyword-class-inheritance
1776A list of regular expressions to match methods for which simple 1776A list of regular expressions to match methods for which simple
1777class-driven keyword inheritance will be used for Completion. 1777class-driven keyword inheritance will be used for Completion.
1778@end defopt 1778@end defopt
@@ -1802,7 +1802,7 @@ Structure tag completion is not enabled by default. To enable it,
1802simply add the following to your @file{.emacs}: 1802simply add the following to your @file{.emacs}:
1803 1803
1804@lisp 1804@lisp
1805 (add-hook 'idlwave-load-hook 1805 (add-hook 'idlwave-load-hook
1806 (lambda () (require 'idlw-complete-structtag))) 1806 (lambda () (require 'idlw-complete-structtag)))
1807@end lisp 1807@end lisp
1808 1808
@@ -2226,7 +2226,7 @@ your @file{.emacs} file:
2226 (idlwave-action-and-binding "\\<\\(pro\\|function\\)\\>[ \t]*\\<" 2226 (idlwave-action-and-binding "\\<\\(pro\\|function\\)\\>[ \t]*\\<"
2227 '(capitalize-word 1) t) 2227 '(capitalize-word 1) t)
2228 ;; Capitalize common block name 2228 ;; Capitalize common block name
2229 (idlwave-action-and-binding "\\<common\\>[ \t]+\\<" 2229 (idlwave-action-and-binding "\\<common\\>[ \t]+\\<"
2230 '(capitalize-word 1) t))) 2230 '(capitalize-word 1) t)))
2231@end lisp 2231@end lisp
2232 2232
@@ -2384,10 +2384,10 @@ currently only works under Unix and MacOSX.
2384@menu 2384@menu
2385* Starting the Shell:: How to launch IDL as a subprocess 2385* Starting the Shell:: How to launch IDL as a subprocess
2386* Using the Shell:: Interactively working with the Shell 2386* Using the Shell:: Interactively working with the Shell
2387* Commands Sent to the Shell:: 2387* Commands Sent to the Shell::
2388* Debugging IDL Programs:: 2388* Debugging IDL Programs::
2389* Examining Variables:: 2389* Examining Variables::
2390* Custom Expression Examination:: 2390* Custom Expression Examination::
2391@end menu 2391@end menu
2392 2392
2393@node Starting the Shell, Using the Shell, The IDLWAVE Shell, The IDLWAVE Shell 2393@node Starting the Shell, Using the Shell, The IDLWAVE Shell, The IDLWAVE Shell
@@ -2414,7 +2414,7 @@ In order to create a separate frame for the IDLWAVE shell buffer, call
2414@code{idlwave-shell} with a prefix argument: @kbd{C-u C-c C-s} or 2414@code{idlwave-shell} with a prefix argument: @kbd{C-u C-c C-s} or
2415@kbd{C-u C-c C-l}. If you always want a dedicated frame for the shell 2415@kbd{C-u C-c C-l}. If you always want a dedicated frame for the shell
2416window, configure the variable 2416window, configure the variable
2417@code{idlwave-shell-use-dedicated-frame}. 2417@code{idlwave-shell-use-dedicated-frame}.
2418 2418
2419To launch a quick IDLWAVE shell directly from a shell prompt without 2419To launch a quick IDLWAVE shell directly from a shell prompt without
2420an IDLWAVE buffer (e.g., as a replacement for running inside an 2420an IDLWAVE buffer (e.g., as a replacement for running inside an
@@ -2471,7 +2471,7 @@ The file in which the command history of the idlwave shell is saved.
2471Unless it's an absolute path, it goes in 2471Unless it's an absolute path, it goes in
2472@code{idlwave-config-directory}. 2472@code{idlwave-config-directory}.
2473@end defopt 2473@end defopt
2474 2474
2475@defopt idlwave-shell-use-dedicated-frame (@code{nil}) 2475@defopt idlwave-shell-use-dedicated-frame (@code{nil})
2476Non-@code{nil} means IDLWAVE should use a special frame to display the 2476Non-@code{nil} means IDLWAVE should use a special frame to display the
2477shell buffer. 2477shell buffer.
@@ -2574,7 +2574,7 @@ keywords, system variables, system variable tags etc.
2574@item @kbd{C-c C-v} 2574@item @kbd{C-c C-v}
2575@tab Find the source file of a routine (@code{idlwave-find-module}) 2575@tab Find the source file of a routine (@code{idlwave-find-module})
2576@item @kbd{C-c C-t} 2576@item @kbd{C-c C-t}
2577@tab Find the source file of a routine in the currently visited file 2577@tab Find the source file of a routine in the currently visited file
2578(@code{idlwave-find-module-this-file}). 2578(@code{idlwave-find-module-this-file}).
2579@item @kbd{C-c =} 2579@item @kbd{C-c =}
2580@tab Compile a library routine (@code{idlwave-resolve}) 2580@tab Compile a library routine (@code{idlwave-resolve})
@@ -2697,12 +2697,12 @@ buffers.
2697@end defopt 2697@end defopt
2698 2698
2699@menu 2699@menu
2700* A Tale of Two Modes:: 2700* A Tale of Two Modes::
2701* Debug Key Bindings:: 2701* Debug Key Bindings::
2702* Breakpoints and Stepping:: 2702* Breakpoints and Stepping::
2703* Compiling Programs:: 2703* Compiling Programs::
2704* Walking the Calling Stack:: 2704* Walking the Calling Stack::
2705* Electric Debug Mode:: 2705* Electric Debug Mode::
2706@end menu 2706@end menu
2707 2707
2708 2708
@@ -2795,7 +2795,7 @@ executed from the shell window, the breakpoint where IDL is currently
2795stopped will be deleted. To clear all breakpoints, use @kbd{C-c C-d 2795stopped will be deleted. To clear all breakpoints, use @kbd{C-c C-d
2796C-a} (@code{idlwave-clear-all-bp}). Breakpoints can also be disabled 2796C-a} (@code{idlwave-clear-all-bp}). Breakpoints can also be disabled
2797and re-enabled: @kbd{C-c C-d C-\} 2797and re-enabled: @kbd{C-c C-d C-\}
2798(@code{idlwave-shell-toggle-enable-current-bp}). 2798(@code{idlwave-shell-toggle-enable-current-bp}).
2799 2799
2800Breakpoint lines are highlighted or indicated with an icon in the source 2800Breakpoint lines are highlighted or indicated with an icon in the source
2801code (different icons for conditional, after, and other break types). 2801code (different icons for conditional, after, and other break types).
@@ -2804,7 +2804,7 @@ places breakpoints as close as possible on or after the line you
2804specify. IDLWAVE queries the shell for the actual breakpoint location 2804specify. IDLWAVE queries the shell for the actual breakpoint location
2805which was set, so the exact line you specify may not be marked. You can 2805which was set, so the exact line you specify may not be marked. You can
2806re-sync the breakpoint list and update the display at any time (e.g., if 2806re-sync the breakpoint list and update the display at any time (e.g., if
2807you add or remove some on the command line) using @kbd{C-c C-d C-l}. 2807you add or remove some on the command line) using @kbd{C-c C-d C-l}.
2808 2808
2809In recent IDLWAVE versions, the breakpoint line is highlighted when the 2809In recent IDLWAVE versions, the breakpoint line is highlighted when the
2810mouse is moved over it, and a tooltip pops up describing the break 2810mouse is moved over it, and a tooltip pops up describing the break
@@ -2914,8 +2914,8 @@ configured in @code{idlwave-shell-mark-stop-line}.
2914@kindex C-c C-d C-c 2914@kindex C-c C-d C-c
2915In order to compile the current buffer under the IDLWAVE shell, press 2915In order to compile the current buffer under the IDLWAVE shell, press
2916@kbd{C-c C-d C-c} (@code{idlwave-save-and-run}). This first saves the 2916@kbd{C-c C-d C-c} (@code{idlwave-save-and-run}). This first saves the
2917current buffer and then sends the command @samp{.run path/to/file} to the 2917current buffer and then sends the command @samp{.run path/to/file} to the
2918shell. You can also execute @kbd{C-c C-d C-c} from the shell buffer, in 2918shell. You can also execute @kbd{C-c C-d C-c} from the shell buffer, in
2919which case the most recently compiled buffer will be saved and 2919which case the most recently compiled buffer will be saved and
2920re-compiled. 2920re-compiled.
2921 2921
@@ -3080,9 +3080,9 @@ halts.
3080 3080
3081@defopt idlwave-shell-electric-stop-color (Violet) 3081@defopt idlwave-shell-electric-stop-color (Violet)
3082Default color of the stopped line overlay when in electric debug mode. 3082Default color of the stopped line overlay when in electric debug mode.
3083@end defopt 3083@end defopt
3084 3084
3085@defopt idlwave-shell-electric-stop-line-face 3085@defopt idlwave-shell-electric-stop-line-face
3086The face to use for the stopped line. Defaults to a face similar to the 3086The face to use for the stopped line. Defaults to a face similar to the
3087modeline, with color @code{idlwave-shell-electric-stop-color}. 3087modeline, with color @code{idlwave-shell-electric-stop-color}.
3088@end defopt 3088@end defopt
@@ -3188,14 +3188,14 @@ the expression printed by IDL.
3188@end defopt 3188@end defopt
3189 3189
3190@defopt idlwave-shell-output-face 3190@defopt idlwave-shell-output-face
3191The face for @code{idlwave-shell-output-overlay}. 3191The face for @code{idlwave-shell-output-overlay}.
3192Allows to choose the font, color and other properties for the most 3192Allows to choose the font, color and other properties for the most
3193recent output of IDL when examining an expression." 3193recent output of IDL when examining an expression."
3194@end defopt 3194@end defopt
3195 3195
3196@defopt idlwave-shell-separate-examine-output (@code{t}) 3196@defopt idlwave-shell-separate-examine-output (@code{t})
3197If non-@code{nil}, re-direct the output of examine commands to a special 3197If non-@code{nil}, re-direct the output of examine commands to a special
3198@file{*Examine*} buffer, instead of in the shell itself. 3198@file{*Examine*} buffer, instead of in the shell itself.
3199@end defopt 3199@end defopt
3200 3200
3201@defopt idlwave-shell-max-print-length (200) 3201@defopt idlwave-shell-max-print-length (200)
@@ -3249,17 +3249,17 @@ Both functions take a single string argument sharing the syntax of the
3249@lisp 3249@lisp
3250(add-hook 'idlwave-shell-mode-hook 3250(add-hook 'idlwave-shell-mode-hook
3251 (lambda () 3251 (lambda ()
3252 (idlwave-shell-define-key-both [s-down-mouse-2] 3252 (idlwave-shell-define-key-both [s-down-mouse-2]
3253 (idlwave-shell-mouse-examine 3253 (idlwave-shell-mouse-examine
3254 "print, size(___,/DIMENSIONS)")) 3254 "print, size(___,/DIMENSIONS)"))
3255 (idlwave-shell-define-key-both [f9] (idlwave-shell-examine 3255 (idlwave-shell-define-key-both [f9] (idlwave-shell-examine
3256 "print, size(___,/DIMENSIONS)")) 3256 "print, size(___,/DIMENSIONS)"))
3257 (idlwave-shell-define-key-both [f10] (idlwave-shell-examine 3257 (idlwave-shell-define-key-both [f10] (idlwave-shell-examine
3258 "print,size(___,/TNAME)")) 3258 "print,size(___,/TNAME)"))
3259 (idlwave-shell-define-key-both [f11] (idlwave-shell-examine 3259 (idlwave-shell-define-key-both [f11] (idlwave-shell-examine
3260 "help,___,/STRUCTURE")))) 3260 "help,___,/STRUCTURE"))))
3261@end lisp 3261@end lisp
3262 3262
3263@noindent Now pressing @key{f9}, or middle-mouse dragging with the 3263@noindent Now pressing @key{f9}, or middle-mouse dragging with the
3264@key{SUPER} key depressed, will print the dimensions of the nearby or 3264@key{SUPER} key depressed, will print the dimensions of the nearby or
3265highlighted expression. Pressing @key{f10} will give the type string, 3265highlighted expression. Pressing @key{f10} will give the type string,
@@ -3297,7 +3297,7 @@ of the package from version 3.0, during which time he overhauled almost
3297everything, modernized IDLWAVE with many new features, and developed the 3297everything, modernized IDLWAVE with many new features, and developed the
3298manual. 3298manual.
3299 3299
3300@item 3300@item
3301@uref{mailto:jdsmith@@as.arizona.edu, @b{J.D. Smith}}, the current 3301@uref{mailto:jdsmith@@as.arizona.edu, @b{J.D. Smith}}, the current
3302maintainer, as of version 4.10, helped shape object method completion 3302maintainer, as of version 4.10, helped shape object method completion
3303and most new features introduced in versions 4.x, and introduced many 3303and most new features introduced in versions 4.x, and introduced many
@@ -3364,7 +3364,7 @@ know about the accessible routines.
3364@menu 3364@menu
3365* Routine Definitions:: Where IDL Routines are defined. 3365* Routine Definitions:: Where IDL Routines are defined.
3366* Routine Information Sources:: So how does IDLWAVE know about... 3366* Routine Information Sources:: So how does IDLWAVE know about...
3367* Catalogs:: 3367* Catalogs::
3368* Load-Path Shadows:: Routines defined in several places 3368* Load-Path Shadows:: Routines defined in several places
3369* Documentation Scan:: Scanning the IDL Manuals 3369* Documentation Scan:: Scanning the IDL Manuals
3370@end menu 3370@end menu
@@ -3382,7 +3382,7 @@ know about the accessible routines.
3382several places: 3382several places:
3383 3383
3384@enumerate 3384@enumerate
3385@item 3385@item
3386@emph{Builtin routines} are defined inside IDL itself. The source code 3386@emph{Builtin routines} are defined inside IDL itself. The source code
3387of such routines is not available, but instead are learned about through 3387of such routines is not available, but instead are learned about through
3388the IDL documentation. 3388the IDL documentation.
@@ -3390,7 +3390,7 @@ the IDL documentation.
3390Routines which are @emph{part of the current program}, are defined in a 3390Routines which are @emph{part of the current program}, are defined in a
3391file explicitly compiled by the user. This file may or may not be 3391file explicitly compiled by the user. This file may or may not be
3392located on the IDL search path. 3392located on the IDL search path.
3393@item 3393@item
3394@emph{Library routines} are defined in files located on IDL's search 3394@emph{Library routines} are defined in files located on IDL's search
3395path. When a library routine is called for the first time, IDL will 3395path. When a library routine is called for the first time, IDL will
3396find the source file and compile it dynamically. A special sub-category 3396find the source file and compile it dynamically. A special sub-category
@@ -3428,7 +3428,7 @@ directly with IDL in the form of an XML catalog which IDLWAVE scans.
3428Formerly, this list was created by scanning the IDL manuals to produce 3428Formerly, this list was created by scanning the IDL manuals to produce
3429the file @file{idlw-rinfo.el}. 3429the file @file{idlw-rinfo.el}.
3430 3430
3431@item 3431@item
3432IDLWAVE @emph{scans} all its @emph{buffers} in the current Emacs session 3432IDLWAVE @emph{scans} all its @emph{buffers} in the current Emacs session
3433for routine definitions. This is done automatically when routine 3433for routine definitions. This is done automatically when routine
3434information or completion is first requested by the user. Each new 3434information or completion is first requested by the user. Each new
@@ -3547,8 +3547,8 @@ later).
3547@end defopt 3547@end defopt
3548 3548
3549@menu 3549@menu
3550* Library Catalogs:: 3550* Library Catalogs::
3551* User Catalog:: 3551* User Catalog::
3552@end menu 3552@end menu
3553 3553
3554@html 3554@html
@@ -3636,7 +3636,7 @@ instead, including:
3636@itemize @bullet 3636@itemize @bullet
3637@item The scan is internal to Emacs, so you don't need a working Perl 3637@item The scan is internal to Emacs, so you don't need a working Perl
3638installation, as you do for library catalogs. 3638installation, as you do for library catalogs.
3639@item Can be used to scan directories for which the user has no write 3639@item Can be used to scan directories for which the user has no write
3640privileges. 3640privileges.
3641@item Easy widget-based path selection. 3641@item Easy widget-based path selection.
3642@end itemize 3642@end itemize
@@ -3752,7 +3752,7 @@ Another way to find out if a specific routine has multiple definitions
3752on the load path is routine info display (@pxref{Routine Info}). 3752on the load path is routine info display (@pxref{Routine Info}).
3753 3753
3754@node Documentation Scan, , Load-Path Shadows, Sources of Routine Info 3754@node Documentation Scan, , Load-Path Shadows, Sources of Routine Info
3755@appendixsec Documentation Scan 3755@appendixsec Documentation Scan
3756@cindex @file{get_html_rinfo} 3756@cindex @file{get_html_rinfo}
3757@cindex @file{idlw-rinfo.el} 3757@cindex @file{idlw-rinfo.el}
3758@cindex Scanning the documentation 3758@cindex Scanning the documentation
@@ -3920,7 +3920,7 @@ user is King!
3920(setq idlwave-main-block-indent 3) 3920(setq idlwave-main-block-indent 3)
3921(setq idlwave-end-offset -3) 3921(setq idlwave-end-offset -3)
3922(setq idlwave-continuation-indent 1) 3922(setq idlwave-continuation-indent 1)
3923(setq idlwave-begin-line-comment "^;[^;]") ; Leave ";" but not ";;" 3923(setq idlwave-begin-line-comment "^;[^;]") ; Leave ";" but not ";;"
3924 ; anchored at start of line. 3924 ; anchored at start of line.
3925(setq idlwave-surround-by-blank t) ; Turn on padding ops =,<,> 3925(setq idlwave-surround-by-blank t) ; Turn on padding ops =,<,>
3926(setq idlwave-pad-keyword nil) ; Remove spaces for keyword '=' 3926(setq idlwave-pad-keyword nil) ; Remove spaces for keyword '='
@@ -3987,10 +3987,10 @@ user is King!
3987 ;; (local-set-key "\C-j" 'idlwave-newline) ; My preference. 3987 ;; (local-set-key "\C-j" 'idlwave-newline) ; My preference.
3988 3988
3989 ;; Some personal abbreviations 3989 ;; Some personal abbreviations
3990 (define-abbrev idlwave-mode-abbrev-table 3990 (define-abbrev idlwave-mode-abbrev-table
3991 (concat idlwave-abbrev-start-char "wb") "widget_base()" 3991 (concat idlwave-abbrev-start-char "wb") "widget_base()"
3992 (idlwave-keyword-abbrev 1)) 3992 (idlwave-keyword-abbrev 1))
3993 (define-abbrev idlwave-mode-abbrev-table 3993 (define-abbrev idlwave-mode-abbrev-table
3994 (concat idlwave-abbrev-start-char "on") "obj_new()" 3994 (concat idlwave-abbrev-start-char "on") "obj_new()"
3995 (idlwave-keyword-abbrev 1)) 3995 (idlwave-keyword-abbrev 1))
3996 )) 3996 ))
@@ -4008,12 +4008,12 @@ user is King!
4008(add-hook 'idlwave-shell-mode-hook 4008(add-hook 'idlwave-shell-mode-hook
4009 (lambda () 4009 (lambda ()
4010 ;; Set up some custom key and mouse examine commands 4010 ;; Set up some custom key and mouse examine commands
4011 (idlwave-shell-define-key-both [s-down-mouse-2] 4011 (idlwave-shell-define-key-both [s-down-mouse-2]
4012 (idlwave-shell-mouse-examine 4012 (idlwave-shell-mouse-examine
4013 "print, size(___,/DIMENSIONS)")) 4013 "print, size(___,/DIMENSIONS)"))
4014 (idlwave-shell-define-key-both [f9] (idlwave-shell-examine 4014 (idlwave-shell-define-key-both [f9] (idlwave-shell-examine
4015 "print, size(___,/DIMENSIONS)")) 4015 "print, size(___,/DIMENSIONS)"))
4016 (idlwave-shell-define-key-both [f10] (idlwave-shell-examine 4016 (idlwave-shell-define-key-both [f10] (idlwave-shell-examine
4017 "print,size(___,/TNAME)")) 4017 "print,size(___,/TNAME)"))
4018 (idlwave-shell-define-key-both [f11] (idlwave-shell-examine 4018 (idlwave-shell-define-key-both [f11] (idlwave-shell-examine
4019 "help,___,/STRUCTURE")))) 4019 "help,___,/STRUCTURE"))))
@@ -4066,7 +4066,7 @@ system. I am assuming that IDLWAVE has been installed in
4066sure you check the following things: 4066sure you check the following things:
4067 4067
4068@itemize @bullet 4068@itemize @bullet
4069@item When you download the IDLWAVE distribution, make sure you save the 4069@item When you download the IDLWAVE distribution, make sure you save the
4070file under the names @file{idlwave.tar.gz}. 4070file under the names @file{idlwave.tar.gz}.
4071@item M-TAB switches among running programs --- use Esc-TAB 4071@item M-TAB switches among running programs --- use Esc-TAB
4072instead. 4072instead.
@@ -4102,7 +4102,7 @@ customize the variable @code{idlwave-shell-automatic-electric-debug}
4102if you prefer not to enter electric debug on breakpoints@dots{} but 4102if you prefer not to enter electric debug on breakpoints@dots{} but
4103you really should try it before you disable it! You can also 4103you really should try it before you disable it! You can also
4104customize this variable to enter debug mode when errors are 4104customize this variable to enter debug mode when errors are
4105encountered. 4105encountered.
4106 4106
4107@item @strong{I get errors like @samp{Searching for program: no such 4107@item @strong{I get errors like @samp{Searching for program: no such
4108file or directory, idl} when attempting to start the IDL shell.} 4108file or directory, idl} when attempting to start the IDL shell.}
@@ -4141,7 +4141,7 @@ in compiled lisp files. Presumably, you kept the original .elc files in
4141place, and this is the source of the error. If you recompile (or just 4141place, and this is the source of the error. If you recompile (or just
4142"make; make install") from source, it should resolve this problem. 4142"make; make install") from source, it should resolve this problem.
4143Another option is to recompile the @file{idlw*.el} files by hand using 4143Another option is to recompile the @file{idlw*.el} files by hand using
4144@kbd{M-x byte-compile-file}. 4144@kbd{M-x byte-compile-file}.
4145 4145
4146@item @strong{@kbd{M-@key{TAB}} doesn't complete words, it switches 4146@item @strong{@kbd{M-@key{TAB}} doesn't complete words, it switches
4147windows on my desktop.} 4147windows on my desktop.}
@@ -4266,7 +4266,7 @@ You have a mismatch between your help index and the HTML help package
4266you downloaded. You need to ensure you download a ``downgrade kit'' if 4266you downloaded. You need to ensure you download a ``downgrade kit'' if
4267you are using anything older than the latest HTML help package. A new 4267you are using anything older than the latest HTML help package. A new
4268help package appears with each IDL release (assuming the documentation 4268help package appears with each IDL release (assuming the documentation
4269is updated). 4269is updated).
4270Starting with IDL 6.2, the HTML help and its catalog are 4270Starting with IDL 6.2, the HTML help and its catalog are
4271distributed with IDL, and so should never be inconsistent. 4271distributed with IDL, and so should never be inconsistent.
4272 4272
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index 8db283b5374..8b861cca875 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -1198,7 +1198,7 @@ them with `\='. For example, "\\=\\= is the way to quote \\=\\["
1198will come out as `\= is the way to quote \['. 1198will come out as `\= is the way to quote \['.
1199 1199
1200The new function `substitute-command-keys' takes a string possibly 1200The new function `substitute-command-keys' takes a string possibly
1201contaning \[...] constructs and replaces those constructs with 1201containing \[...] constructs and replaces those constructs with
1202the key sequences they currently stand for. 1202the key sequences they currently stand for.
1203 1203
1204* Primitives `find-line-comment' and `find-line-comment-body' flushed. 1204* Primitives `find-line-comment' and `find-line-comment-body' flushed.
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index c4aeda62c27..87d77cf52fc 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -1026,7 +1026,7 @@ parts of the mode line.
1026 1026
1027*** `shadow' face defines the appearance of the "shadowed" text, i.e. 1027*** `shadow' face defines the appearance of the "shadowed" text, i.e.
1028the text which should be less noticeable than the surrounding text. 1028the text which should be less noticeable than the surrounding text.
1029This can be achieved by using shades of grey in contrast with either 1029This can be achieved by using shades of gray in contrast with either
1030black or white default foreground color. This generic shadow face 1030black or white default foreground color. This generic shadow face
1031allows customization of the appearance of shadowed text in one place, 1031allows customization of the appearance of shadowed text in one place,
1032so package-specific faces can inherit from it. 1032so package-specific faces can inherit from it.
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 9b8909d794a..ec33037acba 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -793,7 +793,7 @@ starts the server. Clients can connect and create graphical or
793terminal frames using emacsclient. 793terminal frames using emacsclient.
794 794
795**** emacsclient starts emacs in daemon mode and connects to it when 795**** emacsclient starts emacs in daemon mode and connects to it when
796--alternate-editor="" is used (or when the evironment variable 796--alternate-editor="" is used (or when the environment variable
797ALTERNATE_EDITOR is set to "") and emacsclient cannot connect to an 797ALTERNATE_EDITOR is set to "") and emacsclient cannot connect to an
798emacs server. 798emacs server.
799 799
diff --git a/etc/TODO b/etc/TODO
index f9d37c4b965..5acd8734ad0 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -841,7 +841,7 @@ more detailed diagnosis.
841 841
842**** Provide an Error Summary buffer showing all the validation errors. 842**** Provide an Error Summary buffer showing all the validation errors.
843 843
844**** Pop-up menu. What is useful? Tag a region (should be greyed out if 844**** Pop-up menu. What is useful? Tag a region (should be grayed out if
845the region is not balanced). Suggestions based on error messages. 845the region is not balanced). Suggestions based on error messages.
846 846
847**** Have configurable list of namespace URIs so that we can provide 847**** Have configurable list of namespace URIs so that we can provide
diff --git a/etc/e/eterm-color.ti b/etc/e/eterm-color.ti
index 0ddb7ec5408..a6ef8149900 100644
--- a/etc/e/eterm-color.ti
+++ b/etc/e/eterm-color.ti
@@ -7,7 +7,7 @@ eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
7# When updating this file, etc/e/eterm-color should be regenerated by 7# When updating this file, etc/e/eterm-color should be regenerated by
8# running "make e/eterm-color" in the etc directory. 8# running "make e/eterm-color" in the etc directory.
9# Any change to this file should be done at the same time with a 9# Any change to this file should be done at the same time with a
10# corresponding change to the TERMCAP evironment variable in term.el. 10# corresponding change to the TERMCAP environment variable in term.el.
11# Comments in term.el specify where each of these capabilities is implemented. 11# Comments in term.el specify where each of these capabilities is implemented.
12 colors#8, 12 colors#8,
13 cols#80, 13 cols#80,
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 230e299b7cf..32de942b038 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2064,7 +2064,7 @@
2064 2064
2065 * window.el (window-auto-delete): Remove. 2065 * window.el (window-auto-delete): Remove.
2066 (window-deletable-p): Remove argument FORCE. Don't deal with 2066 (window-deletable-p): Remove argument FORCE. Don't deal with
2067 dedicatedness and previous buffers. 2067 dedication and previous buffers.
2068 (switch-to-prev-buffer): Don't delete window. 2068 (switch-to-prev-buffer): Don't delete window.
2069 (delete-windows-on): Delete a window's frame if and only if the 2069 (delete-windows-on): Delete a window's frame if and only if the
2070 window is dedicated. 2070 window is dedicated.
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 0d2255ac0a4..a1cfaee6eaf 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -1837,7 +1837,7 @@
18372003-05-31 Stefan Monnier <monnier@cs.yale.edu> 18372003-05-31 Stefan Monnier <monnier@cs.yale.edu>
1838 1838
1839 * view.el (view-file, view-file-other-window, view-file-other-frame): 1839 * view.el (view-file, view-file-other-window, view-file-other-frame):
1840 Signal an error when trying to visit an inexistent file. 1840 Signal an error when trying to visit a nonexistent file.
1841 1841
1842 * vc-hooks.el (vc-call-backend): Give better error message 1842 * vc-hooks.el (vc-call-backend): Give better error message
1843 when a backend function is missing. 1843 when a backend function is missing.
@@ -8053,7 +8053,7 @@
8053 (gdb-quit): Reset some variables including tool-bar-map. 8053 (gdb-quit): Reset some variables including tool-bar-map.
8054 8054
8055 * gud.el (gdb-running): New variable. 8055 * gud.el (gdb-running): New variable.
8056 (gud-menu-map): Use gdb-running to grey out toolbar buttons 8056 (gud-menu-map): Use gdb-running to gray out toolbar buttons
8057 with gdba in gdb-ui.el. 8057 with gdba in gdb-ui.el.
8058 (gud-tool-bar-map): Move to avoid byte compiler warning. 8058 (gud-tool-bar-map): Move to avoid byte compiler warning.
8059 8059
@@ -22790,7 +22790,7 @@
227902001-11-04 Miles Bader <miles@gnu.org> 227902001-11-04 Miles Bader <miles@gnu.org>
22791 22791
22792 * startup.el (fancy-splash-head): Reapply Gerd's hack to make the 22792 * startup.el (fancy-splash-head): Reapply Gerd's hack to make the
22793 shadow of the splash image grey on a dark background instead of black. 22793 shadow of the splash image gray on a dark background instead of black.
22794 22794
227952001-11-03 Stefan Monnier <monnier@cs.yale.edu> 227952001-11-03 Stefan Monnier <monnier@cs.yale.edu>
22796 22796
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 7df2b4b7488..8721130ec50 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -15100,7 +15100,7 @@
151002005-12-21 Stefan Monnier <monnier@iro.umontreal.ca> 151002005-12-21 Stefan Monnier <monnier@iro.umontreal.ca>
15101 15101
15102 * emacs-lisp/lisp.el (lisp-complete-symbol): Don't call 15102 * emacs-lisp/lisp.el (lisp-complete-symbol): Don't call
15103 delete-windows-on with an inexistent buffer. 15103 delete-windows-on with a nonexistent buffer.
15104 15104
151052005-12-22 Nick Roberts <nickrob@snap.net.nz> 151052005-12-22 Nick Roberts <nickrob@snap.net.nz>
15106 15106
@@ -31734,7 +31734,7 @@
317342005-02-23 Stefan Monnier <monnier@iro.umontreal.ca> 317342005-02-23 Stefan Monnier <monnier@iro.umontreal.ca>
31735 31735
31736 * emacs-lisp/debug.el (debug): Hide the buffer if it's not killed. 31736 * emacs-lisp/debug.el (debug): Hide the buffer if it's not killed.
31737 Remove unused and inexistent var `inhibit-trace'. 31737 Remove unused and nonexistent var `inhibit-trace'.
31738 (debugger-mode): Use run-mode-hooks. 31738 (debugger-mode): Use run-mode-hooks.
31739 (debugger-list-functions): Add buttons; setup xref stack. 31739 (debugger-list-functions): Add buttons; setup xref stack.
31740 31740
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index b536f7f1b66..b3e92b1a50a 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -2579,7 +2579,7 @@
25791995-03-13 Karl Fogel <kfogel@floss> 25791995-03-13 Karl Fogel <kfogel@floss>
2580 2580
2581 * bookmark.el: Removed C-v bindings; they were inconsistent. 2581 * bookmark.el: Removed C-v bindings; they were inconsistent.
2582 Defvarred some variables to nil, solely to avoid compilation warnings. 2582 Defvared some variables to nil, solely to avoid compilation warnings.
2583 Use "Author's Update Number:" instead of "Version:". 2583 Use "Author's Update Number:" instead of "Version:".
2584 (bookmark-history): New var. 2584 (bookmark-history): New var.
2585 (bookmark-completing-read): Use `bookmark-history'. 2585 (bookmark-completing-read): Use `bookmark-history'.
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index df2f5cce23f..b9f8de3b598 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -15185,7 +15185,7 @@
151851997-06-16 Dan Nicolaescu <done@ece.arizona.edu> 151851997-06-16 Dan Nicolaescu <done@ece.arizona.edu>
15186 15186
15187 * icon.el (icon-indent-line): A comment ends at the end of the 15187 * icon.el (icon-indent-line): A comment ends at the end of the
15188 line, delete call to inexistent function. 15188 line, delete call to nonexistent function.
15189 15189
15190 * icon.el (icon-font-lock-keywords-1): Improved regexp. 15190 * icon.el (icon-font-lock-keywords-1): Improved regexp.
15191 (icon-font-lock-keywords-2): Likewise. 15191 (icon-font-lock-keywords-2): Likewise.
@@ -19552,7 +19552,7 @@
19552 * term.el: Added a lot of new faces, they all start with 19552 * term.el: Added a lot of new faces, they all start with
19553 term- and follow a simple lexicographical convention. Note that 19553 term- and follow a simple lexicographical convention. Note that
19554 each change is commented: just search for -mm in the source. 19554 each change is commented: just search for -mm in the source.
19555 (term-char-mode): Added all the "grey-keys" to term-raw-map. 19555 (term-char-mode): Added all the "gray-keys" to term-raw-map.
19556 (term-send-up): Similar, decided to go for the more xterm-like 19556 (term-send-up): Similar, decided to go for the more xterm-like
19557 \eOA bindings in place of the previous \e[A. 19557 \eOA bindings in place of the previous \e[A.
19558 (term-buffer-maximum-size): New variable. 19558 (term-buffer-maximum-size): New variable.
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 77ea9fd9d5d..cd685204766 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -4294,7 +4294,7 @@
4294 4294
42951999-07-21 Gerd Moellmann <gerd@gnu.org> 42951999-07-21 Gerd Moellmann <gerd@gnu.org>
4296 4296
4297 * faces.el (toolbar): Grey default background. 4297 * faces.el (toolbar): Gray default background.
4298 (modeline): Ditto. 4298 (modeline): Ditto.
4299 4299
4300 * image.el (image-type-regexps): New. 4300 * image.el (image-type-regexps): New.
diff --git a/lisp/allout.el b/lisp/allout.el
index 47db77f2bbc..68330aa538b 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1952,7 +1952,7 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of
1952 plain BULLETs are by default used, according to the DEPTH of the 1952 plain BULLETs are by default used, according to the DEPTH of the
1953 TOPIC. Choice among the distinctive BULLETs is offered when you 1953 TOPIC. Choice among the distinctive BULLETs is offered when you
1954 provide a universal argument (\\[universal-argument]) to the 1954 provide a universal argument (\\[universal-argument]) to the
1955 TOPIC creation command, or when explictly rebulleting a TOPIC. The 1955 TOPIC creation command, or when explicitly rebulleting a TOPIC. The
1956 significance of the various distinctive bullets is purely by 1956 significance of the various distinctive bullets is purely by
1957 convention. See the documentation for the above bullet strings for 1957 convention. See the documentation for the above bullet strings for
1958 more details. 1958 more details.
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 51e869e3a21..4d93e01fb2e 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -83,7 +83,7 @@ To specify the file in which to save them, modify the variable
83 "The `.emacs.bmk' file used to be called this name.") 83 "The `.emacs.bmk' file used to be called this name.")
84 84
85 85
86;; defvarred to avoid a compilation warning: 86;; defvared to avoid a compilation warning:
87(defvar bookmark-file nil 87(defvar bookmark-file nil
88 "Old name for `bookmark-default-file'.") 88 "Old name for `bookmark-default-file'.")
89 89
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index bd4a5a627a9..c6545dd9015 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -191,7 +191,7 @@ This is to make it compatible with `autoconf-find-last-macro'.
191Assume that MACRO doesn't appear in the buffer yet, so search 191Assume that MACRO doesn't appear in the buffer yet, so search
192the ordering list `autoconf-preferred-macro-order'." 192the ordering list `autoconf-preferred-macro-order'."
193 ;; Search this list backwards.. heh heh heh 193 ;; Search this list backwards.. heh heh heh
194 ;; This lets us do a reverse search easilly. 194 ;; This lets us do a reverse search easily.
195 (let ((ml (member macro (reverse autoconf-preferred-macro-order)))) 195 (let ((ml (member macro (reverse autoconf-preferred-macro-order))))
196 (if (not ml) (error "Don't know how to position for %s yet" macro)) 196 (if (not ml) (error "Don't know how to position for %s yet" macro))
197 (setq ml (cdr ml)) 197 (setq ml (cdr ml))
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 79022be6a5f..a77bb02218b 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -546,7 +546,7 @@ You may need to add support for this type of file."
546 (file-name-extension (car sources)) 546 (file-name-extension (car sources))
547 ""))) 547 "")))
548 )) 548 ))
549 ;; Return the disovered compilers 549 ;; Return the discovered compilers.
550 comp))) 550 comp)))
551 551
552(defmethod ede-proj-linkers ((obj ede-proj-target)) 552(defmethod ede-proj-linkers ((obj ede-proj-target))
@@ -580,7 +580,7 @@ Converts all symbols into the objects to be used."
580 (while (and avail (not (eieio-instance-inheritor-slot-boundp (car avail) 'sourcetype))) 580 (while (and avail (not (eieio-instance-inheritor-slot-boundp (car avail) 'sourcetype)))
581 (setq avail (cdr avail))) 581 (setq avail (cdr avail)))
582 (setq link (cdr avail))))) 582 (setq link (cdr avail)))))
583 ;; Return the disovered linkers 583 ;; Return the discovered linkers.
584 link))) 584 link)))
585 585
586 586
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index c275ba96ee4..ef09ea13b42 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -57,7 +57,7 @@
57;; 57;;
58;; context - A semantic datatype representing a point in a buffer. 58;; context - A semantic datatype representing a point in a buffer.
59;; 59;;
60;; constriant - If a context specifies a specific datatype is needed, 60;; constraint - If a context specifies a specific datatype is needed,
61;; that is a constraint. 61;; that is a constraint.
62;; constants - Some datatypes define elements of themselves as a 62;; constants - Some datatypes define elements of themselves as a
63;; constant. These need to be returned as there would be no 63;; constant. These need to be returned as there would be no
diff --git a/lisp/composite.el b/lisp/composite.el
index 487962ee07c..72317ac470e 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -656,7 +656,7 @@ prepending a space before it."
656 (if (not (char-charset (lglyph-char glyph) coding)) 656 (if (not (char-charset (lglyph-char glyph) coding))
657 (progn 657 (progn
658 ;; As the terminal doesn't support this glyph, return a 658 ;; As the terminal doesn't support this glyph, return a
659 ;; gstring in which each glyph is its own graphme-cluster 659 ;; gstring in which each glyph is its own grapheme-cluster
660 ;; of width 1.. 660 ;; of width 1..
661 (setq i 0) 661 (setq i 0)
662 (while (and (< i nglyphs) 662 (while (and (< i nglyphs)
diff --git a/lisp/dframe.el b/lisp/dframe.el
index b1eb2d636b9..b4f44e1a308 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -718,7 +718,7 @@ Argument PROMPT is the prompt to use."
718 718
719(defun dframe-set-timer (timeout fn &optional _null-on-error) 719(defun dframe-set-timer (timeout fn &optional _null-on-error)
720 "Apply a timer with TIMEOUT, to call FN, or remove a timer if TIMEOUT is nil. 720 "Apply a timer with TIMEOUT, to call FN, or remove a timer if TIMEOUT is nil.
721TIMEOUT is the number of seconds until the dframe controled program 721TIMEOUT is the number of seconds until the dframe controlled program
722timer is called again. When TIMEOUT is nil, turn off all timeouts. 722timer is called again. When TIMEOUT is nil, turn off all timeouts.
723This function must be called from the buffer belonging to the program 723This function must be called from the buffer belonging to the program
724who requested the timer. NULL-ON-ERROR is ignored." 724who requested the timer. NULL-ON-ERROR is ignored."
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 0630f5f4e4e..c9027fb663d 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -135,7 +135,7 @@
135;; We'd have to notice defvars and defconsts, since those variables should 135;; We'd have to notice defvars and defconsts, since those variables should
136;; always be dynamic, and attempting to do a lexical binding of them 136;; always be dynamic, and attempting to do a lexical binding of them
137;; should simply do a dynamic binding instead. 137;; should simply do a dynamic binding instead.
138;; But! We need to know about variables that were not necessarily defvarred 138;; But! We need to know about variables that were not necessarily defvared
139;; in the file being compiled (doing a boundp check isn't good enough.) 139;; in the file being compiled (doing a boundp check isn't good enough.)
140;; Fdefvar() would have to be modified to add something to the plist. 140;; Fdefvar() would have to be modified to add something to the plist.
141;; 141;;
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 3d593570c4e..9aa230cfe9b 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -178,9 +178,9 @@ adds `c' to it; otherwise adds `.elc'."
178;; This can be the 'byte-compile property of any symbol. 178;; This can be the 'byte-compile property of any symbol.
179(autoload 'byte-compile-inline-expand "byte-opt") 179(autoload 'byte-compile-inline-expand "byte-opt")
180 180
181;; This is the entrypoint to the lapcode optimizer pass1. 181;; This is the entry point to the lapcode optimizer pass1.
182(autoload 'byte-optimize-form "byte-opt") 182(autoload 'byte-optimize-form "byte-opt")
183;; This is the entrypoint to the lapcode optimizer pass2. 183;; This is the entry point to the lapcode optimizer pass2.
184(autoload 'byte-optimize-lapcode "byte-opt") 184(autoload 'byte-optimize-lapcode "byte-opt")
185(autoload 'byte-compile-unfold-lambda "byte-opt") 185(autoload 'byte-compile-unfold-lambda "byte-opt")
186 186
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 22db9ddba38..daafd2226ec 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -67,7 +67,7 @@
67 67
68;; TODO: (not just for cconv but also for the lexbind changes in general) 68;; TODO: (not just for cconv but also for the lexbind changes in general)
69;; - let (e)debug find the value of lexical variables from the stack. 69;; - let (e)debug find the value of lexical variables from the stack.
70;; - make eval-region do the eval-sexp-add-defvars danse. 70;; - make eval-region do the eval-sexp-add-defvars dance.
71;; - byte-optimize-form should be applied before cconv. 71;; - byte-optimize-form should be applied before cconv.
72;; OTOH, the warnings emitted by cconv-analyze need to come before optimize 72;; OTOH, the warnings emitted by cconv-analyze need to come before optimize
73;; since afterwards they can because obnoxious (warnings about an "unused 73;; since afterwards they can because obnoxious (warnings about an "unused
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index d43ba6c0d3e..afc8c7faa47 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -579,7 +579,7 @@ PREC2 is a table as returned by `smie-precs->prec2' or
579 (smie-debug--describe-cycle 579 (smie-debug--describe-cycle
580 table (smie-debug--prec2-cycle csts))))) 580 table (smie-debug--prec2-cycle csts)))))
581 (incf i 10)) 581 (incf i 10))
582 ;; Propagate equalities back to their source. 582 ;; Propagate equality constraints back to their sources.
583 (dolist (eq (nreverse eqs)) 583 (dolist (eq (nreverse eqs))
584 (when (null (cadr eq)) 584 (when (null (cadr eq))
585 ;; There's an equality constraint, but we still haven't given 585 ;; There's an equality constraint, but we still haven't given
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 269ee331fb2..680a107adfe 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -267,12 +267,12 @@ SYM to VAL and return t. If INIT-FLAG is non-nil, set with
267 (not ignore-flag))) 267 (not ignore-flag)))
268 268
269(defun filesets-set-default! (sym val) 269(defun filesets-set-default! (sym val)
270 "Call `filestes-set-default' and reset cached data (i.e. rebuild menu)." 270 "Call `filesets-set-default' and reset cached data (i.e. rebuild menu)."
271 (when (filesets-set-default sym val) 271 (when (filesets-set-default sym val)
272 (filesets-reset-fileset))) 272 (filesets-reset-fileset)))
273 273
274(defun filesets-set-default+ (sym val) 274(defun filesets-set-default+ (sym val)
275 "Call `filestes-set-default' and reset filesets' standard menu." 275 "Call `filesets-set-default' and reset filesets' standard menu."
276 (when (filesets-set-default sym val) 276 (when (filesets-set-default sym val)
277 (setq filesets-has-changed-flag t))) 277 (setq filesets-has-changed-flag t)))
278; (filesets-reset-fileset nil t))) 278; (filesets-reset-fileset nil t)))
diff --git a/lisp/follow.el b/lisp/follow.el
index 3badb381c57..2273e8920fd 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -351,7 +351,7 @@ After that, changing the prefix key requires manipulating keymaps."
351;; global map. 351;; global map.
352(easy-menu-add-item nil '("Tools") 352(easy-menu-add-item nil '("Tools")
353 '("Follow" 353 '("Follow"
354 ;; The Emacs code used to just grey out operations when follow-mode was 354 ;; The Emacs code used to just gray out operations when follow-mode was
355 ;; not enabled, whereas the XEmacs code used to remove it altogether. 355 ;; not enabled, whereas the XEmacs code used to remove it altogether.
356 ;; Not sure which is preferable, but clearly the preference should not 356 ;; Not sure which is preferable, but clearly the preference should not
357 ;; depend on the flavor. 357 ;; depend on the flavor.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 39f43bd8e3b..7e0d60018c2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -10961,7 +10961,7 @@
109612007-11-14 Denys Duchier <denys.duchier@univ-orleans.fr> (tiny change) 109612007-11-14 Denys Duchier <denys.duchier@univ-orleans.fr> (tiny change)
10962 10962
10963 * pop3.el (pop3-open-server): Accept and process data more robustly at 10963 * pop3.el (pop3-open-server): Accept and process data more robustly at
10964 connexion start to avoid spurious "POP SSL connexion failed" errors. 10964 connection start to avoid spurious "POP SSL connection failed" errors.
10965 10965
109662007-11-14 Katsumi Yamaoka <yamaoka@jpl.org> 109662007-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
10967 10967
@@ -16516,7 +16516,7 @@
165162005-07-01 Katsumi Yamaoka <yamaoka@jpl.org> 165162005-07-01 Katsumi Yamaoka <yamaoka@jpl.org>
16517 16517
16518 * gnus-art.el (article-display-face): Improve the efficiency. 16518 * gnus-art.el (article-display-face): Improve the efficiency.
16519 (article-display-x-face): Ditto; remove grey x-face stuff. 16519 (article-display-x-face): Ditto; remove gray x-face stuff.
16520 16520
165212005-06-30 Katsumi Yamaoka <yamaoka@jpl.org> 165212005-06-30 Katsumi Yamaoka <yamaoka@jpl.org>
16522 16522
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index 8d4b1a086db..a2d6d61efd4 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -3471,7 +3471,7 @@
3471 * pop3.el (pop3-md5): `with-temp-buffer' doesn't exist in Emacs 3471 * pop3.el (pop3-md5): `with-temp-buffer' doesn't exist in Emacs
3472 19.34. 3472 19.34.
3473 3473
3474 * nneething.el (nneething-directory): Defvarred. 3474 * nneething.el (nneething-directory): Defvared.
3475 3475
3476 * message.el: Autoloaded nndraft things. 3476 * message.el: Autoloaded nndraft things.
3477 (message-set-auto-save-file-name): Use it. 3477 (message-set-auto-save-file-name): Use it.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 952aae28b17..6b11a956a99 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -5120,7 +5120,7 @@
5120 * gnus-util.el (gnus-prin1-to-string): Bind print-length and 5120 * gnus-util.el (gnus-prin1-to-string): Bind print-length and
5121 print-level. 5121 print-level.
5122 5122
5123 * gnus-art.el (article-display-x-face): Removed grey x-face stuff. 5123 * gnus-art.el (article-display-x-face): Removed gray x-face stuff.
5124 (gnus-treat-display-grey-xface): Removed. 5124 (gnus-treat-display-grey-xface): Removed.
5125 5125
5126 * gnus-fun.el (gnus-grab-cam-face): New. 5126 * gnus-fun.el (gnus-grab-cam-face): New.
@@ -9836,7 +9836,7 @@
98362002-02-08 ShengHuo ZHU <zsh@cs.rochester.edu> 98362002-02-08 ShengHuo ZHU <zsh@cs.rochester.edu>
9837 9837
9838 * gnus-art.el (gnus-treat-display-grey-xface): New variable. 9838 * gnus-art.el (gnus-treat-display-grey-xface): New variable.
9839 (article-display-x-face): Use it. Disable grey xface, if 9839 (article-display-x-face): Use it. Disable gray xface, if
9840 uncompface is not found. 9840 uncompface is not found.
9841 9841
9842 * message.el (message-mode): Don't enable multibyte on an indirect 9842 * message.el (message-mode): Don't enable multibyte on an indirect
@@ -11350,7 +11350,7 @@
11350 * gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Renamed. 11350 * gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Renamed.
11351 11351
11352 * gnus-art.el (gnus-ignored-headers): Hide all X-Faces. 11352 * gnus-art.el (gnus-ignored-headers): Hide all X-Faces.
11353 (article-display-x-face): Display grey X-Faces. 11353 (article-display-x-face): Display gray X-Faces.
11354 11354
11355 * gnus-fun.el (gnus-convert-gray-x-face-region): New function. 11355 * gnus-fun.el (gnus-convert-gray-x-face-region): New function.
11356 (gnus-convert-gray-x-face-to-ppm): Ditto. 11356 (gnus-convert-gray-x-face-to-ppm): Ditto.
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 695451ddc45..ee7ba1c193b 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -87,9 +87,9 @@ If no encoding was done, nil is returned."
87 (goto-char (point-min)) 87 (goto-char (point-min))
88 (if (re-search-forward "[^\x0-\x7f]" nil t) 88 (if (re-search-forward "[^\x0-\x7f]" nil t)
89 (or mail-parse-charset 89 (or mail-parse-charset
90 (message-options-get 'mm-encody-body-charset) 90 (message-options-get 'mm-body-charset-encoding-alist)
91 (message-options-set 91 (message-options-set
92 'mm-encody-body-charset 92 'mm-body-charset-encoding-alist
93 (mm-read-coding-system "Charset used in the article: "))) 93 (mm-read-coding-system "Charset used in the article: ")))
94 ;; The logic in `mml-generate-mime-1' confirms that it's OK 94 ;; The logic in `mml-generate-mime-1' confirms that it's OK
95 ;; to return nil here. 95 ;; to return nil here.
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 352fa329e3e..8aa5fbff6b8 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1454,7 +1454,7 @@ Should be adopted if code in `message-send-mail' is changed."
1454 "Display current buffer with Gnus, in a new buffer. 1454 "Display current buffer with Gnus, in a new buffer.
1455If RAW, display a raw encoded MIME message. 1455If RAW, display a raw encoded MIME message.
1456 1456
1457The window layout for the preview buffer is controled by the variables 1457The window layout for the preview buffer is controlled by the variables
1458`special-display-buffer-names', `special-display-regexps', or 1458`special-display-buffer-names', `special-display-regexps', or
1459`gnus-buffer-configuration' (the first match made will be used), 1459`gnus-buffer-configuration' (the first match made will be used),
1460or the `pop-to-buffer' function." 1460or the `pop-to-buffer' function."
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index 399008cec1b..59e06364f42 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1213,7 +1213,7 @@ Use the nov database for the current group if available."
1213 ;; #### already belongs to a range, whereas the corresponding 1213 ;; #### already belongs to a range, whereas the corresponding
1214 ;; #### article doesn't exist (for example, if you delete an 1214 ;; #### article doesn't exist (for example, if you delete an
1215 ;; #### article). For that reason, it is important to update 1215 ;; #### article). For that reason, it is important to update
1216 ;; #### the ranges (meaning remove inexistent articles) before 1216 ;; #### the ranges (meaning remove nonexistent articles) before
1217 ;; #### doing anything on them. 1217 ;; #### doing anything on them.
1218 ;; 2 a/ read articles: 1218 ;; 2 a/ read articles:
1219 (let ((read (gnus-info-read info))) 1219 (let ((read (gnus-info-read info)))
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index ee3e6582e80..0f7a450b30c 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -270,11 +270,11 @@ Use streaming commands."
270 message-count)) 270 message-count))
271 271
272(defcustom pop3-stream-type nil 272(defcustom pop3-stream-type nil
273 "*Transport security type for POP3 connexions. 273 "*Transport security type for POP3 connections.
274This may be either nil (plain connexion), `ssl' (use an 274This may be either nil (plain connection), `ssl' (use an
275SSL/TSL-secured stream) or `starttls' (use the starttls mechanism 275SSL/TSL-secured stream) or `starttls' (use the starttls mechanism
276to turn on TLS security after opening the stream). However, if 276to turn on TLS security after opening the stream). However, if
277this is nil, `ssl' is assumed for connexions to port 277this is nil, `ssl' is assumed for connections to port
278995 (pop3s)." 278995 (pop3s)."
279 :version "23.1" ;; No Gnus 279 :version "23.1" ;; No Gnus
280 :group 'pop3 280 :group 'pop3
diff --git a/lisp/ido.el b/lisp/ido.el
index f425fd5fc63..f2dcba614a9 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1692,7 +1692,7 @@ This function also adds a hook to the minibuffer."
1692(defun ido-nonreadable-directory-p (dir) 1692(defun ido-nonreadable-directory-p (dir)
1693 ;; Return t if dir is a directory, but not readable 1693 ;; Return t if dir is a directory, but not readable
1694 ;; Do not check for non-readable directories via tramp, as this causes a premature 1694 ;; Do not check for non-readable directories via tramp, as this causes a premature
1695 ;; connect on incomplete tramp paths (after entring just method:). 1695 ;; connect on incomplete tramp paths (after entering just method:).
1696 (let ((ido-enable-tramp-completion nil)) 1696 (let ((ido-enable-tramp-completion nil))
1697 (and (ido-final-slash dir) 1697 (and (ido-final-slash dir)
1698 (not (ido-is-unc-host dir)) 1698 (not (ido-is-unc-host dir))
@@ -1702,7 +1702,7 @@ This function also adds a hook to the minibuffer."
1702(defun ido-directory-too-big-p (dir) 1702(defun ido-directory-too-big-p (dir)
1703 ;; Return t if dir is a directory, but too big to show 1703 ;; Return t if dir is a directory, but too big to show
1704 ;; Do not check for non-readable directories via tramp, as this causes a premature 1704 ;; Do not check for non-readable directories via tramp, as this causes a premature
1705 ;; connect on incomplete tramp paths (after entring just method:). 1705 ;; connect on incomplete tramp paths (after entering just method:).
1706 (let ((ido-enable-tramp-completion nil)) 1706 (let ((ido-enable-tramp-completion nil))
1707 (and (numberp ido-max-directory-size) 1707 (and (numberp ido-max-directory-size)
1708 (ido-final-slash dir) 1708 (ido-final-slash dir)
diff --git a/lisp/international/cp51932.el b/lisp/international/cp51932.el
index d4a347d43aa..a6489268578 100644
--- a/lisp/international/cp51932.el
+++ b/lisp/international/cp51932.el
@@ -1,5 +1,5 @@
1;;; cp51932.el -- translation table for CP51932. -*- no-byte-compile: t -*- 1;;; cp51932.el -- translation table for CP51932. -*- no-byte-compile: t -*-
2;;; Automatically genrated from CP932-2BYTE.map 2;;; Automatically generated from CP932-2BYTE.map
3(let ((map 3(let ((map
4 '(;JISEXT<->UNICODE 4 '(;JISEXT<->UNICODE
5 (#x2D21 . #x2460) 5 (#x2D21 . #x2460)
@@ -468,4 +468,3 @@
468 (setcar x (cdr x)) (setcdr x tmp))) 468 (setcar x (cdr x)) (setcdr x tmp)))
469 map) 469 map)
470 (define-translation-table 'cp51932-encode map)) 470 (define-translation-table 'cp51932-encode map))
471
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index f6c706fdce9..fb1735cf6a1 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -819,7 +819,7 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of
819 plain BULLETs are by default used, according to the DEPTH of the 819 plain BULLETs are by default used, according to the DEPTH of the
820 TOPIC. Choice among the distinctive BULLETs is offered when you 820 TOPIC. Choice among the distinctive BULLETs is offered when you
821 provide a universal argument (\\[universal-argument]) to the 821 provide a universal argument (\\[universal-argument]) to the
822 TOPIC creation command, or when explictly rebulleting a TOPIC. The 822 TOPIC creation command, or when explicitly rebulleting a TOPIC. The
823 significance of the various distinctive bullets is purely by 823 significance of the various distinctive bullets is purely by
824 convention. See the documentation for the above bullet strings for 824 convention. See the documentation for the above bullet strings for
825 more details. 825 more details.
@@ -10040,7 +10040,7 @@ beginning of the expanded text.
10040 10040
10041If ARG is a list of numbers, point is placed according to the first 10041If ARG is a list of numbers, point is placed according to the first
10042member of the list, but you can visit the other specified positions 10042member of the list, but you can visit the other specified positions
10043cyclicaly with the functions `expand-jump-to-previous-slot' and 10043cyclically with the functions `expand-jump-to-previous-slot' and
10044`expand-jump-to-next-slot'. 10044`expand-jump-to-next-slot'.
10045 10045
10046If ARG is omitted, point is placed at the end of the expanded text. 10046If ARG is omitted, point is placed at the end of the expanded text.
@@ -24377,7 +24377,7 @@ will be automatically rechecked when Emacs becomes idle; the
24377rechecking will be paused whenever there is input pending. 24377rechecking will be paused whenever there is input pending.
24378 24378
24379By default, uses a vacuous schema that allows any well-formed XML 24379By default, uses a vacuous schema that allows any well-formed XML
24380document. A schema can be specified explictly using 24380document. A schema can be specified explicitly using
24381\\[rng-set-schema-file-and-validate], or implicitly based on the buffer's 24381\\[rng-set-schema-file-and-validate], or implicitly based on the buffer's
24382file name or on the root element name. In each case the schema must 24382file name or on the root element name. In each case the schema must
24383be a RELAX NG schema using the compact schema (such schemas 24383be a RELAX NG schema using the compact schema (such schemas
diff --git a/lisp/man.el b/lisp/man.el
index 14fdac4e5da..0d991a76f52 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1095,7 +1095,7 @@ Same for the ANSI bold and normal escape sequences."
1095 (replace-match "+") 1095 (replace-match "+")
1096 (put-text-property (1- (point)) (point) 'face 'bold)) 1096 (put-text-property (1- (point)) (point) 'face 'bold))
1097 ;; When the header is longer than the manpage name, groff tries to 1097 ;; When the header is longer than the manpage name, groff tries to
1098 ;; condense it to a shorter line interspered with ^H. Remove ^H with 1098 ;; condense it to a shorter line interspersed with ^H. Remove ^H with
1099 ;; their preceding chars (but don't put Man-overstrike-face). (Bug#5566) 1099 ;; their preceding chars (but don't put Man-overstrike-face). (Bug#5566)
1100 (goto-char (point-min)) 1100 (goto-char (point-min))
1101 (while (re-search-forward ".\b" nil t) (backward-delete-char 2)) 1101 (while (re-search-forward ".\b" nil t) (backward-delete-char 2))
@@ -1189,7 +1189,7 @@ script would have done them."
1189 (goto-char (point-min)) 1189 (goto-char (point-min))
1190 (while (re-search-forward "[-|]\\(\b[-|]\\)+" nil t) (replace-match "+")) 1190 (while (re-search-forward "[-|]\\(\b[-|]\\)+" nil t) (replace-match "+"))
1191 ;; When the header is longer than the manpage name, groff tries to 1191 ;; When the header is longer than the manpage name, groff tries to
1192 ;; condense it to a shorter line interspered with ^H. Remove ^H with 1192 ;; condense it to a shorter line interspersed with ^H. Remove ^H with
1193 ;; their preceding chars (but don't put Man-overstrike-face). (Bug#5566) 1193 ;; their preceding chars (but don't put Man-overstrike-face). (Bug#5566)
1194 (goto-char (point-min)) 1194 (goto-char (point-min))
1195 (while (re-search-forward ".\b" nil t) (backward-delete-char 2)) 1195 (while (re-search-forward ".\b" nil t) (backward-delete-char 2))
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 1c0f3ff6300..871b84dd039 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -7385,7 +7385,7 @@
7385 (mh-visit-folder) alias, and v (mh-visit-folder). 7385 (mh-visit-folder) alias, and v (mh-visit-folder).
7386 (mh-index-folder-mode-help-messages): Changes for above. 7386 (mh-index-folder-mode-help-messages): Changes for above.
7387 (mh-index-folder-message-menu, mh-index-folder-folder-menu): New 7387 (mh-index-folder-message-menu, mh-index-folder-folder-menu): New
7388 menus. I decided to delete the unavailable items since greying out 7388 menus. I decided to delete the unavailable items since graying out
7389 implies that the user can do something to access them. In this 7389 implies that the user can do something to access them. In this
7390 case, that's not the case. Well, that's not entirely true--the 7390 case, that's not the case. Well, that's not entirely true--the
7391 user could write code for those functions ;-). 7391 user could write code for those functions ;-).
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 6c2556b1f39..224131623f4 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1651,7 +1651,7 @@ Return non-nil if a selection was deactivated."
1651;;; Hierarchical tagbrowser ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1651;;; Hierarchical tagbrowser ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1652;; Todo: 1652;; Todo:
1653;; - Add a button on each dir to open/close it (?) 1653;; - Add a button on each dir to open/close it (?)
1654;; - add the parent dir on the previous line, greyed-out, if it's not 1654;; - add the parent dir on the previous line, grayed-out, if it's not
1655;; present (because we're in the non-selected part and the parent is 1655;; present (because we're in the non-selected part and the parent is
1656;; in the selected part). 1656;; in the selected part).
1657 1657
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 48502540e29..7ae6912cf8f 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -49,7 +49,7 @@
49;; 'user@' part may be omitted. This syntax can be customized to a certain 49;; 'user@' part may be omitted. This syntax can be customized to a certain
50;; extent by changing ange-ftp-name-format. There are limitations. 50;; extent by changing ange-ftp-name-format. There are limitations.
51;; The `host' part has an optional suffix `#port' which may be used to 51;; The `host' part has an optional suffix `#port' which may be used to
52;; specify a non-default port number for the connexion. 52;; specify a non-default port number for the connection.
53;; 53;;
54;; If the user part is omitted then ange-ftp generates a default user 54;; If the user part is omitted then ange-ftp generates a default user
55;; instead whose value depends on the variable ange-ftp-default-user. 55;; instead whose value depends on the variable ange-ftp-default-user.
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 876e582ed21..9a29e3d4cca 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -230,7 +230,7 @@ will be automatically rechecked when Emacs becomes idle; the
230rechecking will be paused whenever there is input pending. 230rechecking will be paused whenever there is input pending.
231 231
232By default, uses a vacuous schema that allows any well-formed XML 232By default, uses a vacuous schema that allows any well-formed XML
233document. A schema can be specified explictly using 233document. A schema can be specified explicitly using
234\\[rng-set-schema-file-and-validate], or implicitly based on the buffer's 234\\[rng-set-schema-file-and-validate], or implicitly based on the buffer's
235file name or on the root element name. In each case the schema must 235file name or on the root element name. In each case the schema must
236be a RELAX NG schema using the compact schema \(such schemas 236be a RELAX NG schema using the compact schema \(such schemas
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 50761ede7cb..2f4617f5146 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -800,7 +800,7 @@ will only be dimmed."
800 :group 'org-agenda-todo-list 800 :group 'org-agenda-todo-list
801 :type '(choice 801 :type '(choice
802 (const :tag "Do not dim" nil) 802 (const :tag "Do not dim" nil)
803 (const :tag "Dim to a grey face" t) 803 (const :tag "Dim to a gray face" t)
804 (const :tag "Make invisible" invisible))) 804 (const :tag "Make invisible" invisible)))
805 805
806(defcustom org-timeline-show-empty-dates 3 806(defcustom org-timeline-show-empty-dates 3
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index 33fcf451ebb..ee6b67e6109 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -379,7 +379,7 @@ Other useful commands:\n
379 best-square square 379 best-square square
380 score-max score) 380 score-max score)
381 (aset gomoku-score-table square -1))) ; no: kill it ! 381 (aset gomoku-score-table square -1))) ; no: kill it !
382 ;; If score is equally good, choose randomly. But first check freeness: 382 ;; If score is equally good, choose randomly. But first check freedom:
383 ((not (zerop (aref gomoku-board square))) 383 ((not (zerop (aref gomoku-board square)))
384 (aset gomoku-score-table square -1)) 384 (aset gomoku-score-table square -1))
385 ((zerop (random (setq count (1+ count)))) 385 ((zerop (random (setq count (1+ count))))
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index 8629baf35d3..9ef03725c60 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -385,7 +385,7 @@ is non-nil. One interesting value is `turn-on-font-lock'."
385 best-square square 385 best-square square
386 score-max score) 386 score-max score)
387 (aset landmark-score-table square -1))) ; no: kill it ! 387 (aset landmark-score-table square -1))) ; no: kill it !
388 ;; If score is equally good, choose randomly. But first check freeness: 388 ;; If score is equally good, choose randomly. But first check freedom:
389 ((not (zerop (aref landmark-board square))) 389 ((not (zerop (aref landmark-board square)))
390 (aset landmark-score-table square -1)) 390 (aset landmark-score-table square -1))
391 ((zerop (random (setq count (1+ count)))) 391 ((zerop (random (setq count (1+ count))))
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index ad5d5def888..64734420a8c 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -3939,7 +3939,7 @@ If NOERROR is non-nil, it only returns nil if no matching start found."
3939 ;; processing them recursively avoids the need for any special 3939 ;; processing them recursively avoids the need for any special
3940 ;; handling. 3940 ;; handling.
3941 ;; Nothing should be done if we have only the specs or a 3941 ;; Nothing should be done if we have only the specs or a
3942 ;; generic instantion. 3942 ;; generic instantiation.
3943 3943
3944 ((and (looking-at "\\<procedure\\|function\\>")) 3944 ((and (looking-at "\\<procedure\\|function\\>"))
3945 (if first 3945 (if first
@@ -4401,7 +4401,7 @@ Moves to 'begin' if in a declarative part."
4401 (ada-goto-matching-end 1)) 4401 (ada-goto-matching-end 1))
4402 4402
4403 ;; on first line of subprogram body 4403 ;; on first line of subprogram body
4404 ;; Do nothing for specs or generic instantion, since these are 4404 ;; Do nothing for specs or generic instantiation, since these are
4405 ;; handled as the general case (find the enclosing block) 4405 ;; handled as the general case (find the enclosing block)
4406 ;; We also need to make sure that we ignore nested subprograms 4406 ;; We also need to make sure that we ignore nested subprograms
4407 ((save-excursion 4407 ((save-excursion
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 4a6344727b4..37818638d41 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -433,7 +433,7 @@ element is a cons where the car is the character to modify and the cdr
433the new syntax, as accepted by `modify-syntax-entry'." 433the new syntax, as accepted by `modify-syntax-entry'."
434 ;; The $ character is not allowed in most languages (one exception 434 ;; The $ character is not allowed in most languages (one exception
435 ;; is Java which allows it for legacy reasons) but we still classify 435 ;; is Java which allows it for legacy reasons) but we still classify
436 ;; it as an indentifier character since it's often used in various 436 ;; it as an identifier character since it's often used in various
437 ;; machine generated identifiers. 437 ;; machine generated identifiers.
438 t '((?_ . "w") (?$ . "w")) 438 t '((?_ . "w") (?$ . "w"))
439 (objc java) (append '((?@ . "w")) 439 (objc java) (append '((?@ . "w"))
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 07359539256..13fa310106c 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1388,12 +1388,12 @@ The expansion is entirely correct because it uses the C preprocessor."
1388 1388
1389;;; These two must be unwound, otherwise take exponential time 1389;;; These two must be unwound, otherwise take exponential time
1390(defconst cperl-maybe-white-and-comment-rex "[ \t\n]*\\(#[^\n]*\n[ \t\n]*\\)*" 1390(defconst cperl-maybe-white-and-comment-rex "[ \t\n]*\\(#[^\n]*\n[ \t\n]*\\)*"
1391"Regular expression to match optional whitespace with interpspersed comments. 1391"Regular expression to match optional whitespace with interspersed comments.
1392Should contain exactly one group.") 1392Should contain exactly one group.")
1393 1393
1394;;; This one is tricky to unwind; still very inefficient... 1394;;; This one is tricky to unwind; still very inefficient...
1395(defconst cperl-white-and-comment-rex "\\([ \t\n]\\|#[^\n]*\n\\)+" 1395(defconst cperl-white-and-comment-rex "\\([ \t\n]\\|#[^\n]*\n\\)+"
1396"Regular expression to match whitespace with interpspersed comments. 1396"Regular expression to match whitespace with interspersed comments.
1397Should contain exactly one group.") 1397Should contain exactly one group.")
1398 1398
1399 1399
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index ce04d8b390e..95b8d810028 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -724,7 +724,7 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
724 ["Reset to Saved" Custom-reset-saved :active t 724 ["Reset to Saved" Custom-reset-saved :active t
725 :help "Reset all edited or set settings to saved"] 725 :help "Reset all edited or set settings to saved"]
726 ["Reset to Standard Settings" Custom-reset-standard :active t 726 ["Reset to Standard Settings" Custom-reset-standard :active t
727 :help "Erase all cusomizations in buffer"] 727 :help "Erase all customizations in buffer"]
728 ) 728 )
729 "--" 729 "--"
730 ["Indent Subprogram" f90-indent-subprogram t] 730 ["Indent Subprogram" f90-indent-subprogram t]
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index e98ca58f3e0..2dac46a6d5b 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -665,7 +665,7 @@ Used in the Fortran entry in `hs-special-modes-alist'.")
665 ["Reset to Saved" Custom-reset-saved :active t 665 ["Reset to Saved" Custom-reset-saved :active t
666 :help "Reset all edited or set settings to saved"] 666 :help "Reset all edited or set settings to saved"]
667 ["Reset to Standard Settings" Custom-reset-standard :active t 667 ["Reset to Standard Settings" Custom-reset-standard :active t
668 :help "Erase all cusomizations in buffer"] 668 :help "Erase all customizations in buffer"]
669 ) 669 )
670 "--" 670 "--"
671 ["Comment Region" fortran-comment-region mark-active] 671 ["Comment Region" fortran-comment-region mark-active]
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 854cc664b30..406db76487d 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -103,7 +103,7 @@ If SOFT is non-nil, returns nil if the symbol doesn't already exist."
103 103
104(defvar gud-running nil 104(defvar gud-running nil
105 "Non-nil if debugged program is running. 105 "Non-nil if debugged program is running.
106Used to grey out relevant toolbar icons.") 106Used to gray out relevant toolbar icons.")
107 107
108(defvar gud-target-name "--unknown--" 108(defvar gud-target-name "--unknown--"
109 "The apparent name of the program being debugged in a gud buffer.") 109 "The apparent name of the program being debugged in a gud buffer.")
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index c35562a9c5e..aa46b54d848 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -2903,7 +2903,7 @@ from `idlwave-shell-examine-alist' via mini-buffer shortcut key."
2903 ;; Move to beginning of current or previous expression 2903 ;; Move to beginning of current or previous expression
2904 (if (looking-at "\\<\\|(") 2904 (if (looking-at "\\<\\|(")
2905 ;; At beginning of expression, don't move backwards unless 2905 ;; At beginning of expression, don't move backwards unless
2906 ;; this is at the end of an indentifier. 2906 ;; this is at the end of an identifier.
2907 (if (looking-at "\\>") 2907 (if (looking-at "\\>")
2908 (backward-sexp)) 2908 (backward-sexp))
2909 (backward-sexp)) 2909 (backward-sexp))
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index af9ab537893..03e095b6bfc 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -96,7 +96,7 @@
96;; This improves the interaction under Emacs but it still is somewhat 96;; This improves the interaction under Emacs but it still is somewhat
97;; awkward. 97;; awkward.
98 98
99;; Quoted identifiers are not supported for hilighting. Most 99;; Quoted identifiers are not supported for highlighting. Most
100;; databases support the use of double quoted strings in place of 100;; databases support the use of double quoted strings in place of
101;; identifiers; ms (Microsoft SQLServer) also supports identifiers 101;; identifiers; ms (Microsoft SQLServer) also supports identifiers
102;; enclosed within brackets []. 102;; enclosed within brackets [].
@@ -1329,9 +1329,9 @@ statement. The format of variable should be a valid
1329;; are not followed closely, and most vendors offer significant 1329;; are not followed closely, and most vendors offer significant
1330;; capabilities beyond those defined in the standard specifications. 1330;; capabilities beyond those defined in the standard specifications.
1331 1331
1332;; SQL mode provides support for hilighting based on the product. In 1332;; SQL mode provides support for highlighting based on the product. In
1333;; addition to hilighting the product keywords, any ANSI keywords not 1333;; addition to highlighting the product keywords, any ANSI keywords not
1334;; used by the product are also hilighted. This will help identify 1334;; used by the product are also highlighted. This will help identify
1335;; keywords that could be restricted in future versions of the product 1335;; keywords that could be restricted in future versions of the product
1336;; or might be a problem if ported to another product. 1336;; or might be a problem if ported to another product.
1337 1337
@@ -2506,7 +2506,7 @@ See `sql-product-alist' for a list of products and supported features."
2506 "Configure font-lock and imenu with product-specific settings. 2506 "Configure font-lock and imenu with product-specific settings.
2507 2507
2508The KEYWORDS-ONLY flag is passed to font-lock to specify whether 2508The KEYWORDS-ONLY flag is passed to font-lock to specify whether
2509only keywords should be hilighted and syntactic hilighting 2509only keywords should be highlighted and syntactic highlighting
2510skipped. The IMENU flag indicates whether `imenu-mode' should 2510skipped. The IMENU flag indicates whether `imenu-mode' should
2511also be configured." 2511also be configured."
2512 2512
@@ -3807,7 +3807,7 @@ you entered, right above the output it created.
3807 3807
3808 ;; Note that making KEYWORDS-ONLY nil will cause havoc if you try 3808 ;; Note that making KEYWORDS-ONLY nil will cause havoc if you try
3809 ;; SELECT 'x' FROM DUAL with SQL*Plus, because the title of the column 3809 ;; SELECT 'x' FROM DUAL with SQL*Plus, because the title of the column
3810 ;; will have just one quote. Therefore syntactic hilighting is 3810 ;; will have just one quote. Therefore syntactic highlighting is
3811 ;; disabled for interactive buffers. No imenu support. 3811 ;; disabled for interactive buffers. No imenu support.
3812 (sql-product-font-lock t nil) 3812 (sql-product-font-lock t nil)
3813 3813
diff --git a/lisp/replace.el b/lisp/replace.el
index 4ea3f747caa..a46f62ae139 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1663,7 +1663,7 @@ with the `noescape' argument set.
1663 t t))) 1663 t t)))
1664 1664
1665(defun replace-loop-through-replacements (data count) 1665(defun replace-loop-through-replacements (data count)
1666 ;; DATA is a vector contaning the following values: 1666 ;; DATA is a vector containing the following values:
1667 ;; 0 next-rotate-count 1667 ;; 0 next-rotate-count
1668 ;; 1 repeat-count 1668 ;; 1 repeat-count
1669 ;; 2 next-replacement 1669 ;; 2 next-replacement
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 30642e8f2f7..b8a734784be 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -2101,7 +2101,7 @@ cell of the form ( 'DIRLIST . 'FILELIST )."
2101 ;; If the shown files variable has extra directories, then 2101 ;; If the shown files variable has extra directories, then
2102 ;; it is our responsibility to redraw them all 2102 ;; it is our responsibility to redraw them all
2103 ;; Luckily, the nature of inserting items into this list means 2103 ;; Luckily, the nature of inserting items into this list means
2104 ;; that by reversing it, we can easilly go in the right order 2104 ;; that by reversing it, we can easily go in the right order
2105 (let ((sf (cdr (reverse speedbar-shown-directories)))) 2105 (let ((sf (cdr (reverse speedbar-shown-directories))))
2106 (setq speedbar-shown-directories 2106 (setq speedbar-shown-directories
2107 (list (expand-file-name default-directory))) 2107 (list (expand-file-name default-directory)))
diff --git a/lisp/term.el b/lisp/term.el
index aa76e41f595..484bc36363e 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -40,7 +40,7 @@
40;; overhead this has became so small that IMHO is surely outweighted by 40;; overhead this has became so small that IMHO is surely outweighted by
41;; the benefits you get but, as usual, YMMV 41;; the benefits you get but, as usual, YMMV
42;; 42;;
43;; Important caveat, when deciding the cursor/'grey keys' keycodes I had to 43;; Important caveat, when deciding the cursor/'gray keys' keycodes I had to
44;; make a choice: on my Linux box this choice allows me to run all the 44;; make a choice: on my Linux box this choice allows me to run all the
45;; ncurses applications without problems but make these keys 45;; ncurses applications without problems but make these keys
46;; incomprehensible to all the cursesX programs. Your mileage may vary so 46;; incomprehensible to all the cursesX programs. Your mileage may vary so
@@ -910,7 +910,7 @@ is buffer-local."
910 (setq term-raw-escape-map 910 (setq term-raw-escape-map
911 (copy-keymap (lookup-key (current-global-map) "\C-x"))) 911 (copy-keymap (lookup-key (current-global-map) "\C-x")))
912 912
913 ;; Added nearly all the 'grey keys' -mm 913 ;; Added nearly all the 'gray keys' -mm
914 914
915 (if (featurep 'xemacs) 915 (if (featurep 'xemacs)
916 (define-key term-raw-map [button2] 'term-mouse-paste) 916 (define-key term-raw-map [button2] 'term-mouse-paste)
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index c13d22dde71..63c8840621c 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -281,11 +281,11 @@ have been processed."
281;; The ordering of the colors is chosen for the user's convenience in 281;; The ordering of the colors is chosen for the user's convenience in
282;; `list-colors-display', which displays the reverse of this list. 282;; `list-colors-display', which displays the reverse of this list.
283;; Roughly speaking, `list-colors-display' orders by (i) named shades 283;; Roughly speaking, `list-colors-display' orders by (i) named shades
284;; of grey with hue 0.0, sorted by value (ii) named colors with 284;; of gray with hue 0.0, sorted by value (ii) named colors with
285;; saturation 1.0, sorted by hue, (iii) named non-white colors with 285;; saturation 1.0, sorted by hue, (iii) named non-white colors with
286;; saturation less than 1.0, sorted by hue, (iv) other named shades of 286;; saturation less than 1.0, sorted by hue, (iv) other named shades of
287;; white, (v) numbered colors sorted by hue, and (vi) numbered shades 287;; white, (v) numbered colors sorted by hue, and (vi) numbered shades
288;; of grey. 288;; of gray.
289 289
290(declare-function ns-list-colors "nsfns.m" (&optional frame)) 290(declare-function ns-list-colors "nsfns.m" (&optional frame))
291 291
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 1127e6a5d20..40d682c3d93 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -185,7 +185,7 @@ not align (only setting space according to `conf-assignment-space')."
185 (2 'font-lock-constant-face nil t)) 185 (2 'font-lock-constant-face nil t))
186 ;; section { ... } (do this last because some assign ...{...) 186 ;; section { ... } (do this last because some assign ...{...)
187 ("^[ \t]*\\([^=:\n]+?\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend)) 187 ("^[ \t]*\\([^=:\n]+?\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend))
188 "Keywords to hilight in Conf mode.") 188 "Keywords to highlight in Conf mode.")
189 189
190(defvar conf-javaprop-font-lock-keywords 190(defvar conf-javaprop-font-lock-keywords
191 '(;; var=val 191 '(;; var=val
@@ -197,7 +197,7 @@ not align (only setting space according to `conf-assignment-space')."
197 (5 'font-lock-variable-name-face nil t) 197 (5 'font-lock-variable-name-face nil t)
198 (6 'font-lock-constant-face nil t) 198 (6 'font-lock-constant-face nil t)
199 (7 'font-lock-variable-name-face nil t))) 199 (7 'font-lock-variable-name-face nil t)))
200 "Keywords to hilight in Conf Java Properties mode.") 200 "Keywords to highlight in Conf Java Properties mode.")
201 201
202(defvar conf-space-keywords-alist 202(defvar conf-space-keywords-alist
203 '(("\\`/etc/gpm/" . "key\\|name\\|foreground\\|background\\|border\\|head") 203 '(("\\`/etc/gpm/" . "key\\|name\\|foreground\\|background\\|border\\|head")
@@ -240,7 +240,7 @@ This variable is best set in the file local variables, or through
240 (1 'font-lock-variable-name-face)) 240 (1 'font-lock-variable-name-face))
241 ;; section { ... } (do this last because some assign ...{...) 241 ;; section { ... } (do this last because some assign ...{...)
242 ("^[ \t]*\\([^:\n]+\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend)) 242 ("^[ \t]*\\([^:\n]+\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend))
243 "Keywords to hilight in Conf Colon mode.") 243 "Keywords to highlight in Conf Colon mode.")
244 244
245(defvar conf-assignment-sign ?= 245(defvar conf-assignment-sign ?=
246 "Sign used for assignments (char or string).") 246 "Sign used for assignments (char or string).")
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 704fad4fb3b..d0967d63740 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2399,7 +2399,8 @@ Optional REFRESH will unhighlighted then highlight, using block cursor
2399 (setq start (1+ start)))) ; On block non-refresh, inc start. 2399 (setq start (1+ start)))) ; On block non-refresh, inc start.
2400 (let ((modified (buffer-modified-p)) ; don't allow this fn to modify buffer 2400 (let ((modified (buffer-modified-p)) ; don't allow this fn to modify buffer
2401 (buffer-read-only nil) ; Allow highlighting read-only buffers. 2401 (buffer-read-only nil) ; Allow highlighting read-only buffers.
2402 (text (buffer-substring-no-properties start end)) ; Save hilight region 2402 (text (buffer-substring-no-properties start end))
2403 ; Save highlight region.
2403 (inhibit-quit t) ; inhibit interrupt processing here. 2404 (inhibit-quit t) ; inhibit interrupt processing here.
2404 (buffer-undo-list t)) ; don't clutter the undo list. 2405 (buffer-undo-list t)) ; don't clutter the undo list.
2405 (goto-char end) 2406 (goto-char end)
@@ -3977,7 +3978,7 @@ Both should not be used to define a buffer-local dictionary."
3977; LocalWords: Francais Nederlands charset autoloaded popup nonmenu regexp num 3978; LocalWords: Francais Nederlands charset autoloaded popup nonmenu regexp num
3978; LocalWords: AMStex hspace includeonly nocite epsfig displaymath eqnarray reg 3979; LocalWords: AMStex hspace includeonly nocite epsfig displaymath eqnarray reg
3979; LocalWords: minipage modeline pers dict unhighlight buf grep sync prev inc 3980; LocalWords: minipage modeline pers dict unhighlight buf grep sync prev inc
3980; LocalWords: fn hilight 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
3981; LocalWords: uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable 3982; LocalWords: uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable
3982; LocalWords: lns XEmacs HTML casechars Multibyte 3983; LocalWords: lns XEmacs HTML casechars Multibyte
3983 3984
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index b4e15fd2776..f4f10f1d1e0 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -570,13 +570,13 @@ Useful for large TOC's."
570 nil t) 570 nil t)
571 (beginning-of-line)) 571 (beginning-of-line))
572(defun reftex-select-next-heading (&optional arg) 572(defun reftex-select-next-heading (&optional arg)
573 "Move to next table of contentes line." 573 "Move to next table of contents line."
574 (interactive "p") 574 (interactive "p")
575 (end-of-line) 575 (end-of-line)
576 (re-search-forward "^ " nil t arg) 576 (re-search-forward "^ " nil t arg)
577 (beginning-of-line)) 577 (beginning-of-line))
578(defun reftex-select-previous-heading (&optional arg) 578(defun reftex-select-previous-heading (&optional arg)
579 "Move to previous table of contentes line." 579 "Move to previous table of contents line."
580 (interactive "p") 580 (interactive "p")
581 (re-search-backward "^ " nil t arg)) 581 (re-search-backward "^ " nil t arg))
582(defun reftex-select-quit () 582(defun reftex-select-quit ()
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 81e92487eb0..64dffe78d50 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -2716,7 +2716,7 @@ general but you do not like the details."
2716 (rst-define-level-faces))) 2716 (rst-define-level-faces)))
2717 2717
2718;; Faces for displaying items on several levels; these definitions define 2718;; Faces for displaying items on several levels; these definitions define
2719;; different shades of grey where the lightest one (i.e. least contrasting) is 2719;; different shades of gray where the lightest one (i.e. least contrasting) is
2720;; used for level 1 2720;; used for level 1
2721(defcustom rst-level-face-max 6 2721(defcustom rst-level-face-max 6
2722 "Maximum depth of levels for which section title faces are defined." 2722 "Maximum depth of levels for which section title faces are defined."
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index c4892ce572c..34bd24fba3a 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2254,7 +2254,7 @@ Only applies the FSPEC to the args part of FORMAT."
2254 ;; Remove those commands whose input was considered stable for 2254 ;; Remove those commands whose input was considered stable for
2255 ;; some other command (typically if (t . "%.pdf") is inactive 2255 ;; some other command (typically if (t . "%.pdf") is inactive
2256 ;; then we're using pdflatex and the fact that the dvi file 2256 ;; then we're using pdflatex and the fact that the dvi file
2257 ;; is inexistent doesn't matter). 2257 ;; is nonexistent doesn't matter).
2258 (let ((tmp nil)) 2258 (let ((tmp nil))
2259 (dolist (cmd cmds) 2259 (dolist (cmd cmds)
2260 (unless (member (nth 1 cmd) unchanged-in) 2260 (unless (member (nth 1 cmd) unchanged-in)
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 47f006eebda..48d2caf35f4 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1977,7 +1977,7 @@
1977 1977
1978 * lisp/url-gw.el (url-gw-inhibit-code-conversion): Remove. 1978 * lisp/url-gw.el (url-gw-inhibit-code-conversion): Remove.
1979 (url-open-stream): Bind coding-system-for{read,write} when setting 1979 (url-open-stream): Bind coding-system-for{read,write} when setting
1980 up the connexion. Don't call url-gw-inhibit-code-conversion. 1980 up the connection. Don't call url-gw-inhibit-code-conversion.
1981 1981
19822001-05-24 William M. Perry <wmperry@gnu.org> 19822001-05-24 William M. Perry <wmperry@gnu.org>
1983 1983
@@ -2516,4 +2516,3 @@
2516 2516
2517 You should have received a copy of the GNU General Public License 2517 You should have received a copy of the GNU General Public License
2518 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 2518 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
2519
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index ddd9371b060..ee7837b29a3 100644
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -50,7 +50,7 @@ For help on a specific command: Click Button 2 over it; or
50(defconst ediff-long-help-message-compare3 50(defconst ediff-long-help-message-compare3
51 " 51 "
52p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y 52p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y
53n,SPC -next diff | h -hilighting | rx -restore buf X's old diff 53n,SPC -next diff | h -highlighting | rx -restore buf X's old diff
54 j -jump to diff | @ -auto-refinement | * -refine current region 54 j -jump to diff | @ -auto-refinement | * -refine current region
55 gx -goto X's point| ## -ignore whitespace | ! -update diff regions 55 gx -goto X's point| ## -ignore whitespace | ! -update diff regions
56 C-l -recenter | #c -ignore case | 56 C-l -recenter | #c -ignore case |
@@ -64,7 +64,7 @@ Normally, not a user option. See `ediff-help-message' for details.")
64(defconst ediff-long-help-message-compare2 64(defconst ediff-long-help-message-compare2
65 " 65 "
66p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A 66p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A
67n,SPC -next diff | h -hilighting | rx -restore buf X's old diff 67n,SPC -next diff | h -highlighting | rx -restore buf X's old diff
68 j -jump to diff | @ -auto-refinement | * -refine current region 68 j -jump to diff | @ -auto-refinement | * -refine current region
69 gx -goto X's point| ## -ignore whitespace | ! -update diff regions 69 gx -goto X's point| ## -ignore whitespace | ! -update diff regions
70 C-l -recenter | #c -ignore case | 70 C-l -recenter | #c -ignore case |
@@ -78,7 +78,7 @@ Normally, not a user option. See `ediff-help-message' for details.")
78(defconst ediff-long-help-message-narrow2 78(defconst ediff-long-help-message-narrow2
79 " 79 "
80p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A 80p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A
81n,SPC -next diff | h -hilighting | rx -restore buf X's old diff 81n,SPC -next diff | h -highlighting | rx -restore buf X's old diff
82 j -jump to diff | @ -auto-refinement | * -refine current region 82 j -jump to diff | @ -auto-refinement | * -refine current region
83 gx -goto X's point| ## -ignore whitespace | ! -update diff regions 83 gx -goto X's point| ## -ignore whitespace | ! -update diff regions
84 C-l -recenter | #c -ignore case | % -narrow/widen buffs 84 C-l -recenter | #c -ignore case | % -narrow/widen buffs
@@ -92,7 +92,7 @@ Normally, not a user option. See `ediff-help-message' for details.")
92(defconst ediff-long-help-message-word-mode 92(defconst ediff-long-help-message-word-mode
93 " 93 "
94p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y 94p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y
95n,SPC -next diff | h -hilighting | rx -restore buf X's old diff 95n,SPC -next diff | h -highlighting | rx -restore buf X's old diff
96 j -jump to diff | | 96 j -jump to diff | |
97 gx -goto X's point| % -narrow/widen buffs | ! -recompute diffs 97 gx -goto X's point| % -narrow/widen buffs | ! -recompute diffs
98 C-l -recenter | #c -ignore case | 98 C-l -recenter | #c -ignore case |
@@ -106,7 +106,7 @@ Normally, not a user option. See `ediff-help-message' for details.")
106(defconst ediff-long-help-message-merge 106(defconst ediff-long-help-message-merge
107 " 107 "
108p,DEL -previous diff | | -vert/horiz split | x -copy buf X's region to C 108p,DEL -previous diff | | -vert/horiz split | x -copy buf X's region to C
109n,SPC -next diff | h -hilighting | r -restore buf C's old diff 109n,SPC -next diff | h -highlighting | r -restore buf C's old diff
110 j -jump to diff | @ -auto-refinement | * -refine current region 110 j -jump to diff | @ -auto-refinement | * -refine current region
111 gx -goto X's point| ## -ignore whitespace | ! -update diff regions 111 gx -goto X's point| ## -ignore whitespace | ! -update diff regions
112 C-l -recenter | #f/#h -focus/hide regions | + -combine diff regions 112 C-l -recenter | #f/#h -focus/hide regions | + -combine diff regions
diff --git a/lisp/window.el b/lisp/window.el
index 0796b7fa493..35d80e30ee3 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -170,7 +170,7 @@ Applications should never rebind this variable. To resize a
170window to a height less than the one specified here, an 170window to a height less than the one specified here, an
171application should instead call `window-resize' with a non-nil 171application should instead call `window-resize' with a non-nil
172IGNORE argument. In order to have `split-window' make a window 172IGNORE argument. In order to have `split-window' make a window
173shorter, explictly specify the SIZE argument of that function." 173shorter, explicitly specify the SIZE argument of that function."
174 :type 'integer 174 :type 'integer
175 :version "24.1" 175 :version "24.1"
176 :group 'windows) 176 :group 'windows)
@@ -190,7 +190,7 @@ Applications should never rebind this variable. To resize a
190window to a width less than the one specified here, an 190window to a width less than the one specified here, an
191application should instead call `window-resize' with a non-nil 191application should instead call `window-resize' with a non-nil
192IGNORE argument. In order to have `split-window' make a window 192IGNORE argument. In order to have `split-window' make a window
193narrower, explictly specify the SIZE argument of that function." 193narrower, explicitly specify the SIZE argument of that function."
194 :type 'integer 194 :type 'integer
195 :version "24.1" 195 :version "24.1"
196 :group 'windows) 196 :group 'windows)
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 4c0590aa94b..42af99ccc58 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -23013,7 +23013,7 @@
23013 (try_window_id): Likewise. 23013 (try_window_id): Likewise.
23014 (redisplay_window): New local var buffer_unchanged_p. 23014 (redisplay_window): New local var buffer_unchanged_p.
23015 23015
23016 * keyboard.c (cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_houglass. 23016 * keyboard.c (cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_hourglass.
23017 23017
23018 * process.c (create_process): Test USG_SUBTTY_WORKS. 23018 * process.c (create_process): Test USG_SUBTTY_WORKS.
23019 (process_send_signal): Clean up handling of GID. 23019 (process_send_signal): Clean up handling of GID.
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 7c027f1caec..7c46dea675c 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -22234,7 +22234,7 @@
22234 * lisp.h (Fdelete_terminal): Declare. 22234 * lisp.h (Fdelete_terminal): Declare.
22235 22235
22236 * charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID) 22236 * charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID)
22237 (CHECK_CHARSET_GET_ATTR): Don't use the inexistent return value of 22237 (CHECK_CHARSET_GET_ATTR): Don't use the nonexistent return value of
22238 wrong_type_argument. 22238 wrong_type_argument.
22239 22239
222402008-02-22 Kenichi Handa <handa@ni.aist.go.jp> 222402008-02-22 Kenichi Handa <handa@ni.aist.go.jp>
@@ -31330,7 +31330,7 @@
31330 31330
313312007-05-12 Chong Yidong <cyd@stupidchicken.com> 313312007-05-12 Chong Yidong <cyd@stupidchicken.com>
31332 31332
31333 * image.c (pbm_load): Correctly check image size for greyscale pbm. 31333 * image.c (pbm_load): Correctly check image size for grayscale pbm.
31334 31334
31335 * xterm.c (XTread_socket): Yet Another Uncaught X Error Crash (YAUXEC). 31335 * xterm.c (XTread_socket): Yet Another Uncaught X Error Crash (YAUXEC).
31336 31336
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 493e8e1ab04..34906e505da 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -3271,7 +3271,7 @@
3271 [not HAVE_X11] (x_set_border_pixel): Use gray_width and 3271 [not HAVE_X11] (x_set_border_pixel): Use gray_width and
3272 gray_height, instead of assuming that the bitmap is 16x16. 3272 gray_height, instead of assuming that the bitmap is 16x16.
3273 (x_make_gc): Instead of creating a pixmap and then calling 3273 (x_make_gc): Instead of creating a pixmap and then calling
3274 XPutImage to make it into a grey stipple, just call 3274 XPutImage to make it into a gray stipple, just call
3275 XCreatePixmapFromBitmapData to do it all at once. 3275 XCreatePixmapFromBitmapData to do it all at once.
3276 3276
3277 * xterm.c (x_text_icon): Move the request for font information 3277 * xterm.c (x_text_icon): Move the request for font information
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 4c9ecfb4d4d..2f3ee45a1ac 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -5409,7 +5409,7 @@
5409 5409
54101998-11-10 Gerd Moellmann <gerd@gnu.org> 54101998-11-10 Gerd Moellmann <gerd@gnu.org>
5411 5411
5412 * xrdb.c (x_load_resources): Add grey background colors as 5412 * xrdb.c (x_load_resources): Add gray background colors as
5413 defaults for menus, scroll bars, and dialogs. 5413 defaults for menus, scroll bars, and dialogs.
5414 5414
5415 * insdel.c (prepare_to_modify_buffer): Move setting 5415 * insdel.c (prepare_to_modify_buffer): Move setting
diff --git a/src/buffer.c b/src/buffer.c
index f8482c351c5..a482493fac7 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1631,7 +1631,7 @@ with SIGHUP. */)
1631 1631
1632 /* Reset the local variables, so that this buffer's local values 1632 /* Reset the local variables, so that this buffer's local values
1633 won't be protected from GC. They would be protected 1633 won't be protected from GC. They would be protected
1634 if they happened to remain encached in their symbols. 1634 if they happened to remain cached in their symbols.
1635 This gets rid of them for certain. */ 1635 This gets rid of them for certain. */
1636 swap_out_buffer_local_variables (b); 1636 swap_out_buffer_local_variables (b);
1637 reset_buffer_local_variables (b, 1); 1637 reset_buffer_local_variables (b, 1);
@@ -2486,7 +2486,7 @@ swap_out_buffer_local_variables (struct buffer *b)
2486 Lisp_Object sym = XCAR (XCAR (alist)); 2486 Lisp_Object sym = XCAR (XCAR (alist));
2487 eassert (XSYMBOL (sym)->redirect == SYMBOL_LOCALIZED); 2487 eassert (XSYMBOL (sym)->redirect == SYMBOL_LOCALIZED);
2488 /* Need not do anything if some other buffer's binding is 2488 /* Need not do anything if some other buffer's binding is
2489 now encached. */ 2489 now cached. */
2490 if (EQ (SYMBOL_BLV (XSYMBOL (sym))->where, buffer)) 2490 if (EQ (SYMBOL_BLV (XSYMBOL (sym))->where, buffer))
2491 { 2491 {
2492 /* Symbol is set up for this buffer's old local value: 2492 /* Symbol is set up for this buffer's old local value:
diff --git a/src/charset.c b/src/charset.c
index b6921a762b6..3c15f1bee54 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -166,9 +166,9 @@ static struct
166 maximum character of the current charset. */ 166 maximum character of the current charset. */
167 int min_char, max_char; 167 int min_char, max_char;
168 168
169 /* A Unicode character correspoinding to the code indice 0 (i.e. the 169 /* A Unicode character corresponding to the code index 0 (i.e. the
170 minimum code-point) of the current charset, or -1 if the code 170 minimum code-point) of the current charset, or -1 if the code
171 indice 0 is not a Unicode character. This is checked when 171 index 0 is not a Unicode character. This is checked when
172 table.encoder[CHAR] is zero. */ 172 table.encoder[CHAR] is zero. */
173 int zero_index_char; 173 int zero_index_char;
174 174
diff --git a/src/dispextern.h b/src/dispextern.h
index 3225c1eb46e..5228a71ba3f 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -405,7 +405,7 @@ struct glyph
405 { 405 {
406 /* Metrics of a partial glyph of an image (type == IMAGE_GLYPH). */ 406 /* Metrics of a partial glyph of an image (type == IMAGE_GLYPH). */
407 struct glyph_slice img; 407 struct glyph_slice img;
408 /* Start and end indices of glyphs of a graphme cluster of a 408 /* Start and end indices of glyphs of a grapheme cluster of a
409 composition (type == COMPOSITE_GLYPH). */ 409 composition (type == COMPOSITE_GLYPH). */
410 struct { int from, to; } cmp; 410 struct { int from, to; } cmp;
411 /* Pixel offsets for upper and lower part of the acronym. */ 411 /* Pixel offsets for upper and lower part of the acronym. */
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 2dfb3a5ed6c..7cc2d21f9c4 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -98,7 +98,7 @@ extern GtkWidget *xg_create_widget (const char *type,
98 struct _widget_value *val, 98 struct _widget_value *val,
99 GCallback select_cb, 99 GCallback select_cb,
100 GCallback deactivate_cb, 100 GCallback deactivate_cb,
101 GCallback hightlight_cb); 101 GCallback highlight_cb);
102 102
103extern void xg_modify_menubar_widgets (GtkWidget *menubar, 103extern void xg_modify_menubar_widgets (GtkWidget *menubar,
104 FRAME_PTR f, 104 FRAME_PTR f,
@@ -106,7 +106,7 @@ extern void xg_modify_menubar_widgets (GtkWidget *menubar,
106 int deep_p, 106 int deep_p,
107 GCallback select_cb, 107 GCallback select_cb,
108 GCallback deactivate_cb, 108 GCallback deactivate_cb,
109 GCallback hightlight_cb); 109 GCallback highlight_cb);
110 110
111extern int xg_update_frame_menubar (FRAME_PTR f); 111extern int xg_update_frame_menubar (FRAME_PTR f);
112 112
diff --git a/src/lisp.h b/src/lisp.h
index dcd1167e0a2..fa41239a1c8 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -324,7 +324,7 @@ union Lisp_Object
324 324
325 struct 325 struct
326 { 326 {
327 /* Use explict signed, the signedness of a bit-field of type 327 /* Use explicit signed, the signedness of a bit-field of type
328 int is implementation defined. */ 328 int is implementation defined. */
329 signed EMACS_INT val : VALBITS; 329 signed EMACS_INT val : VALBITS;
330 ENUM_BF (Lisp_Type) type : GCTYPEBITS; 330 ENUM_BF (Lisp_Type) type : GCTYPEBITS;
@@ -349,7 +349,7 @@ union Lisp_Object
349 struct 349 struct
350 { 350 {
351 ENUM_BF (Lisp_Type) type : GCTYPEBITS; 351 ENUM_BF (Lisp_Type) type : GCTYPEBITS;
352 /* Use explict signed, the signedness of a bit-field of type 352 /* Use explicit signed, the signedness of a bit-field of type
353 int is implementation defined. */ 353 int is implementation defined. */
354 signed EMACS_INT val : VALBITS; 354 signed EMACS_INT val : VALBITS;
355 } s; 355 } s;
diff --git a/src/lread.c b/src/lread.c
index f1f6f0cbd78..cdbd09d2f89 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1917,7 +1917,7 @@ which is the input stream for reading characters.
1917This function does not move point. */) 1917This function does not move point. */)
1918 (Lisp_Object start, Lisp_Object end, Lisp_Object printflag, Lisp_Object read_function) 1918 (Lisp_Object start, Lisp_Object end, Lisp_Object printflag, Lisp_Object read_function)
1919{ 1919{
1920 /* FIXME: Do the eval-sexp-add-defvars danse! */ 1920 /* FIXME: Do the eval-sexp-add-defvars dance! */
1921 int count = SPECPDL_INDEX (); 1921 int count = SPECPDL_INDEX ();
1922 Lisp_Object tem, cbuf; 1922 Lisp_Object tem, cbuf;
1923 1923
diff --git a/src/nsterm.m b/src/nsterm.m
index b02561442e5..5e19a397c34 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -559,7 +559,7 @@ ns_constrain_all_frames (void)
559 { 559 {
560 NSView *view = FRAME_NS_VIEW (f); 560 NSView *view = FRAME_NS_VIEW (f);
561 /* This no-op will trigger the default window placing 561 /* This no-op will trigger the default window placing
562 * constriant system. */ 562 * constraint system. */
563 f->output_data.ns->dont_constrain = 0; 563 f->output_data.ns->dont_constrain = 0;
564 [[view window] setFrameOrigin:[[view window] frame].origin]; 564 [[view window] setFrameOrigin:[[view window] frame].origin];
565 } 565 }
diff --git a/src/w32fns.c b/src/w32fns.c
index 96b3f69b728..7a17c108d4d 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5011,7 +5011,8 @@ no value of TYPE (always string in the MS Windows case). */)
5011 cursor. Duplicated from xdisp.c, but cannot use the version there 5011 cursor. Duplicated from xdisp.c, but cannot use the version there
5012 due to lack of atimers on w32. */ 5012 due to lack of atimers on w32. */
5013#define DEFAULT_HOURGLASS_DELAY 1 5013#define DEFAULT_HOURGLASS_DELAY 1
5014/* Return non-zero if houglass timer has been started or hourglass is shown. */ 5014/* Return non-zero if hourglass timer has been started or hourglass is
5015 shown. */
5015/* PENDING: if W32 can use atimers (atimer.[hc]) then the common impl in 5016/* PENDING: if W32 can use atimers (atimer.[hc]) then the common impl in
5016 xdisp.c could be used. */ 5017 xdisp.c could be used. */
5017 5018
diff --git a/src/widget.c b/src/widget.c
index 0582718948d..181811b8369 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -808,7 +808,7 @@ EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry *request, XtWidgetGeome
808 return result->request_mode ? XtGeometryAlmost : XtGeometryYes; 808 return result->request_mode ? XtGeometryAlmost : XtGeometryYes;
809} 809}
810 810
811/* Special entrypoints */ 811/* Special entry points */
812void 812void
813EmacsFrameSetCharSize (Widget widget, int columns, int rows) 813EmacsFrameSetCharSize (Widget widget, int columns, int rows)
814{ 814{
diff --git a/src/widget.h b/src/widget.h
index f64f188e158..b5b4147b167 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -92,9 +92,8 @@ extern WidgetClass emacsFrameClass;
92 92
93extern struct _DisplayContext* display_context; 93extern struct _DisplayContext* display_context;
94 94
95/* Special entrypoints */ 95/* Special entry points */
96void EmacsFrameSetCharSize (Widget, int, int); 96void EmacsFrameSetCharSize (Widget, int, int);
97void widget_store_internal_border (Widget widget); 97void widget_store_internal_border (Widget widget);
98 98
99#endif /* _EmacsFrame_h */ 99#endif /* _EmacsFrame_h */
100
diff --git a/src/window.c b/src/window.c
index bb2478d78fd..af4fad054a2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3088,7 +3088,7 @@ This function runs `window-scroll-functions' before running
3088 error ("Window is dedicated to `%s'", SDATA (BVAR (XBUFFER (tem), name))); 3088 error ("Window is dedicated to `%s'", SDATA (BVAR (XBUFFER (tem), name)));
3089 else 3089 else
3090 /* WINDOW is weakly dedicated to its buffer, reset 3090 /* WINDOW is weakly dedicated to its buffer, reset
3091 dedicatedness. */ 3091 dedication. */
3092 w->dedicated = Qnil; 3092 w->dedicated = Qnil;
3093 3093
3094 call1 (Qrecord_window_buffer, window); 3094 call1 (Qrecord_window_buffer, window);
@@ -6299,7 +6299,7 @@ freeze_window_starts (struct frame *f, int freeze_p)
6299 ignore_positions non-zero means ignore non-matching scroll positions 6299 ignore_positions non-zero means ignore non-matching scroll positions
6300 and the like. 6300 and the like.
6301 6301
6302 This ignores a couple of things like the dedicatedness status of 6302 This ignores a couple of things like the dedication status of
6303 window, combination_limit and the like. This might have to be 6303 window, combination_limit and the like. This might have to be
6304 fixed. */ 6304 fixed. */
6305 6305
diff --git a/src/xdisp.c b/src/xdisp.c
index 921155940b5..c9b9b5c5e88 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28662,7 +28662,8 @@ init_xdisp (void)
28662 28662
28663/* Platform-independent portion of hourglass implementation. */ 28663/* Platform-independent portion of hourglass implementation. */
28664 28664
28665/* Return non-zero if houglass timer has been started or hourglass is shown. */ 28665/* Return non-zero if hourglass timer has been started or hourglass is
28666 shown. */
28666int 28667int
28667hourglass_started (void) 28668hourglass_started (void)
28668{ 28669{
diff --git a/src/xfaces.c b/src/xfaces.c
index 849ad6bbdf4..7e3ce4103d9 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -66,7 +66,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
66 attributes (1st thru 5th) are updated from the spec. 66 attributes (1st thru 5th) are updated from the spec.
67 67
68 On the other hand, if one of the other font-related attributes are 68 On the other hand, if one of the other font-related attributes are
69 specified, the correspoinding specs in this attribute is set to nil. 69 specified, the corresponding specs in this attribute is set to nil.
70 70
71 15. A face name or list of face names from which to inherit attributes. 71 15. A face name or list of face names from which to inherit attributes.
72 72
@@ -1223,7 +1223,7 @@ face_color_gray_p (struct frame *f, const char *color_name)
1223 int gray_p; 1223 int gray_p;
1224 1224
1225 if (defined_color (f, color_name, &color, 0)) 1225 if (defined_color (f, color_name, &color, 0))
1226 gray_p = (/* Any color sufficiently close to black counts as grey. */ 1226 gray_p = (/* Any color sufficiently close to black counts as gray. */
1227 (color.red < 5000 && color.green < 5000 && color.blue < 5000) 1227 (color.red < 5000 && color.green < 5000 && color.blue < 5000)
1228 || 1228 ||
1229 ((eabs (color.red - color.green) 1229 ((eabs (color.red - color.green)