procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Spelling fixes.

Browse source
This commit is contained in:
Paul Eggert 2011-11-26 20:43:11 -08:00
parent 83aca1cb69
commit e47695319f
86 changed files with 221 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
admin/charsets/cp51932.awk
View file

@ -32,7 +32,7 @@
BEGIN {
print ";;; cp51932.el -- translation table for CP51932. -*- no-byte-compile: t -*-";
print ";;; Automatically genrated from CP932-2BYTE.map";
print ";;; Automatically generated from CP932-2BYTE.map";
print "(let ((map";
printf " '(;JISEXT<->UNICODE";
}

2
doc/emacs/building.texi
View file

@ -995,7 +995,7 @@ breakpoint}, the breakpoint which point is on.
Enable/disable current breakpoint (@code{gdb-toggle-breakpoint}).
On a graphical display, this changes the color of a bullet in the
margin of a source buffer at the relevant line. This is red when
the breakpoint is enabled and grey when it is disabled. Text-only
the breakpoint is enabled and gray when it is disabled. Text-only
terminals correspondingly display a @samp{B} or @samp{b}.
@item D

2
doc/lispref/spellfile
View file

@ -253,7 +253,6 @@ deletable
deletion'
delq
depiction
descendents
deselecting
destructive'
destructively'
@ -299,7 +298,6 @@ excess'
exec
exitcode
expression'
extendible
extra'
fails'
fascist

2
doc/misc/calc.texi
View file

@ -25644,7 +25644,7 @@ equivalent expression involving intervals: @samp{b in [a .. c)}.
of @samp{<} and @samp{<=} are allowed, or any of the four combinations
of @samp{>} and @samp{>=}. Four-argument constructions like
@samp{a < b < c < d}, and mixtures like @w{@samp{a < b = c}} that
involve both equalities and inequalities, are not allowed.
involve both equations and inequalities, are not allowed.
@kindex a .
@pindex calc-remove-equal

2
doc/misc/eieio.texi
View file

@ -1458,7 +1458,7 @@ Useful methods to define for your new class include:
@defmethod eieio-speedbar eieio-speedbar-derive-line-path obj depth
Return a string representing a directory associated with an instance
of @var{obj}. @var{depth} can be used to indice how many levels of
of @var{obj}. @var{depth} can be used to index how many levels of
indentation have been opened by the user where @var{obj} is shown.
@end defmethod

2
doc/misc/gnus.texi
View file

@ -27408,7 +27408,7 @@ considered home score and adapt files (@pxref{Home Score File}) have
been added.
@item
@code{nndoc} was rewritten to be easily extendable (@pxref{Document
@code{nndoc} was rewritten to be easily extensible (@pxref{Document
Server Internals}).
@item

184
doc/misc/idlwave.texi
View file

@ -62,7 +62,7 @@ developing GNU and promoting software freedom.''
IDLWAVE is a package which supports editing source code written in the
Interactive Data Language (IDL), and running IDL as an inferior shell.
@insertcopying
@insertcopying
@end ifnottex
@menu
@ -72,8 +72,8 @@ Interactive Data Language (IDL), and running IDL as an inferior shell.
* The IDLWAVE Major Mode:: The mode for editing IDL programs
* The IDLWAVE Shell:: The mode for running IDL as an inferior program
* Acknowledgements:: Who did what
* Sources of Routine Info:: How does IDLWAVE know about routine XYZ
* HTML Help Browser Tips::
* Sources of Routine Info:: How does IDLWAVE know about routine XYZ
* HTML Help Browser Tips::
* Configuration Examples:: The user is king
* Windows and MacOS:: What still works, and how
* Troubleshooting:: When good computers turn bad
@ -85,9 +85,9 @@ Interactive Data Language (IDL), and running IDL as an inferior shell.
Getting Started (Tutorial)
* Lesson I -- Development Cycle::
* Lesson II -- Customization::
* Lesson III -- User Catalog::
* Lesson I -- Development Cycle::
* Lesson II -- Customization::
* Lesson III -- User Catalog::
The IDLWAVE Major Mode
@ -107,7 +107,7 @@ The IDLWAVE Major Mode
Code Formatting
* Code Indentation:: Reflecting the logical structure
* Continued Statement Indentation::
* Continued Statement Indentation::
* Comment Indentation:: Special indentation for comment lines
* Continuation Lines:: Splitting statements over lines
* Syntax Highlighting:: Font-lock support
@ -115,14 +115,14 @@ Code Formatting
Online Help
* Help with HTML Documentation::
* Help with Source::
* Help with HTML Documentation::
* Help with Source::
Completion
* Case of Completed Words:: CaseOFcomPletedWords
* Object Method Completion and Class Ambiguity:: obj->Method, what?
* Object Method Completion in the Shell::
* Object Method Completion in the Shell::
* Class and Keyword Inheritance:: obj->Method, _EXTRA=e
* Structure Tag Completion:: Completing state.Tag
@ -136,32 +136,32 @@ The IDLWAVE Shell
* Starting the Shell:: How to launch IDL as a subprocess
* Using the Shell:: Interactively working with the Shell
* Commands Sent to the Shell::
* Debugging IDL Programs::
* Examining Variables::
* Custom Expression Examination::
* Commands Sent to the Shell::
* Debugging IDL Programs::
* Examining Variables::
* Custom Expression Examination::
Debugging IDL Programs
* A Tale of Two Modes::
* Debug Key Bindings::
* Breakpoints and Stepping::
* Compiling Programs::
* Walking the Calling Stack::
* Electric Debug Mode::
* A Tale of Two Modes::
* Debug Key Bindings::
* Breakpoints and Stepping::
* Compiling Programs::
* Walking the Calling Stack::
* Electric Debug Mode::
Sources of Routine Info
* Routine Definitions:: Where IDL Routines are defined.
* Routine Information Sources:: So how does IDLWAVE know about...
* Catalogs::
* Catalogs::
* Load-Path Shadows:: Routines defined in several places
* Documentation Scan:: Scanning the IDL Manuals
Catalogs
* Library Catalogs::
* User Catalog::
* Library Catalogs::
* User Catalog::
@end detailmenu
@end menu
@ -193,13 +193,13 @@ form a complete development environment. Here is a brief summary of
what IDLWAVE does:
@itemize @bullet
@item
@item
Smart code indentation and automatic-formatting.
@item
Three level syntax highlighting support.
@item
@item
Context-sensitive display of calling sequences and keywords for more
than 1000 native IDL routines, extendible to any additional number of
than 1000 native IDL routines, extensible to any additional number of
local routines, and already available with many pre-scanned libraries.
@item
Fast, context-sensitive online HTML help, or source-header help for
@ -373,9 +373,9 @@ at point.
@cindex Getting Started
@menu
* Lesson I -- Development Cycle::
* Lesson II -- Customization::
* Lesson III -- User Catalog::
* Lesson I -- Development Cycle::
* Lesson II -- Customization::
* Lesson III -- User Catalog::
@end menu
@node Lesson I -- Development Cycle, Lesson II -- Customization, Getting Started, Getting Started
@ -418,13 +418,13 @@ function daynr,d,m,y
y1 = y * delta
return, d + floor(m1*30.6)+floor(y1*365.25)+5
end
function weekday,day,month,year
;; compute weekday number for date
nr = daynr(day,month,year)
return, nr mod 7
end
pro plot_wday,day,month
;; Plot the weekday of a date in the first 10 years of this century.
years = 2000,+indgen(10)
@ -753,7 +753,7 @@ them.
@menu
* Code Indentation:: Reflecting the logical structure
* Continued Statement Indentation::
* Continued Statement Indentation::
* Comment Indentation:: Special indentation for comment lines
* Continuation Lines:: Splitting statements over lines
* Syntax Highlighting:: Font-lock support
@ -797,7 +797,7 @@ subprogram). The command @kbd{C-M-q} reindents the entire current
routine. @xref{Actions}, for information how to impose additional
formatting conventions on foreign code.
@defopt idlwave-main-block-indent (@code{2})
@defopt idlwave-main-block-indent (@code{2})
Extra indentation for the main block of code. That is the block between
the FUNCTION/PRO statement and the END statement for that program
unit.
@ -998,7 +998,7 @@ in the first line of a comment paragraph.
@defopt idlwave-use-last-hang-indent (@code{nil})
Non-@code{nil} means use last match on line for
@code{idlwave-indent-regexp}.
@code{idlwave-indent-regexp}.
@end defopt
@node Syntax Highlighting, Octals and Highlighting, Continuation Lines, Code Formatting
@ -1026,7 +1026,7 @@ for highlighting using the variable
@defopt idlwave-default-font-lock-items
Items which should be fontified on the default fontification level
2.
2.
@end defopt
@node Octals and Highlighting, , Syntax Highlighting, Code Formatting
@ -1104,7 +1104,7 @@ plot,x,alog(x+5*sin(x) + 2),
On positions 1,2 and 8, information about the @samp{plot} procedure will
be shown. On positions 3,4, and 7, the @samp{alog} function will be
described, while positions 5 and 6 will investigate the @samp{sin}
function.
function.
When you ask for routine information about an object method, and the
method exists in several classes, IDLWAVE queries for the class of the
@ -1162,7 +1162,7 @@ will automatically split into the next two.
@item @i{Other}
@tab Any other routine with a file not known to be on the search path.
@item @i{Unresolved}
@tab An otherwise unknown routine the shell lists as unresolved
@tab An otherwise unknown routine the shell lists as unresolved
(referenced, but not compiled).
@end multitable
@ -1198,7 +1198,7 @@ with the middle mouse button inserts keywords or visits files:
@item @i{Usage}
@tab If online help is installed, a click with the @emph{right} mouse
button on the @i{Usage:} line will access the help for the
routine (@pxref{Online Help}).
routine (@pxref{Online Help}).
@item @i{Keyword}
@tab Online help about keywords is also available with the
@emph{right} mouse button. Clicking on a keyword with the @emph{middle}
@ -1340,8 +1340,8 @@ directly in the originating source file.
@menu
* Help with HTML Documentation::
* Help with Source::
* Help with HTML Documentation::
* Help with Source::
@end menu
@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.
Relative directory of the system-supplied HTML help directory,
considered with respect to @code{idlwave-system-directory}. Relevant
for IDL 6.2 and greater. Should not change.
@end defopt
@end defopt
@defopt idlwave-html-help-location @file{/usr/local/etc/}
The directory where the @file{idl_html_help} HTML directory live.
@ -1613,7 +1613,7 @@ available.
@menu
* Case of Completed Words:: CaseOFcomPletedWords
* Object Method Completion and Class Ambiguity:: obj->Method, what?
* Object Method Completion in the Shell::
* Object Method Completion in the Shell::
* Class and Keyword Inheritance:: obj->Method, _EXTRA=e
* Structure Tag Completion:: Completing state.Tag
@end menu
@ -1681,7 +1681,7 @@ narrow down the number of possible completions. The variable
@code{idlwave-query-class} can be configured to make such prompting the
default for all methods (not recommended), or selectively for very
common methods for which the number of completing keywords would be too
large (e.g. @code{Init,SetProperty,GetProperty}).
large (e.g. @code{Init,SetProperty,GetProperty}).
@cindex Saving object class on @code{->}
@cindex @code{->}
@ -1729,7 +1729,7 @@ routine info, or online help within a method routine, a query is sent to
determine the class of the object. If this query is successful, the
class found will be used to select appropriate completions, routine
info, or help. If unsuccessful, information from all known classes will
be used (as in the buffer).
be used (as in the buffer).
@node Class and Keyword Inheritance, Structure Tag Completion, Object Method Completion in the Shell, Completion
@subsection Class and Keyword Inheritance
@ -1772,7 +1772,7 @@ keywords based on their originating class.
Non-@code{nil} means consider inheritance during completion, online help etc.
@end defopt
@defopt idlwave-keyword-class-inheritance
@defopt idlwave-keyword-class-inheritance
A list of regular expressions to match methods for which simple
class-driven keyword inheritance will be used for Completion.
@end defopt
@ -1802,7 +1802,7 @@ Structure tag completion is not enabled by default. To enable it,
simply add the following to your @file{.emacs}:
@lisp
(add-hook 'idlwave-load-hook
(add-hook 'idlwave-load-hook
(lambda () (require 'idlw-complete-structtag)))
@end lisp
@ -2226,7 +2226,7 @@ your @file{.emacs} file:
(idlwave-action-and-binding "\\<\\(pro\\|function\\)\\>[ \t]*\\<"
'(capitalize-word 1) t)
;; Capitalize common block name
(idlwave-action-and-binding "\\<common\\>[ \t]+\\<"
(idlwave-action-and-binding "\\<common\\>[ \t]+\\<"
'(capitalize-word 1) t)))
@end lisp
@ -2384,10 +2384,10 @@ currently only works under Unix and MacOSX.
@menu
* Starting the Shell:: How to launch IDL as a subprocess
* Using the Shell:: Interactively working with the Shell
* Commands Sent to the Shell::
* Debugging IDL Programs::
* Examining Variables::
* Custom Expression Examination::
* Commands Sent to the Shell::
* Debugging IDL Programs::
* Examining Variables::
* Custom Expression Examination::
@end menu
@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
@code{idlwave-shell} with a prefix argument: @kbd{C-u C-c C-s} or
@kbd{C-u C-c C-l}. If you always want a dedicated frame for the shell
window, configure the variable
@code{idlwave-shell-use-dedicated-frame}.
@code{idlwave-shell-use-dedicated-frame}.
To launch a quick IDLWAVE shell directly from a shell prompt without
an 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.
Unless it's an absolute path, it goes in
@code{idlwave-config-directory}.
@end defopt
@defopt idlwave-shell-use-dedicated-frame (@code{nil})
Non-@code{nil} means IDLWAVE should use a special frame to display the
shell buffer.
@ -2574,7 +2574,7 @@ keywords, system variables, system variable tags etc.
@item @kbd{C-c C-v}
@tab Find the source file of a routine (@code{idlwave-find-module})
@item @kbd{C-c C-t}
@tab Find the source file of a routine in the currently visited file
@tab Find the source file of a routine in the currently visited file
(@code{idlwave-find-module-this-file}).
@item @kbd{C-c =}
@tab Compile a library routine (@code{idlwave-resolve})
@ -2697,12 +2697,12 @@ buffers.
@end defopt
@menu
* A Tale of Two Modes::
* Debug Key Bindings::
* Breakpoints and Stepping::
* Compiling Programs::
* Walking the Calling Stack::
* Electric Debug Mode::
* A Tale of Two Modes::
* Debug Key Bindings::
* Breakpoints and Stepping::
* Compiling Programs::
* Walking the Calling Stack::
* Electric Debug Mode::
@end menu
@ -2795,7 +2795,7 @@ executed from the shell window, the breakpoint where IDL is currently
stopped will be deleted. To clear all breakpoints, use @kbd{C-c C-d
C-a} (@code{idlwave-clear-all-bp}). Breakpoints can also be disabled
and re-enabled: @kbd{C-c C-d C-\}
(@code{idlwave-shell-toggle-enable-current-bp}).
(@code{idlwave-shell-toggle-enable-current-bp}).
Breakpoint lines are highlighted or indicated with an icon in the source
code (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
specify. IDLWAVE queries the shell for the actual breakpoint location
which was set, so the exact line you specify may not be marked. You can
re-sync the breakpoint list and update the display at any time (e.g., if
you add or remove some on the command line) using @kbd{C-c C-d C-l}.
you add or remove some on the command line) using @kbd{C-c C-d C-l}.
In recent IDLWAVE versions, the breakpoint line is highlighted when the
mouse is moved over it, and a tooltip pops up describing the break
@ -2914,8 +2914,8 @@ configured in @code{idlwave-shell-mark-stop-line}.
@kindex C-c C-d C-c
In order to compile the current buffer under the IDLWAVE shell, press
@kbd{C-c C-d C-c} (@code{idlwave-save-and-run}). This first saves the
current buffer and then sends the command @samp{.run path/to/file} to the
shell. You can also execute @kbd{C-c C-d C-c} from the shell buffer, in
current buffer and then sends the command @samp{.run path/to/file} to the
shell. You can also execute @kbd{C-c C-d C-c} from the shell buffer, in
which case the most recently compiled buffer will be saved and
re-compiled.
@ -3080,9 +3080,9 @@ halts.
@defopt idlwave-shell-electric-stop-color (Violet)
Default color of the stopped line overlay when in electric debug mode.
@end defopt
@end defopt
@defopt idlwave-shell-electric-stop-line-face
@defopt idlwave-shell-electric-stop-line-face
The face to use for the stopped line. Defaults to a face similar to the
modeline, with color @code{idlwave-shell-electric-stop-color}.
@end defopt
@ -3188,14 +3188,14 @@ the expression printed by IDL.
@end defopt
@defopt idlwave-shell-output-face
The face for @code{idlwave-shell-output-overlay}.
The face for @code{idlwave-shell-output-overlay}.
Allows to choose the font, color and other properties for the most
recent output of IDL when examining an expression."
@end defopt
@defopt idlwave-shell-separate-examine-output (@code{t})
If non-@code{nil}, re-direct the output of examine commands to a special
@file{*Examine*} buffer, instead of in the shell itself.
@file{*Examine*} buffer, instead of in the shell itself.
@end defopt
@defopt idlwave-shell-max-print-length (200)
@ -3249,17 +3249,17 @@ Both functions take a single string argument sharing the syntax of the
@lisp
(add-hook 'idlwave-shell-mode-hook
(lambda ()
(idlwave-shell-define-key-both [s-down-mouse-2]
(idlwave-shell-mouse-examine
(idlwave-shell-define-key-both [s-down-mouse-2]
(idlwave-shell-mouse-examine
"print, size(___,/DIMENSIONS)"))
(idlwave-shell-define-key-both [f9] (idlwave-shell-examine
"print, size(___,/DIMENSIONS)"))
(idlwave-shell-define-key-both [f10] (idlwave-shell-examine
(idlwave-shell-define-key-both [f10] (idlwave-shell-examine
"print,size(___,/TNAME)"))
(idlwave-shell-define-key-both [f11] (idlwave-shell-examine
"help,___,/STRUCTURE"))))
@end lisp
@end lisp
@noindent Now pressing @key{f9}, or middle-mouse dragging with the
@key{SUPER} key depressed, will print the dimensions of the nearby or
highlighted 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
everything, modernized IDLWAVE with many new features, and developed the
manual.
@item
@item
@uref{mailto:jdsmith@@as.arizona.edu, @b{J.D. Smith}}, the current
maintainer, as of version 4.10, helped shape object method completion
and most new features introduced in versions 4.x, and introduced many
@ -3364,7 +3364,7 @@ know about the accessible routines.
@menu
* Routine Definitions:: Where IDL Routines are defined.
* Routine Information Sources:: So how does IDLWAVE know about...
* Catalogs::
* Catalogs::
* Load-Path Shadows:: Routines defined in several places
* Documentation Scan:: Scanning the IDL Manuals
@end menu
@ -3382,7 +3382,7 @@ know about the accessible routines.
several places:
@enumerate
@item
@item
@emph{Builtin routines} are defined inside IDL itself. The source code
of such routines is not available, but instead are learned about through
the IDL documentation.
@ -3390,7 +3390,7 @@ the IDL documentation.
Routines which are @emph{part of the current program}, are defined in a
file explicitly compiled by the user. This file may or may not be
located on the IDL search path.
@item
@item
@emph{Library routines} are defined in files located on IDL's search
path. When a library routine is called for the first time, IDL will
find 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.
Formerly, this list was created by scanning the IDL manuals to produce
the file @file{idlw-rinfo.el}.
@item
@item
IDLWAVE @emph{scans} all its @emph{buffers} in the current Emacs session
for routine definitions. This is done automatically when routine
information or completion is first requested by the user. Each new
@ -3547,8 +3547,8 @@ later).
@end defopt
@menu
* Library Catalogs::
* User Catalog::
* Library Catalogs::
* User Catalog::
@end menu
@html
@ -3636,7 +3636,7 @@ instead, including:
@itemize @bullet
@item The scan is internal to Emacs, so you don't need a working Perl
installation, as you do for library catalogs.
@item Can be used to scan directories for which the user has no write
@item Can be used to scan directories for which the user has no write
privileges.
@item Easy widget-based path selection.
@end itemize
@ -3752,7 +3752,7 @@ Another way to find out if a specific routine has multiple definitions
on the load path is routine info display (@pxref{Routine Info}).
@node Documentation Scan, , Load-Path Shadows, Sources of Routine Info
@appendixsec Documentation Scan
@appendixsec Documentation Scan
@cindex @file{get_html_rinfo}
@cindex @file{idlw-rinfo.el}
@cindex Scanning the documentation
@ -3920,7 +3920,7 @@ user is King!
(setq idlwave-main-block-indent 3)
(setq idlwave-end-offset -3)
(setq idlwave-continuation-indent 1)
(setq idlwave-begin-line-comment "^;[^;]") ; Leave ";" but not ";;"
(setq idlwave-begin-line-comment "^;[^;]") ; Leave ";" but not ";;"
; anchored at start of line.
(setq idlwave-surround-by-blank t) ; Turn on padding ops =,<,>
(setq idlwave-pad-keyword nil) ; Remove spaces for keyword '='
@ -3987,10 +3987,10 @@ user is King!
;; (local-set-key "\C-j" 'idlwave-newline) ; My preference.
;; Some personal abbreviations
(define-abbrev idlwave-mode-abbrev-table
(define-abbrev idlwave-mode-abbrev-table
(concat idlwave-abbrev-start-char "wb") "widget_base()"
(idlwave-keyword-abbrev 1))
(define-abbrev idlwave-mode-abbrev-table
(define-abbrev idlwave-mode-abbrev-table
(concat idlwave-abbrev-start-char "on") "obj_new()"
(idlwave-keyword-abbrev 1))
))
@ -4008,12 +4008,12 @@ user is King!
(add-hook 'idlwave-shell-mode-hook
(lambda ()
;; Set up some custom key and mouse examine commands
(idlwave-shell-define-key-both [s-down-mouse-2]
(idlwave-shell-mouse-examine
(idlwave-shell-define-key-both [s-down-mouse-2]
(idlwave-shell-mouse-examine
"print, size(___,/DIMENSIONS)"))
(idlwave-shell-define-key-both [f9] (idlwave-shell-examine
"print, size(___,/DIMENSIONS)"))
(idlwave-shell-define-key-both [f10] (idlwave-shell-examine
(idlwave-shell-define-key-both [f10] (idlwave-shell-examine
"print,size(___,/TNAME)"))
(idlwave-shell-define-key-both [f11] (idlwave-shell-examine
"help,___,/STRUCTURE"))))
@ -4066,7 +4066,7 @@ system. I am assuming that IDLWAVE has been installed in
sure you check the following things:
@itemize @bullet
@item When you download the IDLWAVE distribution, make sure you save the
@item When you download the IDLWAVE distribution, make sure you save the
file under the names @file{idlwave.tar.gz}.
@item M-TAB switches among running programs --- use Esc-TAB
instead.
@ -4102,7 +4102,7 @@ customize the variable @code{idlwave-shell-automatic-electric-debug}
if you prefer not to enter electric debug on breakpoints@dots{} but
you really should try it before you disable it! You can also
customize this variable to enter debug mode when errors are
encountered.
encountered.
@item @strong{I get errors like @samp{Searching for program: no such
file 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
place, and this is the source of the error. If you recompile (or just
"make; make install") from source, it should resolve this problem.
Another option is to recompile the @file{idlw*.el} files by hand using
@kbd{M-x byte-compile-file}.
@kbd{M-x byte-compile-file}.
@item @strong{@kbd{M-@key{TAB}} doesn't complete words, it switches
windows on my desktop.}
@ -4266,7 +4266,7 @@ You have a mismatch between your help index and the HTML help package
you downloaded. You need to ensure you download a ``downgrade kit'' if
you are using anything older than the latest HTML help package. A new
help package appears with each IDL release (assuming the documentation
is updated).
is updated).
Starting with IDL 6.2, the HTML help and its catalog are
distributed with IDL, and so should never be inconsistent.

2
etc/NEWS.1-17
View file

@ -1198,7 +1198,7 @@ them with `\='. For example, "\\=\\= is the way to quote \\=\\["
will come out as `\= is the way to quote \['.
The new function `substitute-command-keys' takes a string possibly
contaning \[...] constructs and replaces those constructs with
containing \[...] constructs and replaces those constructs with
the key sequences they currently stand for.
* Primitives `find-line-comment' and `find-line-comment-body' flushed.

2
etc/NEWS.22
View file

@ -1026,7 +1026,7 @@ parts of the mode line.
*** `shadow' face defines the appearance of the "shadowed" text, i.e.
the text which should be less noticeable than the surrounding text.
This can be achieved by using shades of grey in contrast with either
This can be achieved by using shades of gray in contrast with either
black or white default foreground color. This generic shadow face
allows customization of the appearance of shadowed text in one place,
so package-specific faces can inherit from it.

2
etc/NEWS.23
View file

@ -793,7 +793,7 @@ starts the server. Clients can connect and create graphical or
terminal frames using emacsclient.
**** emacsclient starts emacs in daemon mode and connects to it when
--alternate-editor="" is used (or when the evironment variable
--alternate-editor="" is used (or when the environment variable
ALTERNATE_EDITOR is set to "") and emacsclient cannot connect to an
emacs server.

2
etc/TODO
View file

@ -841,7 +841,7 @@ more detailed diagnosis.
**** Provide an Error Summary buffer showing all the validation errors.
**** Pop-up menu. What is useful? Tag a region (should be greyed out if
**** Pop-up menu. What is useful? Tag a region (should be grayed out if
the region is not balanced). Suggestions based on error messages.
**** Have configurable list of namespace URIs so that we can provide

2
etc/e/eterm-color.ti
View file

@ -7,7 +7,7 @@ eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
# When updating this file, etc/e/eterm-color should be regenerated by
# running "make e/eterm-color" in the etc directory.
# Any change to this file should be done at the same time with a
# corresponding change to the TERMCAP evironment variable in term.el.
# corresponding change to the TERMCAP environment variable in term.el.
# Comments in term.el specify where each of these capabilities is implemented.
colors#8,
cols#80,

2
lisp/ChangeLog
View file

@ -2064,7 +2064,7 @@
* window.el (window-auto-delete): Remove.
(window-deletable-p): Remove argument FORCE. Don't deal with
dedicatedness and previous buffers.
dedication and previous buffers.
(switch-to-prev-buffer): Don't delete window.
(delete-windows-on): Delete a window's frame if and only if the
window is dedicated.

6
lisp/ChangeLog.10
View file

@ -1837,7 +1837,7 @@
2003-05-31 Stefan Monnier <monnier@cs.yale.edu>
* view.el (view-file, view-file-other-window, view-file-other-frame):
Signal an error when trying to visit an inexistent file.
Signal an error when trying to visit a nonexistent file.
* vc-hooks.el (vc-call-backend): Give better error message
when a backend function is missing.
@ -8053,7 +8053,7 @@
(gdb-quit): Reset some variables including tool-bar-map.
* gud.el (gdb-running): New variable.
(gud-menu-map): Use gdb-running to grey out toolbar buttons
(gud-menu-map): Use gdb-running to gray out toolbar buttons
with gdba in gdb-ui.el.
(gud-tool-bar-map): Move to avoid byte compiler warning.
@ -22790,7 +22790,7 @@
2001-11-04 Miles Bader <miles@gnu.org>
* startup.el (fancy-splash-head): Reapply Gerd's hack to make the
shadow of the splash image grey on a dark background instead of black.
shadow of the splash image gray on a dark background instead of black.
2001-11-03 Stefan Monnier <monnier@cs.yale.edu>

4
lisp/ChangeLog.12
View file

@ -15100,7 +15100,7 @@
2005-12-21 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/lisp.el (lisp-complete-symbol): Don't call
delete-windows-on with an inexistent buffer.
delete-windows-on with a nonexistent buffer.
2005-12-22 Nick Roberts <nickrob@snap.net.nz>
@ -31734,7 +31734,7 @@
2005-02-23 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/debug.el (debug): Hide the buffer if it's not killed.
Remove unused and inexistent var `inhibit-trace'.
Remove unused and nonexistent var `inhibit-trace'.
(debugger-mode): Use run-mode-hooks.
(debugger-list-functions): Add buttons; setup xref stack.

2
lisp/ChangeLog.5
View file

@ -2579,7 +2579,7 @@
1995-03-13 Karl Fogel <kfogel@floss>
* bookmark.el: Removed C-v bindings; they were inconsistent.
Defvarred some variables to nil, solely to avoid compilation warnings.
Defvared some variables to nil, solely to avoid compilation warnings.
Use "Author's Update Number:" instead of "Version:".
(bookmark-history): New var.
(bookmark-completing-read): Use `bookmark-history'.

4
lisp/ChangeLog.7
View file

@ -15185,7 +15185,7 @@
1997-06-16 Dan Nicolaescu <done@ece.arizona.edu>
* icon.el (icon-indent-line): A comment ends at the end of the
line, delete call to inexistent function.
line, delete call to nonexistent function.
* icon.el (icon-font-lock-keywords-1): Improved regexp.
(icon-font-lock-keywords-2): Likewise.
@ -19552,7 +19552,7 @@
* term.el: Added a lot of new faces, they all start with
term- and follow a simple lexicographical convention. Note that
each change is commented: just search for -mm in the source.
(term-char-mode): Added all the "grey-keys" to term-raw-map.
(term-char-mode): Added all the "gray-keys" to term-raw-map.
(term-send-up): Similar, decided to go for the more xterm-like
\eOA bindings in place of the previous \e[A.
(term-buffer-maximum-size): New variable.

2
lisp/ChangeLog.8
View file

@ -4294,7 +4294,7 @@
1999-07-21 Gerd Moellmann <gerd@gnu.org>
* faces.el (toolbar): Grey default background.
* faces.el (toolbar): Gray default background.
(modeline): Ditto.
* image.el (image-type-regexps): New.

2
lisp/allout.el
View file

@ -1952,7 +1952,7 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of
plain BULLETs are by default used, according to the DEPTH of the
TOPIC. Choice among the distinctive BULLETs is offered when you
provide a universal argument (\\[universal-argument]) to the
TOPIC creation command, or when explictly rebulleting a TOPIC. The
TOPIC creation command, or when explicitly rebulleting a TOPIC. The
significance of the various distinctive bullets is purely by
convention. See the documentation for the above bullet strings for
more details.

2
lisp/bookmark.el
View file

@ -83,7 +83,7 @@ To specify the file in which to save them, modify the variable
"The `.emacs.bmk' file used to be called this name.")
;; defvarred to avoid a compilation warning:
;; defvared to avoid a compilation warning:
(defvar bookmark-file nil
"Old name for `bookmark-default-file'.")

2
lisp/cedet/ede/autoconf-edit.el
View file

@ -191,7 +191,7 @@ This is to make it compatible with `autoconf-find-last-macro'.
Assume that MACRO doesn't appear in the buffer yet, so search
the ordering list `autoconf-preferred-macro-order'."
;; Search this list backwards.. heh heh heh
;; This lets us do a reverse search easilly.
;; This lets us do a reverse search easily.
(let ((ml (member macro (reverse autoconf-preferred-macro-order))))
(if (not ml) (error "Don't know how to position for %s yet" macro))
(setq ml (cdr ml))

4
lisp/cedet/ede/proj.el
View file

@ -546,7 +546,7 @@ You may need to add support for this type of file."
(file-name-extension (car sources))
"")))
))
;; Return the disovered compilers
;; Return the discovered compilers.
comp)))
(defmethod ede-proj-linkers ((obj ede-proj-target))
@ -580,7 +580,7 @@ Converts all symbols into the objects to be used."
(while (and avail (not (eieio-instance-inheritor-slot-boundp (car avail) 'sourcetype)))
(setq avail (cdr avail)))
(setq link (cdr avail)))))
;; Return the disovered linkers
;; Return the discovered linkers.
link)))

2
lisp/cedet/semantic/analyze.el
View file

@ -57,7 +57,7 @@
;;
;; context - A semantic datatype representing a point in a buffer.
;;
;; constriant - If a context specifies a specific datatype is needed,
;; constraint - If a context specifies a specific datatype is needed,
;; that is a constraint.
;; constants - Some datatypes define elements of themselves as a
;; constant. These need to be returned as there would be no

2
lisp/composite.el
View file

@ -656,7 +656,7 @@ prepending a space before it."
(if (not (char-charset (lglyph-char glyph) coding))
(progn
;; As the terminal doesn't support this glyph, return a
;; gstring in which each glyph is its own graphme-cluster
;; gstring in which each glyph is its own grapheme-cluster
;; of width 1..
(setq i 0)
(while (and (< i nglyphs)

2
lisp/dframe.el
View file

@ -718,7 +718,7 @@ Argument PROMPT is the prompt to use."
(defun dframe-set-timer (timeout fn &optional _null-on-error)
"Apply a timer with TIMEOUT, to call FN, or remove a timer if TIMEOUT is nil.
TIMEOUT is the number of seconds until the dframe controled program
TIMEOUT is the number of seconds until the dframe controlled program
timer is called again. When TIMEOUT is nil, turn off all timeouts.
This function must be called from the buffer belonging to the program
who requested the timer. NULL-ON-ERROR is ignored."

2
lisp/emacs-lisp/byte-opt.el
View file

@ -135,7 +135,7 @@
;; We'd have to notice defvars and defconsts, since those variables should
;; always be dynamic, and attempting to do a lexical binding of them
;; should simply do a dynamic binding instead.
;; But! We need to know about variables that were not necessarily defvarred
;; But! We need to know about variables that were not necessarily defvared
;; in the file being compiled (doing a boundp check isn't good enough.)
;; Fdefvar() would have to be modified to add something to the plist.
;;

4
lisp/emacs-lisp/bytecomp.el
View file

@ -178,9 +178,9 @@ adds `c' to it; otherwise adds `.elc'."
;; This can be the 'byte-compile property of any symbol.
(autoload 'byte-compile-inline-expand "byte-opt")
;; This is the entrypoint to the lapcode optimizer pass1.
;; This is the entry point to the lapcode optimizer pass1.
(autoload 'byte-optimize-form "byte-opt")
;; This is the entrypoint to the lapcode optimizer pass2.
;; This is the entry point to the lapcode optimizer pass2.
(autoload 'byte-optimize-lapcode "byte-opt")
(autoload 'byte-compile-unfold-lambda "byte-opt")

2
lisp/emacs-lisp/cconv.el
View file

@ -67,7 +67,7 @@
;; TODO: (not just for cconv but also for the lexbind changes in general)
;; - let (e)debug find the value of lexical variables from the stack.
;; - make eval-region do the eval-sexp-add-defvars danse.
;; - make eval-region do the eval-sexp-add-defvars dance.
;; - byte-optimize-form should be applied before cconv.
;; OTOH, the warnings emitted by cconv-analyze need to come before optimize
;; since afterwards they can because obnoxious (warnings about an "unused

2
lisp/emacs-lisp/smie.el
View file

@ -579,7 +579,7 @@ PREC2 is a table as returned by `smie-precs->prec2' or
(smie-debug--describe-cycle
table (smie-debug--prec2-cycle csts)))))
(incf i 10))
;; Propagate equalities back to their source.
;; Propagate equality constraints back to their sources.
(dolist (eq (nreverse eqs))
(when (null (cadr eq))
;; There's an equality constraint, but we still haven't given

4
lisp/filesets.el
View file

@ -267,12 +267,12 @@ SYM to VAL and return t. If INIT-FLAG is non-nil, set with
(not ignore-flag)))
(defun filesets-set-default! (sym val)
"Call `filestes-set-default' and reset cached data (i.e. rebuild menu)."
"Call `filesets-set-default' and reset cached data (i.e. rebuild menu)."
(when (filesets-set-default sym val)
(filesets-reset-fileset)))
(defun filesets-set-default+ (sym val)
"Call `filestes-set-default' and reset filesets' standard menu."
"Call `filesets-set-default' and reset filesets' standard menu."
(when (filesets-set-default sym val)
(setq filesets-has-changed-flag t)))
; (filesets-reset-fileset nil t)))

2
lisp/follow.el
View file

@ -351,7 +351,7 @@ After that, changing the prefix key requires manipulating keymaps."
;; global map.
(easy-menu-add-item nil '("Tools")
'("Follow"
;; The Emacs code used to just grey out operations when follow-mode was
;; The Emacs code used to just gray out operations when follow-mode was
;; not enabled, whereas the XEmacs code used to remove it altogether.
;; Not sure which is preferable, but clearly the preference should not
;; depend on the flavor.

4
lisp/gnus/ChangeLog
View file

@ -10961,7 +10961,7 @@
2007-11-14 Denys Duchier <denys.duchier@univ-orleans.fr> (tiny change)
* pop3.el (pop3-open-server): Accept and process data more robustly at
connexion start to avoid spurious "POP SSL connexion failed" errors.
connection start to avoid spurious "POP SSL connection failed" errors.
2007-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
@ -16516,7 +16516,7 @@
2005-07-01 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (article-display-face): Improve the efficiency.
(article-display-x-face): Ditto; remove grey x-face stuff.
(article-display-x-face): Ditto; remove gray x-face stuff.
2005-06-30 Katsumi Yamaoka <yamaoka@jpl.org>

2
lisp/gnus/ChangeLog.1
View file

@ -3471,7 +3471,7 @@
* pop3.el (pop3-md5): `with-temp-buffer' doesn't exist in Emacs
19.34.
* nneething.el (nneething-directory): Defvarred.
* nneething.el (nneething-directory): Defvared.
* message.el: Autoloaded nndraft things.
(message-set-auto-save-file-name): Use it.

6
lisp/gnus/ChangeLog.2
View file

@ -5120,7 +5120,7 @@
* gnus-util.el (gnus-prin1-to-string): Bind print-length and
print-level.
* gnus-art.el (article-display-x-face): Removed grey x-face stuff.
* gnus-art.el (article-display-x-face): Removed gray x-face stuff.
(gnus-treat-display-grey-xface): Removed.
* gnus-fun.el (gnus-grab-cam-face): New.
@ -9836,7 +9836,7 @@
2002-02-08 ShengHuo ZHU <zsh@cs.rochester.edu>
* gnus-art.el (gnus-treat-display-grey-xface): New variable.
(article-display-x-face): Use it. Disable grey xface, if
(article-display-x-face): Use it. Disable gray xface, if
uncompface is not found.
* message.el (message-mode): Don't enable multibyte on an indirect
@ -11350,7 +11350,7 @@
* gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Renamed.
* gnus-art.el (gnus-ignored-headers): Hide all X-Faces.
(article-display-x-face): Display grey X-Faces.
(article-display-x-face): Display gray X-Faces.
* gnus-fun.el (gnus-convert-gray-x-face-region): New function.
(gnus-convert-gray-x-face-to-ppm): Ditto.

4
lisp/gnus/mm-bodies.el
View file

@ -87,9 +87,9 @@ If no encoding was done, nil is returned."
(goto-char (point-min))
(if (re-search-forward "[^\x0-\x7f]" nil t)
(or mail-parse-charset
(message-options-get 'mm-encody-body-charset)
(message-options-get 'mm-body-charset-encoding-alist)
(message-options-set
'mm-encody-body-charset
'mm-body-charset-encoding-alist
(mm-read-coding-system "Charset used in the article: ")))
;; The logic in `mml-generate-mime-1' confirms that it's OK
;; to return nil here.

2
lisp/gnus/mml.el
View file

@ -1454,7 +1454,7 @@ Should be adopted if code in `message-send-mail' is changed."
"Display current buffer with Gnus, in a new buffer.
If RAW, display a raw encoded MIME message.
The window layout for the preview buffer is controled by the variables
The window layout for the preview buffer is controlled by the variables
`special-display-buffer-names', `special-display-regexps', or
`gnus-buffer-configuration' (the first match made will be used),
or the `pop-to-buffer' function."

2
lisp/gnus/nnml.el
View file

@ -1213,7 +1213,7 @@ Use the nov database for the current group if available."
;; #### already belongs to a range, whereas the corresponding
;; #### article doesn't exist (for example, if you delete an
;; #### article). For that reason, it is important to update
;; #### the ranges (meaning remove inexistent articles) before
;; #### the ranges (meaning remove nonexistent articles) before
;; #### doing anything on them.
;; 2 a/ read articles:
(let ((read (gnus-info-read info)))

6
lisp/gnus/pop3.el
View file

@ -270,11 +270,11 @@ Use streaming commands."
message-count))
(defcustom pop3-stream-type nil
"*Transport security type for POP3 connexions.
This may be either nil (plain connexion), `ssl' (use an
"*Transport security type for POP3 connections.
This may be either nil (plain connection), `ssl' (use an
SSL/TSL-secured stream) or `starttls' (use the starttls mechanism
to turn on TLS security after opening the stream). However, if
this is nil, `ssl' is assumed for connexions to port
this is nil, `ssl' is assumed for connections to port
995 (pop3s)."
:version "23.1" ;; No Gnus
:group 'pop3

4
lisp/ido.el
View file

@ -1692,7 +1692,7 @@ This function also adds a hook to the minibuffer."
(defun ido-nonreadable-directory-p (dir)
;; Return t if dir is a directory, but not readable
;; Do not check for non-readable directories via tramp, as this causes a premature
;; connect on incomplete tramp paths (after entring just method:).
;; connect on incomplete tramp paths (after entering just method:).
(let ((ido-enable-tramp-completion nil))
(and (ido-final-slash dir)
(not (ido-is-unc-host dir))
@ -1702,7 +1702,7 @@ This function also adds a hook to the minibuffer."
(defun ido-directory-too-big-p (dir)
;; Return t if dir is a directory, but too big to show
;; Do not check for non-readable directories via tramp, as this causes a premature
;; connect on incomplete tramp paths (after entring just method:).
;; connect on incomplete tramp paths (after entering just method:).
(let ((ido-enable-tramp-completion nil))
(and (numberp ido-max-directory-size)
(ido-final-slash dir)

3
lisp/international/cp51932.el
View file

@ -1,5 +1,5 @@
;;; cp51932.el -- translation table for CP51932. -*- no-byte-compile: t -*-
;;; Automatically genrated from CP932-2BYTE.map
;;; Automatically generated from CP932-2BYTE.map
(let ((map
'(;JISEXT<->UNICODE
(#x2D21 . #x2460)
@ -468,4 +468,3 @@
(setcar x (cdr x)) (setcdr x tmp)))
map)
(define-translation-table 'cp51932-encode map))

6
lisp/ldefs-boot.el
View file

@ -819,7 +819,7 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of
plain BULLETs are by default used, according to the DEPTH of the
TOPIC. Choice among the distinctive BULLETs is offered when you
provide a universal argument (\\[universal-argument]) to the
TOPIC creation command, or when explictly rebulleting a TOPIC. The
TOPIC creation command, or when explicitly rebulleting a TOPIC. The
significance of the various distinctive bullets is purely by
convention. See the documentation for the above bullet strings for
more details.
@ -10040,7 +10040,7 @@ beginning of the expanded text.
If ARG is a list of numbers, point is placed according to the first
member of the list, but you can visit the other specified positions
cyclicaly with the functions `expand-jump-to-previous-slot' and
cyclically with the functions `expand-jump-to-previous-slot' and
`expand-jump-to-next-slot'.
If 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
rechecking will be paused whenever there is input pending.
By default, uses a vacuous schema that allows any well-formed XML
document. A schema can be specified explictly using
document. A schema can be specified explicitly using
\\[rng-set-schema-file-and-validate], or implicitly based on the buffer's
file name or on the root element name. In each case the schema must
be a RELAX NG schema using the compact schema (such schemas

4
lisp/man.el
View file

@ -1095,7 +1095,7 @@ Same for the ANSI bold and normal escape sequences."
(replace-match "+")
(put-text-property (1- (point)) (point) 'face 'bold))
;; When the header is longer than the manpage name, groff tries to
;; condense it to a shorter line interspered with ^H. Remove ^H with
;; condense it to a shorter line interspersed with ^H. Remove ^H with
;; their preceding chars (but don't put Man-overstrike-face). (Bug#5566)
(goto-char (point-min))
(while (re-search-forward ".\b" nil t) (backward-delete-char 2))
@ -1189,7 +1189,7 @@ script would have done them."
(goto-char (point-min))
(while (re-search-forward "[-|]\\(\b[-|]\\)+" nil t) (replace-match "+"))
;; When the header is longer than the manpage name, groff tries to
;; condense it to a shorter line interspered with ^H. Remove ^H with
;; condense it to a shorter line interspersed with ^H. Remove ^H with
;; their preceding chars (but don't put Man-overstrike-face). (Bug#5566)
(goto-char (point-min))
(while (re-search-forward ".\b" nil t) (backward-delete-char 2))

2
lisp/mh-e/ChangeLog.1
View file

@ -7385,7 +7385,7 @@
(mh-visit-folder) alias, and v (mh-visit-folder).
(mh-index-folder-mode-help-messages): Changes for above.
(mh-index-folder-message-menu, mh-index-folder-folder-menu): New
menus. I decided to delete the unavailable items since greying out
menus. I decided to delete the unavailable items since graying out
implies that the user can do something to access them. In this
case, that's not the case. Well, that's not entirely true--the
user could write code for those functions ;-).

2
lisp/mpc.el
View file

@ -1651,7 +1651,7 @@ Return non-nil if a selection was deactivated."
;;; Hierarchical tagbrowser ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Todo:
;; - Add a button on each dir to open/close it (?)
;; - add the parent dir on the previous line, greyed-out, if it's not
;; - add the parent dir on the previous line, grayed-out, if it's not
;; present (because we're in the non-selected part and the parent is
;; in the selected part).

2
lisp/net/ange-ftp.el
View file

@ -49,7 +49,7 @@
;; 'user@' part may be omitted. This syntax can be customized to a certain
;; extent by changing ange-ftp-name-format. There are limitations.
;; The `host' part has an optional suffix `#port' which may be used to
;; specify a non-default port number for the connexion.
;; specify a non-default port number for the connection.
;;
;; If the user part is omitted then ange-ftp generates a default user
;; instead whose value depends on the variable ange-ftp-default-user.

2
lisp/nxml/rng-valid.el
View file

@ -230,7 +230,7 @@ will be automatically rechecked when Emacs becomes idle; the
rechecking will be paused whenever there is input pending.
By default, uses a vacuous schema that allows any well-formed XML
document. A schema can be specified explictly using
document. A schema can be specified explicitly using
\\[rng-set-schema-file-and-validate], or implicitly based on the buffer's
file name or on the root element name. In each case the schema must
be a RELAX NG schema using the compact schema \(such schemas

2
lisp/org/org-agenda.el
View file

@ -800,7 +800,7 @@ will only be dimmed."
:group 'org-agenda-todo-list
:type '(choice
(const :tag "Do not dim" nil)
(const :tag "Dim to a grey face" t)
(const :tag "Dim to a gray face" t)
(const :tag "Make invisible" invisible)))
(defcustom org-timeline-show-empty-dates 3

2
lisp/play/gomoku.el
View file

@ -379,7 +379,7 @@ Other useful commands:\n
best-square square
score-max score)
(aset gomoku-score-table square -1))) ; no: kill it !
;; If score is equally good, choose randomly. But first check freeness:
;; If score is equally good, choose randomly. But first check freedom:
((not (zerop (aref gomoku-board square)))
(aset gomoku-score-table square -1))
((zerop (random (setq count (1+ count))))

2
lisp/play/landmark.el
View file

@ -385,7 +385,7 @@ is non-nil. One interesting value is `turn-on-font-lock'."
best-square square
score-max score)
(aset landmark-score-table square -1))) ; no: kill it !
;; If score is equally good, choose randomly. But first check freeness:
;; If score is equally good, choose randomly. But first check freedom:
((not (zerop (aref landmark-board square)))
(aset landmark-score-table square -1))
((zerop (random (setq count (1+ count))))

4
lisp/progmodes/ada-mode.el
View file

@ -3939,7 +3939,7 @@ If NOERROR is non-nil, it only returns nil if no matching start found."
;; processing them recursively avoids the need for any special
;; handling.
;; Nothing should be done if we have only the specs or a
;; generic instantion.
;; generic instantiation.
((and (looking-at "\\<procedure\\|function\\>"))
(if first
@ -4401,7 +4401,7 @@ Moves to 'begin' if in a declarative part."
(ada-goto-matching-end 1))
;; on first line of subprogram body
;; Do nothing for specs or generic instantion, since these are
;; Do nothing for specs or generic instantiation, since these are
;; handled as the general case (find the enclosing block)
;; We also need to make sure that we ignore nested subprograms
((save-excursion

2
lisp/progmodes/cc-langs.el
View file

@ -433,7 +433,7 @@ element is a cons where the car is the character to modify and the cdr
the new syntax, as accepted by `modify-syntax-entry'."
;; The $ character is not allowed in most languages (one exception
;; is Java which allows it for legacy reasons) but we still classify
;; it as an indentifier character since it's often used in various
;; it as an identifier character since it's often used in various
;; machine generated identifiers.
t '((?_ . "w") (?$ . "w"))
(objc java) (append '((?@ . "w"))

4
lisp/progmodes/cperl-mode.el
View file

@ -1388,12 +1388,12 @@ The expansion is entirely correct because it uses the C preprocessor."
;;; These two must be unwound, otherwise take exponential time
(defconst cperl-maybe-white-and-comment-rex "[ \t\n]*\\(#[^\n]*\n[ \t\n]*\\)*"
"Regular expression to match optional whitespace with interpspersed comments.
"Regular expression to match optional whitespace with interspersed comments.
Should contain exactly one group.")
;;; This one is tricky to unwind; still very inefficient...
(defconst cperl-white-and-comment-rex "\\([ \t\n]\\|#[^\n]*\n\\)+"
"Regular expression to match whitespace with interpspersed comments.
"Regular expression to match whitespace with interspersed comments.
Should contain exactly one group.")

2
lisp/progmodes/f90.el
View file

@ -724,7 +724,7 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
["Reset to Saved" Custom-reset-saved :active t
:help "Reset all edited or set settings to saved"]
["Reset to Standard Settings" Custom-reset-standard :active t
:help "Erase all cusomizations in buffer"]
:help "Erase all customizations in buffer"]
)
"--"
["Indent Subprogram" f90-indent-subprogram t]

2
lisp/progmodes/fortran.el
View file

@ -665,7 +665,7 @@ Used in the Fortran entry in `hs-special-modes-alist'.")
["Reset to Saved" Custom-reset-saved :active t
:help "Reset all edited or set settings to saved"]
["Reset to Standard Settings" Custom-reset-standard :active t
:help "Erase all cusomizations in buffer"]
:help "Erase all customizations in buffer"]
)
"--"
["Comment Region" fortran-comment-region mark-active]

2
lisp/progmodes/gud.el
View file

@ -103,7 +103,7 @@ If SOFT is non-nil, returns nil if the symbol doesn't already exist."
(defvar gud-running nil
"Non-nil if debugged program is running.
Used to grey out relevant toolbar icons.")
Used to gray out relevant toolbar icons.")
(defvar gud-target-name "--unknown--"
"The apparent name of the program being debugged in a gud buffer.")

2
lisp/progmodes/idlw-shell.el
View file

@ -2903,7 +2903,7 @@ from `idlwave-shell-examine-alist' via mini-buffer shortcut key."
;; Move to beginning of current or previous expression
(if (looking-at "\\<\\|(")
;; At beginning of expression, don't move backwards unless
;; this is at the end of an indentifier.
;; this is at the end of an identifier.
(if (looking-at "\\>")
(backward-sexp))
(backward-sexp))

12
lisp/progmodes/sql.el
View file

@ -96,7 +96,7 @@
;; This improves the interaction under Emacs but it still is somewhat
;; awkward.
;; Quoted identifiers are not supported for hilighting. Most
;; Quoted identifiers are not supported for highlighting. Most
;; databases support the use of double quoted strings in place of
;; identifiers; ms (Microsoft SQLServer) also supports identifiers
;; enclosed within brackets [].
@ -1329,9 +1329,9 @@ statement. The format of variable should be a valid
;; are not followed closely, and most vendors offer significant
;; capabilities beyond those defined in the standard specifications.
;; SQL mode provides support for hilighting based on the product. In
;; addition to hilighting the product keywords, any ANSI keywords not
;; used by the product are also hilighted. This will help identify
;; SQL mode provides support for highlighting based on the product. In
;; addition to highlighting the product keywords, any ANSI keywords not
;; used by the product are also highlighted. This will help identify
;; keywords that could be restricted in future versions of the product
;; or might be a problem if ported to another product.
@ -2506,7 +2506,7 @@ See `sql-product-alist' for a list of products and supported features."
"Configure font-lock and imenu with product-specific settings.
The KEYWORDS-ONLY flag is passed to font-lock to specify whether
only keywords should be hilighted and syntactic hilighting
only keywords should be highlighted and syntactic highlighting
skipped. The IMENU flag indicates whether `imenu-mode' should
also be configured."
@ -3807,7 +3807,7 @@ you entered, right above the output it created.
;; Note that making KEYWORDS-ONLY nil will cause havoc if you try
;; SELECT 'x' FROM DUAL with SQL*Plus, because the title of the column
;; will have just one quote. Therefore syntactic hilighting is
;; will have just one quote. Therefore syntactic highlighting is
;; disabled for interactive buffers. No imenu support.
(sql-product-font-lock t nil)

2
lisp/replace.el
View file

@ -1663,7 +1663,7 @@ with the `noescape' argument set.
t t)))
(defun replace-loop-through-replacements (data count)
;; DATA is a vector contaning the following values:
;; DATA is a vector containing the following values:
;; 0 next-rotate-count
;; 1 repeat-count
;; 2 next-replacement

2
lisp/speedbar.el
View file

@ -2101,7 +2101,7 @@ cell of the form ( 'DIRLIST . 'FILELIST )."
;; If the shown files variable has extra directories, then
;; it is our responsibility to redraw them all
;; Luckily, the nature of inserting items into this list means
;; that by reversing it, we can easilly go in the right order
;; that by reversing it, we can easily go in the right order
(let ((sf (cdr (reverse speedbar-shown-directories))))
(setq speedbar-shown-directories
(list (expand-file-name default-directory)))

4
lisp/term.el
View file

@ -40,7 +40,7 @@
;; overhead this has became so small that IMHO is surely outweighted by
;; the benefits you get but, as usual, YMMV
;;
;; Important caveat, when deciding the cursor/'grey keys' keycodes I had to
;; Important caveat, when deciding the cursor/'gray keys' keycodes I had to
;; make a choice: on my Linux box this choice allows me to run all the
;; ncurses applications without problems but make these keys
;; incomprehensible to all the cursesX programs. Your mileage may vary so
@ -910,7 +910,7 @@ is buffer-local."
(setq term-raw-escape-map
(copy-keymap (lookup-key (current-global-map) "\C-x")))
;; Added nearly all the 'grey keys' -mm
;; Added nearly all the 'gray keys' -mm
(if (featurep 'xemacs)
(define-key term-raw-map [button2] 'term-mouse-paste)

4
lisp/term/common-win.el
View file

@ -281,11 +281,11 @@ have been processed."
;; The ordering of the colors is chosen for the user's convenience in
;; `list-colors-display', which displays the reverse of this list.
;; Roughly speaking, `list-colors-display' orders by (i) named shades
;; of grey with hue 0.0, sorted by value (ii) named colors with
;; of gray with hue 0.0, sorted by value (ii) named colors with
;; saturation 1.0, sorted by hue, (iii) named non-white colors with
;; saturation less than 1.0, sorted by hue, (iv) other named shades of
;; white, (v) numbered colors sorted by hue, and (vi) numbered shades
;; of grey.
;; of gray.
(declare-function ns-list-colors "nsfns.m" (&optional frame))

6
lisp/textmodes/conf-mode.el
View file

@ -185,7 +185,7 @@ not align (only setting space according to `conf-assignment-space')."
(2 'font-lock-constant-face nil t))
;; section { ... } (do this last because some assign ...{...)
("^[ \t]*\\([^=:\n]+?\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend))
"Keywords to hilight in Conf mode.")
"Keywords to highlight in Conf mode.")
(defvar conf-javaprop-font-lock-keywords
'(;; var=val
@ -197,7 +197,7 @@ not align (only setting space according to `conf-assignment-space')."
(5 'font-lock-variable-name-face nil t)
(6 'font-lock-constant-face nil t)
(7 'font-lock-variable-name-face nil t)))
"Keywords to hilight in Conf Java Properties mode.")
"Keywords to highlight in Conf Java Properties mode.")
(defvar conf-space-keywords-alist
'(("\\`/etc/gpm/" . "key\\|name\\|foreground\\|background\\|border\\|head")
@ -240,7 +240,7 @@ This variable is best set in the file local variables, or through
(1 'font-lock-variable-name-face))
;; section { ... } (do this last because some assign ...{...)
("^[ \t]*\\([^:\n]+\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend))
"Keywords to hilight in Conf Colon mode.")
"Keywords to highlight in Conf Colon mode.")
(defvar conf-assignment-sign ?=
"Sign used for assignments (char or string).")

5
lisp/textmodes/ispell.el
View file

@ -2399,7 +2399,8 @@ Optional REFRESH will unhighlighted then highlight, using block cursor
(setq start (1+ start)))) ; On block non-refresh, inc start.
(let ((modified (buffer-modified-p)) ; don't allow this fn to modify buffer
(buffer-read-only nil) ; Allow highlighting read-only buffers.
(text (buffer-substring-no-properties start end)) ; Save hilight region
(text (buffer-substring-no-properties start end))
; Save highlight region.
(inhibit-quit t) ; inhibit interrupt processing here.
(buffer-undo-list t)) ; don't clutter the undo list.
(goto-char end)
@ -3977,7 +3978,7 @@ Both should not be used to define a buffer-local dictionary."
; LocalWords: Francais Nederlands charset autoloaded popup nonmenu regexp num
; LocalWords: AMStex hspace includeonly nocite epsfig displaymath eqnarray reg
; LocalWords: minipage modeline pers dict unhighlight buf grep sync prev inc
; LocalWords: fn hilight oldot NB AIX msg init read's bufs pt cmd Quinlan eg
; LocalWords: fn oldot NB AIX msg init read's bufs pt cmd Quinlan eg
; LocalWords: uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable
; LocalWords: lns XEmacs HTML casechars Multibyte

4
lisp/textmodes/reftex-sel.el
View file

@ -570,13 +570,13 @@ Useful for large TOC's."
nil t)
(beginning-of-line))
(defun reftex-select-next-heading (&optional arg)
"Move to next table of contentes line."
"Move to next table of contents line."
(interactive "p")
(end-of-line)
(re-search-forward "^ " nil t arg)
(beginning-of-line))
(defun reftex-select-previous-heading (&optional arg)
"Move to previous table of contentes line."
"Move to previous table of contents line."
(interactive "p")
(re-search-backward "^ " nil t arg))
(defun reftex-select-quit ()

2
lisp/textmodes/rst.el
View file

@ -2716,7 +2716,7 @@ general but you do not like the details."
(rst-define-level-faces)))
;; Faces for displaying items on several levels; these definitions define
;; different shades of grey where the lightest one (i.e. least contrasting) is
;; different shades of gray where the lightest one (i.e. least contrasting) is
;; used for level 1
(defcustom rst-level-face-max 6
"Maximum depth of levels for which section title faces are defined."

2
lisp/textmodes/tex-mode.el
View file

@ -2254,7 +2254,7 @@ Only applies the FSPEC to the args part of FORMAT."
;; Remove those commands whose input was considered stable for
;; some other command (typically if (t . "%.pdf") is inactive
;; then we're using pdflatex and the fact that the dvi file
;; is inexistent doesn't matter).
;; is nonexistent doesn't matter).
(let ((tmp nil))
(dolist (cmd cmds)
(unless (member (nth 1 cmd) unchanged-in)

3
lisp/url/ChangeLog
View file

@ -1977,7 +1977,7 @@
* lisp/url-gw.el (url-gw-inhibit-code-conversion): Remove.
(url-open-stream): Bind coding-system-for{read,write} when setting
up the connexion. Don't call url-gw-inhibit-code-conversion.
up the connection. Don't call url-gw-inhibit-code-conversion.
2001-05-24 William M. Perry <wmperry@gnu.org>
@ -2516,4 +2516,3 @@
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.

10
lisp/vc/ediff-help.el
View file

@ -50,7 +50,7 @@ For help on a specific command: Click Button 2 over it; or
(defconst ediff-long-help-message-compare3
"
p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y
n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
n,SPC -next diff | h -highlighting | rx -restore buf X's old diff
j -jump to diff | @ -auto-refinement | * -refine current region
gx -goto X's point| ## -ignore whitespace | ! -update diff regions
C-l -recenter | #c -ignore case |
@ -64,7 +64,7 @@ Normally, not a user option. See `ediff-help-message' for details.")
(defconst ediff-long-help-message-compare2
"
p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A
n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
n,SPC -next diff | h -highlighting | rx -restore buf X's old diff
j -jump to diff | @ -auto-refinement | * -refine current region
gx -goto X's point| ## -ignore whitespace | ! -update diff regions
C-l -recenter | #c -ignore case |
@ -78,7 +78,7 @@ Normally, not a user option. See `ediff-help-message' for details.")
(defconst ediff-long-help-message-narrow2
"
p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A
n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
n,SPC -next diff | h -highlighting | rx -restore buf X's old diff
j -jump to diff | @ -auto-refinement | * -refine current region
gx -goto X's point| ## -ignore whitespace | ! -update diff regions
C-l -recenter | #c -ignore case | % -narrow/widen buffs
@ -92,7 +92,7 @@ Normally, not a user option. See `ediff-help-message' for details.")
(defconst ediff-long-help-message-word-mode
"
p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y
n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
n,SPC -next diff | h -highlighting | rx -restore buf X's old diff
j -jump to diff | |
gx -goto X's point| % -narrow/widen buffs | ! -recompute diffs
C-l -recenter | #c -ignore case |
@ -106,7 +106,7 @@ Normally, not a user option. See `ediff-help-message' for details.")
(defconst ediff-long-help-message-merge
"
p,DEL -previous diff | | -vert/horiz split | x -copy buf X's region to C
n,SPC -next diff | h -hilighting | r -restore buf C's old diff
n,SPC -next diff | h -highlighting | r -restore buf C's old diff
j -jump to diff | @ -auto-refinement | * -refine current region
gx -goto X's point| ## -ignore whitespace | ! -update diff regions
C-l -recenter | #f/#h -focus/hide regions | + -combine diff regions

4
lisp/window.el
View file

@ -170,7 +170,7 @@ Applications should never rebind this variable. To resize a
window to a height less than the one specified here, an
application should instead call `window-resize' with a non-nil
IGNORE argument. In order to have `split-window' make a window
shorter, explictly specify the SIZE argument of that function."
shorter, explicitly specify the SIZE argument of that function."
:type 'integer
:version "24.1"
:group 'windows)
@ -190,7 +190,7 @@ Applications should never rebind this variable. To resize a
window to a width less than the one specified here, an
application should instead call `window-resize' with a non-nil
IGNORE argument. In order to have `split-window' make a window
narrower, explictly specify the SIZE argument of that function."
narrower, explicitly specify the SIZE argument of that function."
:type 'integer
:version "24.1"
:group 'windows)

2
src/ChangeLog.10
View file

@ -23013,7 +23013,7 @@
(try_window_id): Likewise.
(redisplay_window): New local var buffer_unchanged_p.
* keyboard.c (cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_houglass.
* keyboard.c (cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_hourglass.
* process.c (create_process): Test USG_SUBTTY_WORKS.
(process_send_signal): Clean up handling of GID.

4
src/ChangeLog.11
View file

@ -22234,7 +22234,7 @@
* lisp.h (Fdelete_terminal): Declare.
* charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID)
(CHECK_CHARSET_GET_ATTR): Don't use the inexistent return value of
(CHECK_CHARSET_GET_ATTR): Don't use the nonexistent return value of
wrong_type_argument.
2008-02-22 Kenichi Handa <handa@ni.aist.go.jp>
@ -31330,7 +31330,7 @@
2007-05-12 Chong Yidong <cyd@stupidchicken.com>
* image.c (pbm_load): Correctly check image size for greyscale pbm.
* image.c (pbm_load): Correctly check image size for grayscale pbm.
* xterm.c (XTread_socket): Yet Another Uncaught X Error Crash (YAUXEC).

2
src/ChangeLog.3
View file

@ -3271,7 +3271,7 @@
[not HAVE_X11] (x_set_border_pixel): Use gray_width and
gray_height, instead of assuming that the bitmap is 16x16.
(x_make_gc): Instead of creating a pixmap and then calling
XPutImage to make it into a grey stipple, just call
XPutImage to make it into a gray stipple, just call
XCreatePixmapFromBitmapData to do it all at once.
* xterm.c (x_text_icon): Move the request for font information

2
src/ChangeLog.8
View file

@ -5409,7 +5409,7 @@
1998-11-10 Gerd Moellmann <gerd@gnu.org>
* xrdb.c (x_load_resources): Add grey background colors as
* xrdb.c (x_load_resources): Add gray background colors as
defaults for menus, scroll bars, and dialogs.
* insdel.c (prepare_to_modify_buffer): Move setting

4
src/buffer.c
View file

@ -1631,7 +1631,7 @@ with SIGHUP. */)
/* Reset the local variables, so that this buffer's local values
won't be protected from GC. They would be protected
if they happened to remain encached in their symbols.
if they happened to remain cached in their symbols.
This gets rid of them for certain. */
swap_out_buffer_local_variables (b);
reset_buffer_local_variables (b, 1);
@ -2486,7 +2486,7 @@ swap_out_buffer_local_variables (struct buffer *b)
Lisp_Object sym = XCAR (XCAR (alist));
eassert (XSYMBOL (sym)->redirect == SYMBOL_LOCALIZED);
/* Need not do anything if some other buffer's binding is
now encached. */
now cached. */
if (EQ (SYMBOL_BLV (XSYMBOL (sym))->where, buffer))
{
/* Symbol is set up for this buffer's old local value:

4
src/charset.c
View file

@ -166,9 +166,9 @@ static struct
maximum character of the current charset. */
int min_char, max_char;
/* A Unicode character correspoinding to the code indice 0 (i.e. the
/* A Unicode character corresponding to the code index 0 (i.e. the
minimum code-point) of the current charset, or -1 if the code
indice 0 is not a Unicode character. This is checked when
index 0 is not a Unicode character. This is checked when
table.encoder[CHAR] is zero. */
int zero_index_char;

2
src/dispextern.h
View file

@ -405,7 +405,7 @@ struct glyph
{
/* Metrics of a partial glyph of an image (type == IMAGE_GLYPH). */
struct glyph_slice img;
/* Start and end indices of glyphs of a graphme cluster of a
/* Start and end indices of glyphs of a grapheme cluster of a
composition (type == COMPOSITE_GLYPH). */
struct { int from, to; } cmp;
/* Pixel offsets for upper and lower part of the acronym. */

4
src/gtkutil.h
View file

@ -98,7 +98,7 @@ extern GtkWidget *xg_create_widget (const char *type,
struct _widget_value *val,
GCallback select_cb,
GCallback deactivate_cb,
GCallback hightlight_cb);
GCallback highlight_cb);
extern void xg_modify_menubar_widgets (GtkWidget *menubar,
FRAME_PTR f,
@ -106,7 +106,7 @@ extern void xg_modify_menubar_widgets (GtkWidget *menubar,
int deep_p,
GCallback select_cb,
GCallback deactivate_cb,
GCallback hightlight_cb);
GCallback highlight_cb);
extern int xg_update_frame_menubar (FRAME_PTR f);

4
src/lisp.h
View file

@ -324,7 +324,7 @@ union Lisp_Object
struct
{
/* Use explict signed, the signedness of a bit-field of type
/* Use explicit signed, the signedness of a bit-field of type
int is implementation defined. */
signed EMACS_INT val : VALBITS;
ENUM_BF (Lisp_Type) type : GCTYPEBITS;
@ -349,7 +349,7 @@ union Lisp_Object
struct
{
ENUM_BF (Lisp_Type) type : GCTYPEBITS;
/* Use explict signed, the signedness of a bit-field of type
/* Use explicit signed, the signedness of a bit-field of type
int is implementation defined. */
signed EMACS_INT val : VALBITS;
} s;

2
src/lread.c
View file

@ -1917,7 +1917,7 @@ which is the input stream for reading characters.
This function does not move point. */)
(Lisp_Object start, Lisp_Object end, Lisp_Object printflag, Lisp_Object read_function)
{
/* FIXME: Do the eval-sexp-add-defvars danse! */
/* FIXME: Do the eval-sexp-add-defvars dance! */
int count = SPECPDL_INDEX ();
Lisp_Object tem, cbuf;

2
src/nsterm.m
View file

@ -559,7 +559,7 @@ Free a pool and temporary objects it refers to (callable from C)
{
NSView *view = FRAME_NS_VIEW (f);
/* This no-op will trigger the default window placing
* constriant system. */
* constraint system. */
f->output_data.ns->dont_constrain = 0;
[[view window] setFrameOrigin:[[view window] frame].origin];
}

3
src/w32fns.c
View file

@ -5011,7 +5011,8 @@ no value of TYPE (always string in the MS Windows case). */)
cursor. Duplicated from xdisp.c, but cannot use the version there
due to lack of atimers on w32. */
#define DEFAULT_HOURGLASS_DELAY 1
/* Return non-zero if houglass timer has been started or hourglass is shown. */
/* Return non-zero if hourglass timer has been started or hourglass is
shown. */
/* PENDING: if W32 can use atimers (atimer.[hc]) then the common impl in
xdisp.c could be used. */

2
src/widget.c
View file

@ -808,7 +808,7 @@ EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry *request, XtWidgetGeome
return result->request_mode ? XtGeometryAlmost : XtGeometryYes;
}
/* Special entrypoints */
/* Special entry points */
void
EmacsFrameSetCharSize (Widget widget, int columns, int rows)
{

3
src/widget.h
View file

@ -92,9 +92,8 @@ extern WidgetClass emacsFrameClass;
extern struct _DisplayContext* display_context;
/* Special entrypoints */
/* Special entry points */
void EmacsFrameSetCharSize (Widget, int, int);
void widget_store_internal_border (Widget widget);
#endif /* _EmacsFrame_h */

4
src/window.c
View file

@ -3088,7 +3088,7 @@ This function runs `window-scroll-functions' before running
error ("Window is dedicated to `%s'", SDATA (BVAR (XBUFFER (tem), name)));
else
/* WINDOW is weakly dedicated to its buffer, reset
dedicatedness. */
dedication. */
w->dedicated = Qnil;
call1 (Qrecord_window_buffer, window);
@ -6299,7 +6299,7 @@ freeze_window_starts (struct frame *f, int freeze_p)
ignore_positions non-zero means ignore non-matching scroll positions
and the like.
This ignores a couple of things like the dedicatedness status of
This ignores a couple of things like the dedication status of
window, combination_limit and the like. This might have to be
fixed. */

3
src/xdisp.c
View file

@ -28662,7 +28662,8 @@ init_xdisp (void)
/* Platform-independent portion of hourglass implementation. */
/* Return non-zero if houglass timer has been started or hourglass is shown. */
/* Return non-zero if hourglass timer has been started or hourglass is
shown. */
int
hourglass_started (void)
{

4
src/xfaces.c
View file

@ -66,7 +66,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
attributes (1st thru 5th) are updated from the spec.
On the other hand, if one of the other font-related attributes are
specified, the correspoinding specs in this attribute is set to nil.
specified, the corresponding specs in this attribute is set to nil.
15. A face name or list of face names from which to inherit attributes.
@ -1223,7 +1223,7 @@ face_color_gray_p (struct frame *f, const char *color_name)
int gray_p;
if (defined_color (f, color_name, &color, 0))
gray_p = (/* Any color sufficiently close to black counts as grey. */
gray_p = (/* Any color sufficiently close to black counts as gray. */
(color.red < 5000 && color.green < 5000 && color.blue < 5000)
||
((eabs (color.red - color.green)