From 7430c2a1791cc9fdd51b588998d26315489ac0d8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 19 Nov 2011 10:39:42 +0200 Subject: Revert last commit. --- src/dispextern.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/dispextern.h') diff --git a/src/dispextern.h b/src/dispextern.h index 48dd374f3c..486aa4f7a4 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3127,9 +3127,7 @@ void w32_init_fringe (struct redisplay_interface *); void w32_reset_fringes (void); #endif -#if XASSERTS extern unsigned row_hash (struct glyph_row *); -#endif /* Defined in image.c */ -- cgit v1.2.3 From cd1181dbece7f23a801ce9c56b985f9466cd6511 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sun, 20 Nov 2011 04:48:53 +0100 Subject: Fix typos. --- ChangeLog | 4 ++-- admin/CPP-DEFINES | 4 ++-- admin/notes/multi-tty | 2 +- autogen/install-sh | 4 ++-- doc/lispref/ChangeLog | 5 +++++ doc/lispref/compile.texi | 2 +- doc/lispref/help.texi | 2 +- doc/misc/ChangeLog | 9 +++++++++ doc/misc/ede.texi | 6 +++--- doc/misc/eieio.texi | 4 ++-- doc/misc/gnus-coding.texi | 10 +++++----- doc/misc/gnus-news.texi | 2 +- etc/MH-E-NEWS | 2 +- etc/NEWS | 2 +- etc/NEWS.19 | 2 +- etc/NEWS.21 | 2 +- etc/NEWS.22 | 2 +- lib/sha256.c | 2 +- lib/sha512.c | 2 +- lisp/ChangeLog | 7 +++++++ lisp/ChangeLog.10 | 8 ++++---- lisp/ChangeLog.13 | 2 +- lisp/ChangeLog.15 | 2 +- lisp/ChangeLog.2 | 2 +- lisp/ChangeLog.3 | 2 +- lisp/ChangeLog.8 | 2 +- lisp/ChangeLog.9 | 2 +- lisp/allout.el | 2 +- lisp/cedet/ChangeLog | 24 ++++++++++++++++++++++++ lisp/cedet/cedet-cscope.el | 4 ++-- lisp/cedet/cedet-files.el | 2 +- lisp/cedet/cedet-global.el | 6 +++--- lisp/cedet/cedet-idutils.el | 8 ++++---- lisp/cedet/cedet.el | 4 ++-- lisp/cedet/data-debug.el | 4 ++-- lisp/cedet/ede.el | 20 ++++++++++---------- lisp/cedet/ede/proj-comp.el | 4 ++-- lisp/cedet/inversion.el | 6 +++--- lisp/cedet/mode-local.el | 10 +++++----- lisp/cedet/pulse.el | 6 +++--- lisp/cedet/semantic.el | 10 +++++----- lisp/cedet/semantic/bovine/c.el | 2 +- lisp/cedet/semantic/bovine/debug.el | 2 +- lisp/cedet/semantic/db-typecache.el | 2 +- lisp/cedet/semantic/debug.el | 8 ++++---- lisp/cedet/semantic/edit.el | 2 +- lisp/cedet/semantic/idle.el | 6 +++--- lisp/cedet/semantic/symref/list.el | 4 ++-- lisp/cedet/srecode/dictionary.el | 2 +- lisp/emacs-lisp/ert.el | 2 +- lisp/emacs-lisp/package.el | 2 +- lisp/erc/ChangeLog | 4 ++++ lisp/erc/ChangeLog.01 | 2 +- lisp/erc/ChangeLog.03 | 4 ++-- lisp/erc/erc-backend.el | 2 +- lisp/erc/erc-log.el | 2 +- lisp/gnus/ChangeLog | 8 ++++++-- lisp/gnus/ChangeLog.2 | 30 +++++++++++++++--------------- lisp/gnus/mm-util.el | 2 +- lisp/international/mule.el | 4 ++-- lisp/mail/feedmail.el | 4 ++-- lisp/mail/rmail.el | 2 +- lisp/mail/smtpmail.el | 2 +- lisp/mh-e/ChangeLog | 5 +++++ lisp/mh-e/ChangeLog.1 | 2 +- lisp/mh-e/mh-utils.el | 12 ++++++------ lisp/nxml/xsd-regexp.el | 2 +- lisp/org/ChangeLog | 14 +++++++++----- lisp/org/org-table.el | 2 +- lisp/progmodes/cc-langs.el | 2 +- lisp/progmodes/cfengine.el | 2 +- lisp/progmodes/cwarn.el | 10 +++++----- lisp/progmodes/ebnf-dtd.el | 2 +- lisp/progmodes/idlwave.el | 2 +- lisp/progmodes/pascal.el | 2 +- lisp/term/iris-ansi.el | 4 ++-- lisp/term/rxvt.el | 2 +- lisp/textmodes/artist.el | 2 +- lisp/textmodes/reftex-dcr.el | 2 +- lisp/vc/vc-mtn.el | 2 +- lisp/xml.el | 2 +- src/ChangeLog | 5 +++++ src/ChangeLog.11 | 12 ++++++------ src/ChangeLog.3 | 2 +- src/ChangeLog.7 | 2 +- src/ChangeLog.8 | 6 +++--- src/bidi.c | 2 +- src/buffer.c | 2 +- src/casetab.c | 2 +- src/charset.c | 2 +- src/dispextern.h | 4 ++-- src/frame.c | 4 ++-- src/search.c | 4 ++-- src/xterm.c | 2 +- test/ChangeLog | 4 ++++ test/cedet/semantic-utest-c.el | 2 +- 96 files changed, 250 insertions(+), 179 deletions(-) (limited to 'src/dispextern.h') diff --git a/ChangeLog b/ChangeLog index 34039b3860..a082dc5b08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -689,7 +689,7 @@ * autogen/Makefile.in: Add auto-updated generated files. * autogen.sh: No longer a no-op, now it tests for autotools and runs them as necessary. - * configure.in: Defaule maintainer-mode to on. + * configure.in: Default maintainer-mode to on. * aclocal.m4, configure, lib/Makefile.in: Remove files. 2011-03-13 Paul Eggert @@ -9711,7 +9711,7 @@ paths.h.in, Makefile.in in src. * configure: Delete .tmp files before creating them; don't bother - trying to make final targets writeable first, since it won't + trying to make final targets writable first, since it won't matter to move-if-change. 1992-05-19 Jim Blandy (jimb@pogo.cs.oberlin.edu) diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 6e0f736a06..9723ca720e 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -48,7 +48,7 @@ SYSTEM_MALLOC Use the system library's malloc. subprocesses System can use subprocesses (for M-x shell for example). Defined by default, only MSDOS undefines it. USE_LISP_UNION_TYPE Define it in lisp.h to make Lisp_Object be a union type instead of the default int. -** System specific macros, decribed in detail in src/s/template.h +** System specific macros, described in detail in src/s/template.h CLASH_DETECTION COFF FIRST_PTY_LETTER @@ -58,7 +58,7 @@ NARROWPROTO SEPCHAR SYSTEM_TYPE -** Machine specific macros, decribed in detail in src/m/template.h +** Machine specific macros, described in detail in src/m/template.h VIRT_ADDR_VARIES ** Misc macros diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 67516fa78b..8a10997eb8 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -521,7 +521,7 @@ THINGS TO DO ** Very strange bug: visible-bell does not work on secondary terminals in xterm and konsole. The screen does flicker a bit, - but it's so quick it isn't noticable. + but it's so quick it isn't noticeable. (Update: This is probably some problem with padding or whatnot on the secondary terminals.) diff --git a/autogen/install-sh b/autogen/install-sh index 6781b987bd..37709aed8b 100755 --- a/autogen/install-sh +++ b/autogen/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.02; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -347,7 +347,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 232ddff6d3..150731bdb9 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2011-11-20 Juanma Barranquero + + * compile.texi (Compiler Errors): + * help.texi (Help Functions): Fix typos. + 2011-11-19 Chong Yidong * windows.texi (Splitting Windows): Clarify role of window diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi index fe5563370c..372c041ab7 100644 --- a/doc/lispref/compile.texi +++ b/doc/lispref/compile.texi @@ -528,7 +528,7 @@ but the compiler does not issue warnings for anything that occurs inside @var{body}. We recommend that you use this construct around the smallest -possible piece of code, to avoid missing possible warnings other than one +possible piece of code, to avoid missing possible warnings other than one you intend to suppress. @end defspec diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index 0ce05d55a0..3426e81cdb 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -653,7 +653,7 @@ buffer, which is used to regenerate the help information when the user clicks on the @samp{Back} or @samp{Forward} buttons. Most commands that use the @samp{*Help*} buffer should invoke this function before clearing the buffer. The @var{item} argument should have the form -@code{(@var{funtion} . @var{args})}, where @var{funtion} is a function +@code{(@var{function} . @var{args})}, where @var{function} is a function to call, with argument list @var{args}, to regenerate the help buffer. The @var{interactive-p} argument is non-@code{nil} if the calling command was invoked interactively; in that case, the stack of items diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 924f3501bf..78282d7c57 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,12 @@ +2011-11-20 Juanma Barranquero + + * gnus-coding.texi (Gnus Maintenance Guide): + Rename from "Gnus Maintainance Guide". + + * ede.texi (ede-compilation-program, ede-compiler, ede-linker): + * eieio.texi (Customizing): + * gnus-news.texi: Fix typos. + 2011-11-16 Juanma Barranquero * org.texi (Agenda commands, Exporting Agenda Views): Fix typos. diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index 55dc7f9a82..f8d757c2d8 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -3526,7 +3526,7 @@ use the same autoconf form. @item :objectextention Type: @code{string} -A string which is the extention used for object files. +A string which is the extension used for object files. For example, C code uses .o on unix, and Emacs Lisp uses .elc. @refill @@ -3634,7 +3634,7 @@ it's rule definition. @item :objectextention Type: @code{string} -A string which is the extention used for object files. +A string which is the extension used for object files. For example, C code uses .o on unix, and Emacs Lisp uses .elc. @refill @@ -3782,7 +3782,7 @@ it's rule definition. @item :objectextention Type: @code{string} -A string which is the extention used for object files. +A string which is the extension used for object files. For example, C code uses .o on unix, and Emacs Lisp uses .elc. @refill diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index 8ee40288fe..7b4945027d 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi @@ -1212,9 +1212,9 @@ This method does nothing by default, but that may change in the future. This would be the best way to make your objects persistent when using in-place editing. -@section Widget extention +@section Widget extension -When widgets are being created, one new widget extention has been added, +When widgets are being created, one new widget extension has been added, called the @code{:slotofchoices}. When this occurs in a widget definition, all elements after it are removed, and the slot is specifies is queried and converted into a series of constants. diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi index ab9c0232d3..a79c68f012 100644 --- a/doc/misc/gnus-coding.texi +++ b/doc/misc/gnus-coding.texi @@ -1,7 +1,7 @@ \input texinfo @setfilename gnus-coding -@settitle Gnus Coding Style and Maintainance Guide +@settitle Gnus Coding Style and Maintenance Guide @syncodeindex fn cp @syncodeindex vr cp @syncodeindex pg cp @@ -45,7 +45,7 @@ license to the document, as described in section 6 of the license. @ifnottex @node Top -@top Gnus Coding Style and Maintainance Guide +@top Gnus Coding Style and Maintenance Guide This manual describes @dots{} @insertcopying @@ -53,7 +53,7 @@ This manual describes @dots{} @menu * Gnus Coding Style:: Gnus Coding Style -* Gnus Maintainance Guide:: Gnus Maintainance Guide +* Gnus Maintenance Guide:: Gnus Maintenance Guide @end menu @c @ref{Gnus Reference Guide, ,Gnus Reference Guide, gnus, The Gnus Newsreader} @@ -250,8 +250,8 @@ Emacs 20.7 and up. XEmacs 21.1 and up. @end itemize -@node Gnus Maintainance Guide -@chapter Gnus Maintainance Guide +@node Gnus Maintenance Guide +@chapter Gnus Maintenance Guide @section Stable and development versions diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi index 94984e5d3c..612ea14e2c 100644 --- a/doc/misc/gnus-news.texi +++ b/doc/misc/gnus-news.texi @@ -107,7 +107,7 @@ EasyPG is included in Emacs 23 and available separately as well. @itemize @bullet @item -Symbols like @code{gcc-self} now has the same precedence rules in +Symbols like @code{gcc-self} now have the same precedence rules in @code{gnus-parameters} as other ``real'' variables: The last match wins instead of the first match. diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS index 2e93b5c3f4..44c87c8946 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS @@ -2666,7 +2666,7 @@ consistent mnemonics were realized that should make it easier to remember key bindings. Added new sub-keymaps for folder commands, sequence commands, -extraction commands, and digest commands which begin with with F, S, +extraction commands, and digest commands which begin with F, S, X, and D, respectively. These sub-keymaps allowed some consistency (e.g., especially with l(ist) and k(ill)). diff --git a/etc/NEWS b/etc/NEWS index b5ff946f72..f37bb00e65 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -147,7 +147,7 @@ then the equivalent line in ~/.authinfo would be **** The variable `smtpmail-starttls-credentials' has been removed. -If you had that set, then then you need to put +If you had that set, then you need to put machine smtp.whatever.foo port 25 key "~/.my_smtp_tls.key" cert "~/.my_smtp_tls.cert" diff --git a/etc/NEWS.19 b/etc/NEWS.19 index 90671cee18..88e5849f13 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 @@ -1828,7 +1828,7 @@ c-fill-paragraph's behavior. containing an open brace just after a case/default label. *** New variable, c-progress-interval, which controls minibuffer update -message displays during long re-indention. This is a new feature +message displays during long re-indentation. This is a new feature which prints percentage complete messages at specified intervals. ** Makefile mode changes. diff --git a/etc/NEWS.21 b/etc/NEWS.21 index c3c54d8bb0..c018567c40 100644 --- a/etc/NEWS.21 +++ b/etc/NEWS.21 @@ -1678,7 +1678,7 @@ current file, or you can use C-x v r RET to get an update for an entire directory tree. The new user option `vc-cvs-use-edit' indicates whether VC should call -"cvs edit" to make files writeable; it defaults to `t'. (This option +"cvs edit" to make files writable; it defaults to `t'. (This option is only meaningful if the CVSREAD variable is set, or if files are "watched" by other developers.) diff --git a/etc/NEWS.22 b/etc/NEWS.22 index 3920f59fef..8cf0cdee87 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 @@ -3356,7 +3356,7 @@ contracts or expands the line under the cursor. *** The new commands `speedbar-expand-line-descendants' and `speedbar-contract-line-descendants', bound to `[' and `]' respectively, expand and contract the line under cursor with all of -its descendents. +its descendants. *** The new user option `speedbar-use-tool-tips-flag', if non-nil, means to display tool-tips for speedbar items. diff --git a/lib/sha256.c b/lib/sha256.c index c125542248..4dbb5e9129 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -51,7 +51,7 @@ static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ }; /* Takes a pointer to a 256 bit block of data (eight 32 bit ints) and - intializes it to the start constants of the SHA256 algorithm. This + initializes it to the start constants of the SHA256 algorithm. This must be called before using hash in the call to sha256_hash */ void diff --git a/lib/sha512.c b/lib/sha512.c index c0bed95758..5c2e3ab9f8 100644 --- a/lib/sha512.c +++ b/lib/sha512.c @@ -58,7 +58,7 @@ static const unsigned char fillbuf[128] = { 0x80, 0 /* , 0, 0, ... */ }; /* Takes a pointer to a 512 bit block of data (eight 64 bit ints) and - intializes it to the start constants of the SHA512 algorithm. This + initializes it to the start constants of the SHA512 algorithm. This must be called before using hash in the call to sha512_hash */ void diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 11a4acd3b1..8f9038ffed 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2011-11-20 Juanma Barranquero + + * progmodes/cwarn.el (cwarn-is-enabled, cwarn-font-lock-keywords): + * progmodes/pascal.el (electric-pascal-equal): + * textmodes/reftex-dcr.el (reftex-view-crossref-from-bibtex): + * xml.el (xml-substitute-special): Fix typos. + 2011-11-20 Glenn Morris * mail/rmail.el (rmail-enable-mime-composing): Make it a defcustom. diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index e40f419b32..b67cc2f67b 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -374,7 +374,7 @@ the function is advised in cc-defs. However, that advice doesn't help if the autoloads are updated in an old (X)Emacs with this version of CC Mode, but I believe it's unlikely that - anyone does that when CC Mode isn't distributed with with it. + anyone does that when CC Mode isn't distributed with it. * progmodes/cc-defs.el (add-to-list): Add advice to get the optional third append argument in older (X)Emacsen. @@ -2440,7 +2440,7 @@ * gdb-ui.el (gud-gdba-command-name): Use -noasync option for Gdb with MS windows. - (gdb-display-end): Only make buffer writeable temporarily. + (gdb-display-end): Only make buffer writable temporarily. Move "View" submenu up one level. 2003-05-21 Nick Roberts @@ -9827,7 +9827,7 @@ (uniquify-delay-rationalize-file-buffer-names): Remove useless check. (kill-buffer-hook): Don't change globally. -2002-09-27 Stefan Monnier . +2002-09-27 Stefan Monnier * calc/calc.el (calc-bug-address, calc-scan-for-dels, calc-stack) (calc-stack-top, calc-always-load-extensions) @@ -20778,7 +20778,7 @@ * Makefile.in (distclean): Remove Makefile in the build directory, not in the source directory. -2001-12-21 Simon Josefsson . +2001-12-21 Simon Josefsson * mail/smtpmail.el (smtpmail-send-queued-mail): Use with-temp-buffer instead of find-file-noselect, and bind diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 0642a4d14a..9f7c26c5d4 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -14943,7 +14943,7 @@ 2007-07-05 Thien-Thi Nguyen * Makefile.in (bootstrap-prepare): When copying from - ldefs-boot.el, make sure loaddefs.el is writeable. + ldefs-boot.el, make sure loaddefs.el is writable. (bootstrap-prepare): Make $(lisp)/ps-print.el and $(lisp)/emacs-lisp/cl-loaddefs.el writable, as well. diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index dfd9b94b53..04133f1736 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -13225,7 +13225,7 @@ 2010-02-04 Michael Albinus * dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call - `dired-uncache' for every elemnt which is an absolute file name. + `dired-uncache' for every element which is an absolute file name. * net/tramp.el (tramp-handle-dired-uncache): When DIR is not a directory, handle its directory component. diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index 5b0f2ac427..65005a4ba4 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -3788,7 +3788,7 @@ 1986-06-17 Richard M. Stallman (rms@prep) - * nroff-mode.el: Add elements to nrofff-brace-table. + * nroff-mode.el: Add elements to nroff-brace-table. 1986-06-16 Richard M. Stallman (rms@prep) diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index 8cafac2c0c..2b384d7916 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -1905,7 +1905,7 @@ * Makefile: Created. This exists mainly so developers elsewhere can unlock the lisp files to accept an update tar, then relock - them without locking the few that should stay writeable. + them without locking the few that should stay writable. * solar.el, ange-ftp.el: Corrected Keywords header diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index dea5137d24..7aca1b521a 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -5516,7 +5516,7 @@ 1999-04-08 Andre Spiegel * vc.el (vc-backend-revert): For CVS files that were made - writeable with "cvs edit", call "cvs unedit" to undo that. + writable with "cvs edit", call "cvs unedit" to undo that. 1999-04-08 Dave Love diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index f08e6fb886..538f3f1d40 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -8638,7 +8638,7 @@ 2000-11-15 Gerd Moellmann * faces.el (face-set-after-frame-default): - If `inhibit-default-face-x-resources' is bound, don't intialize the + If `inhibit-default-face-x-resources' is bound, don't initialize the default face from X resources. 2000-11-15 Eli Zaretskii diff --git a/lisp/allout.el b/lisp/allout.el index a08aa05d58..bd2094da25 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -170,7 +170,7 @@ respective allout-mode keybinding variables, `allout-command-prefix', ;; the function value keymap of allout-mode-map is used in ;; minor-mode-map-alist - update it: (fset allout-mode-map allout-mode-map-value)) -;;;_ * intialize the mode map: +;;;_ * initialize the mode map: ;; ensure that allout-mode-map has some setting even if allout-mode hasn't ;; been invoked: (allout-compose-and-institute-keymap) diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index e5969a3c29..788bf71845 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,27 @@ +2011-11-20 Juanma Barranquero + + * cedet-cscope.el (cedet-cscope-version-check): + * cedet-global.el (cedet-global-min-version) + (cedet-gnu-global-version-check): + * cedet.el (cedet-version): + * data-debug.el (data-debug-prev, data-debug-contract-current-line): + * ede.el (ede-buffer-belongs-to-project-p, ede-auto-add-to-target) + (ede-new, ede-invoke-method, project-edit-file-target, project-rescan) + (ede-add-project-to-global-list, ede-map-all-subprojects): + * inversion.el (inversion-check-version): + * mode-local.el (mode-local-map-file-buffers, define-child-mode) + (define-overloadable-function): + * pulse.el (pulse-flag, pulse): + * semantic.el (semantic-elapsed-time, semantic-parse-region) + (navigate-menu): + * ede/proj-comp.el (ede-compilation-program): + * semantic/debug.el (semantic-debug-parser-go) + (semantic-debug-parser-fail, semantic-debug-parser-quit) + (semantic-debug-parser-abort): + * semantic/idle.el (semantic-idle-core-handler): + * semantic/bovine/debug.el (semantic-bovine-debug-error-frame): + Fix typos. + 2011-11-16 Juanma Barranquero * semantic/lex.el (semantic-lex-tokens): diff --git a/lisp/cedet/cedet-cscope.el b/lisp/cedet/cedet-cscope.el index 74892533ab..71942698c5 100644 --- a/lisp/cedet/cedet-cscope.el +++ b/lisp/cedet/cedet-cscope.el @@ -135,8 +135,8 @@ the error code." (defun cedet-cscope-version-check (&optional noerror) "Check the version of the installed CScope command. -If optional programatic argument NOERROR is non-nil, then -instead of throwing an error if CScope isn't available, then +If optional programmatic argument NOERROR is non-nil, +then instead of throwing an error if CScope isn't available, return nil." (interactive) (require 'inversion) diff --git a/lisp/cedet/cedet-files.el b/lisp/cedet/cedet-files.el index ae037028bf..6f40ee7030 100644 --- a/lisp/cedet/cedet-files.el +++ b/lisp/cedet/cedet-files.el @@ -83,7 +83,7 @@ specific conversions during tests." (setq file (concat driveletter ":" (substring file (match-end 1)))))) - ;; Handle the \\file\name nomenclature on some windows boxes. + ;; Handle the \\file\name nomenclature on some Windows boxes. (when (string-match "^!" file) (setq file (concat "//" (substring file 1))))) file)) diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el index d2a9794ec8..aa18c0d2f4 100644 --- a/lisp/cedet/cedet-global.el +++ b/lisp/cedet/cedet-global.el @@ -27,7 +27,7 @@ (declare-function inversion-check-version "inversion") (defvar cedet-global-min-version "5.0" - "Minimum version of GNU global required.") + "Minimum version of GNU Global required.") (defcustom cedet-global-command "global" "Command name for the GNU Global executable." @@ -131,8 +131,8 @@ If a default starting DIR is not specified, the current buffer's (defun cedet-gnu-global-version-check (&optional noerror) "Check the version of the installed GNU Global command. -If optional programatic argument NOERROR is non-nil, then -instead of throwing an error if Global isn't available, then +If optional programmatic argument NOERROR is non-nil, +then instead of throwing an error if Global isn't available, return nil." (interactive) (require 'inversion) diff --git a/lisp/cedet/cedet-idutils.el b/lisp/cedet/cedet-idutils.el index e071265c14..ee8e432ddd 100644 --- a/lisp/cedet/cedet-idutils.el +++ b/lisp/cedet/cedet-idutils.el @@ -84,7 +84,7 @@ Note: Scope is not yet supported." (defun cedet-idutils-fnid-call (flags) "Call ID Utils fnid with the list of FLAGS. -Return the created buffer with with program output." +Return the created buffer with program output." (let ((b (get-buffer-create "*CEDET fnid*")) (cd default-directory) ) @@ -112,7 +112,7 @@ Return the created buffer with with program output." (defun cedet-idutils-mkid-call (flags) "Call ID Utils mkid with the list of FLAGS. -Return the created buffer with with program output." +Return the created buffer with program output." (let ((b (get-buffer-create "*CEDET mkid*")) (cd default-directory) ) @@ -163,8 +163,8 @@ the error code." (defun cedet-idutils-version-check (&optional noerror) "Check the version of the installed ID Utils command. -If optional programatic argument NOERROR is non-nil, then -instead of throwing an error if Global isn't available, then +If optional programmatic argument NOERROR is non-nil, +then instead of throwing an error if Global isn't available, return nil." (interactive) (require 'inversion) diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el index d7645bc97e..9ccf74de27 100644 --- a/lisp/cedet/cedet.el +++ b/lisp/cedet/cedet.el @@ -75,7 +75,7 @@ This is used by `semantic-mode' and `global-ede-mode'.") (defun cedet-version () - "Display all active versions of CEDET and Dependent packages. + "Display all active versions of CEDET and dependent packages. The PACKAGE column is the name of a given package from CEDET. @@ -85,7 +85,7 @@ See `cedet-packages' for details. FILE VERSION is the version number found in the source file for the specified PACKAGE. -LOADED VERSION is the version of PACKAGE current loaded in Emacs +LOADED VERSION is the version of PACKAGE currently loaded in Emacs memory and (presumably) running in this Emacs instance. Value is X if the package has not been loaded." (interactive) diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el index e50e9993af..329d1c608c 100644 --- a/lisp/cedet/data-debug.el +++ b/lisp/cedet/data-debug.el @@ -916,7 +916,7 @@ If PARENT is non-nil, it is somehow related as a parent to thing." (skip-chars-forward " *-><[]" (point-at-eol))) (defun data-debug-prev () - "Go to the next line in the Ddebug buffer." + "Go to the previous line in the Ddebug buffer." (interactive) (forward-line -1) (beginning-of-line) @@ -972,7 +972,7 @@ Do nothing if already expanded." (defun data-debug-contract-current-line () "Contract the current line (if possible). -Do nothing if already expanded." +Do nothing if already contracted." (when (and (data-debug-current-line-expanded-p) ;; Don't contract if the current line is not expandable. (get-text-property (point) 'ddebug-function)) diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index 987351a25e..741e1ffbe5 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el @@ -214,7 +214,7 @@ Argument LIST-O-O is the list of objects to choose from." (and obj (obj-of-class-p obj ede-target)))) (defun ede-buffer-belongs-to-project-p () - "Return non-nil if this buffer belongs to at least one target." + "Return non-nil if this buffer belongs to at least one project." (if (or (null ede-object) (consp ede-object)) nil (obj-of-class-p ede-object ede-project))) @@ -243,7 +243,7 @@ Argument MENU-DEF is the menu definition to use." ede-obj (if (listp ede-object) ede-object (list ede-object))) ;; First, collect the build items from the project (setq newmenu (append newmenu (ede-menu-items-build obj t))) - ;; Second, Declare the current target menu items + ;; Second, declare the current target menu items (if (and ede-obj (ede-menu-obj-of-class-p ede-target)) (while ede-obj (setq newmenu (append newmenu @@ -264,7 +264,7 @@ Argument MENU-DEF is the menu definition to use." (setq targets (cdr targets))) ;; Fourth, build sub projects. ;; -- nerp - ;; Fifth, Add make distribution + ;; Fifth, add make distribution (append newmenu (list [ "Make distribution" ede-make-dist t ])) ))))) @@ -512,7 +512,7 @@ an EDE controlled project." "Look for a target that wants to own the current file. Follow the preference set with `ede-auto-add-method' and get the list of objects with the `ede-want-file-p' method." - (if ede-object (error "Ede-object already defined for %s" (buffer-name))) + (if ede-object (error "ede-object already defined for %s" (buffer-name))) (if (or (eq ede-auto-add-method 'never) (ede-ignore-file (buffer-file-name))) nil @@ -566,7 +566,7 @@ Argument FILE is the file or directory to load a project from." (ede-load-project-file (file-name-directory file)))) (defun ede-new (type &optional name) - "Create a new project starting of project type TYPE. + "Create a new project starting from project type TYPE. Optional argument NAME is the name to give this project." (interactive (list (completing-read "Project Type: " @@ -642,7 +642,7 @@ Optional argument NAME is the name to give this project." (defun ede-invoke-method (sym &rest args) "Invoke method SYM on the current buffer's project object. -ARGS are additional arguments to pass to method sym." +ARGS are additional arguments to pass to method SYM." (if (not ede-object) (error "Cannot invoke %s for %s" (symbol-name sym) (buffer-name))) @@ -815,7 +815,7 @@ Argument FNND is an argument." (error "remove-file not supported by %s" (object-name ot))) (defmethod project-edit-file-target ((ot ede-target)) - "Edit the target OT associated w/ this file." + "Edit the target OT associated with this file." (find-file (oref (ede-current-project) file))) (defmethod project-new-target ((proj ede-project) &rest args) @@ -857,7 +857,7 @@ Argument COMMAND is the command to use for compiling the target." (error "Dist-files is not supported by %s" (object-name this))) (defmethod project-rescan ((this ede-project)) - "Rescan the EDE proj project THIS." + "Rescan the EDE project THIS." (error "Rescanning a project is not supported by %s" (object-name this))) (defun ede-ecb-project-paths () @@ -879,7 +879,7 @@ On success, return the added project." (when (not proj) (error "No project created to add to master list")) (when (not (eieio-object-p proj)) - (error "Attempt to add Non-object to master project list")) + (error "Attempt to add non-object to master project list")) (when (not (obj-of-class-p proj ede-project-placeholder)) (error "Attempt to add a non-project to the ede projects list")) (add-to-list 'ede-projects proj) @@ -1157,7 +1157,7 @@ See also `ede-map-all-subprojects'." (mapcar proc (oref this subproj))) (defmethod ede-map-all-subprojects ((this ede-project) allproc) - "For object THIS, execute PROC on THIS and all subprojects. + "For object THIS, execute PROC on THIS and all subprojects. This function also applies PROC to sub-sub projects. See also `ede-map-subprojects'." (apply 'append diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el index ae5796e042..84bf8ebf1a 100644 --- a/lisp/cedet/ede/proj-comp.el +++ b/lisp/cedet/ede/proj-comp.el @@ -97,8 +97,8 @@ use the same autoconf form.") (objectextention :initarg :objectextention :type string :documentation - "A string which is the extention used for object files. -For example, C code uses .o on unix, and Emacs Lisp uses .elc.") + "A string which is the extension used for object files. +For example, C code uses .o on Unix, and Emacs Lisp uses .elc.") ) "A program used to compile or link a program via a Makefile. Contains everything needed to output code into a Makefile, or autoconf diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el index 065ac6d055..53639b19a9 100644 --- a/lisp/cedet/inversion.el +++ b/lisp/cedet/inversion.el @@ -216,14 +216,14 @@ not an indication of new features or bug fixes." ))) (defun inversion-check-version (version incompatible-version - minimum &rest reserved) + minimum &rest reserved) "Check that a given version meets the minimum requirement. VERSION, INCOMPATIBLE-VERSION and MINIMUM are of similar format to return entries of `inversion-decode-version', or a classic version string. INCOMPATIBLE-VERSION can be nil. RESERVED arguments are kept for a later use. Return: -- nil if everything is ok +- nil if everything is ok. - 'outdated if VERSION is less than MINIMUM. - 'incompatible if VERSION is not backward compatible with MINIMUM. - t if the check failed." @@ -374,7 +374,7 @@ Return nil when VERSION-STRING was not found." (with-temp-buffer ;; The 3000 is a bit arbitrary, but should cut down on ;; fileio as version info usually is at the very top - ;; of a file. AFter a long commentary could be bad. + ;; of a file. After a long commentary could be bad. (insert-file-contents-literally file nil 0 3000) (goto-char (point-min)) (when (re-search-forward (format tag package 'version) nil t) diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el index 0e7657642c..511a3cd1d8 100644 --- a/lisp/cedet/mode-local.el +++ b/lisp/cedet/mode-local.el @@ -36,7 +36,7 @@ ;; ;; You should use a mode-local variable or override to allow extension ;; only if you expect a mode author to provide that extension. If a -;; user might wish to customize a give variable or function then +;; user might wish to customize a given variable or function then ;; the existing customization mechanism should be used. ;; To Do: @@ -55,7 +55,7 @@ FUNCTION does not have arguments; when it is entered `current-buffer' is the currently selected file buffer. If optional argument PREDICATE is non nil, only select file buffers -for which the function PREDICATE return non-nil. +for which the function PREDICATE returns non-nil. If optional argument BUFFERS is non-nil, it is a list of buffers to walk through. It defaults to `buffer-list'." (dolist (b (or buffers (buffer-list))) @@ -146,7 +146,7 @@ local variables have been defined." (mode-local-map-mode-buffers #'activate-mode-local-bindings mode)) (defmacro define-child-mode (mode parent &optional docstring) - "Make major mode MODE inherits behavior from PARENT mode. + "Make major mode MODE inherit behavior from PARENT mode. DOCSTRING is optional and not used. To work properly, this should be put after PARENT mode local variables definition." @@ -523,11 +523,11 @@ See also the function `define-overload'." result))) (defmacro define-overloadable-function (name args docstring &rest body) - "Define a new function, as with `defun' which can be overloaded. + "Define a new function, as with `defun', which can be overloaded. NAME is the name of the function to create. ARGS are the arguments to the function. DOCSTRING is a documentation string to describe the function. The -docstring will automatically had details about its overload symbol +docstring will automatically have details about its overload symbol appended to the end. BODY is code that would be run when there is no override defined. The default is to call the function `NAME-default' with the appropriate diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el index e3d2bd967b..4929feb030 100644 --- a/lisp/cedet/pulse.el +++ b/lisp/cedet/pulse.el @@ -36,7 +36,7 @@ ;; ;; `pulse-momentary-highlight-one-line' - Pulse a single line at POINT. ;; `pulse-momentary-highlight-region' - Pulse a region. -;; `pulse-momentary-highlight-overlay' - Pulse an overlay +;; `pulse-momentary-highlight-overlay' - Pulse an overlay. ;; These three functions will just blink the specified area if ;; the version of Emacs you are using doesn't support pulsing. ;; @@ -65,7 +65,7 @@ background color. If the value is nil, highlight with an unchanging color until a key is pressed. If the value is `never', do no coloring at all. -Any other value means to the default pulsing behavior. +Any other value means to do the default pulsing behavior. If `pulse-flag' is non-nil, but `pulse-available-p' is nil, then this flag is ignored." @@ -163,7 +163,7 @@ Return t if there is more drift to do, nil if completed." (defun pulse (&optional face) "Pulse the colors on our highlight face. -If optional FACE is provide, reset the face to FACE color, +If optional FACE is provided, reset the face to FACE color, instead of `pulse-highlight-start-face'. Be sure to call `pulse-reset-face' after calling pulse." (unwind-protect diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el index 639b46ad2c..3ffb6baee9 100644 --- a/lisp/cedet/semantic.el +++ b/lisp/cedet/semantic.el @@ -344,7 +344,7 @@ to use Semantic, and `semantic-init-hook' is run." ;; don't go along for the ride. (add-hook 'clone-indirect-buffer-hook 'semantic-clear-toplevel-cache nil t) - ;; Specify that this function has done it's work. At this point + ;; Specify that this function has done its work. At this point ;; we can consider that semantic is active in this buffer. (setq semantic-new-buffer-fcn-was-run t) ;; Here are some buffer local variables we can initialize ourselves @@ -378,7 +378,7 @@ Do not set this yourself. Call `semantic-debug'.") (defun semantic-elapsed-time (start end) "Copied from elp.el. Was `elp-elapsed-time'. -Argument START and END bound the time being calculated." +Arguments START and END bound the time being calculated." (float-time (time-subtract end start))) (defun bovinate (&optional clear) @@ -431,7 +431,7 @@ will be silently ignored. Optional arguments: NONTERMINAL is the rule to start parsing at. -DEPTH specifies the lexical depth to descend for parser that use +DEPTH specifies the lexical depth to descend for parsers that use lexical analysis as their first step. RETURNONERROR specifies that parsing should stop on the first unmatched syntax encountered. When nil, parsing skips the syntax, @@ -960,7 +960,7 @@ Throw away all the old tags, and recreate the tag database." '("--")) (define-key navigate-menu [senator-go-to-up-reference] '(menu-item "Parent Tag" senator-go-to-up-reference - :help "Navigate up one reference by tag.")) + :help "Navigate up one reference by tag")) (define-key navigate-menu [senator-next-tag] '(menu-item "Next Tag" senator-next-tag :help "Go to the next tag")) @@ -971,7 +971,7 @@ Throw away all the old tags, and recreate the tag database." ;; Top level menu items: (define-key cedet-menu-map [semantic-force-refresh] '(menu-item "Reparse Buffer" semantic-force-refresh - :help "Force a full reparse of the current buffer." + :help "Force a full reparse of the current buffer" :visible semantic-mode)) (define-key cedet-menu-map [semantic-edit-menu] `(menu-item "Edit Tags" ,edit-menu diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 9a862c64d1..7de0011ce9 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -1591,7 +1591,7 @@ DO NOT return the list of tags encompassing point." (setq tagreturn (cons (semantic-tag-type (car (semanticdb-find-result-nth tmp idx))) tagreturn)) (setq idx (1+ idx))) ) - ;; Use the encompased types around point to also look for using statements. + ;; Use the encompassed types around point to also look for using statements. ;;(setq tagreturn (cons "bread_name" tagreturn)) (while (cdr tagsaroundpoint) ; don't search the last one (setq tmp (semantic-find-tags-by-class 'using (semantic-tag-components (car tagsaroundpoint)))) diff --git a/lisp/cedet/semantic/bovine/debug.el b/lisp/cedet/semantic/bovine/debug.el index 9ca7409e33..684db1e7bb 100644 --- a/lisp/cedet/semantic/bovine/debug.el +++ b/lisp/cedet/semantic/bovine/debug.el @@ -114,7 +114,7 @@ LEXTOKEN, is a token returned by the lexer which is being matched." :documentation "An error condition caught in an action.") ) - "Debugger frame representaion of a lisp error thrown during parsing.") + "Debugger frame representation of a lisp error thrown during parsing.") (defun semantic-create-bovine-debug-error-frame (condition) "Create an error frame for bovine debugger. diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index a4c4bd99f2..7d23ad1700 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el @@ -368,7 +368,7 @@ a master list." (semanticdb-typecache-merge-streams incstream ;; Getting the cache from this table will also cause this - ;; file to update its cache from its decendents. + ;; file to update its cache from its descendants. ;; ;; In theory, caches are only built for most includes ;; only once (in the loop before this one), so this ends diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el index ecab73a80d..45b807df12 100644 --- a/lisp/cedet/semantic/debug.el +++ b/lisp/cedet/semantic/debug.el @@ -519,22 +519,22 @@ down to your parser later." ) (defmethod semantic-debug-parser-go ((parser semantic-debug-parser)) - "Continue executiong in this PARSER until the next breakpoint." + "Continue execution in this PARSER until the next breakpoint." (setq semantic-debug-user-command 'go) ) (defmethod semantic-debug-parser-fail ((parser semantic-debug-parser)) - "Continue executiong in this PARSER until the next breakpoint." + "Continue execution in this PARSER until the next breakpoint." (setq semantic-debug-user-command 'fail) ) (defmethod semantic-debug-parser-quit ((parser semantic-debug-parser)) - "Continue executiong in this PARSER until the next breakpoint." + "Continue execution in this PARSER until the next breakpoint." (setq semantic-debug-user-command 'quit) ) (defmethod semantic-debug-parser-abort ((parser semantic-debug-parser)) - "Continue executiong in this PARSER until the next breakpoint." + "Continue execution in this PARSER until the next breakpoint." (setq semantic-debug-user-command 'abort) ) diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index a007f21b69..0780a62825 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el @@ -549,7 +549,7 @@ This function is for internal use by `semantic-edits-incremental-parser'." ;; is not the first change for this ;; iteration, and it starts before the end ;; of current parse region, then it is - ;; encompased within the bounds of tags + ;; encompassed within the bounds of tags ;; modified by the previous iteration's ;; change. (< (semantic-overlay-start (car changes)) diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el index b49d1db1ad..6761a7f532 100644 --- a/lisp/cedet/semantic/idle.el +++ b/lisp/cedet/semantic/idle.el @@ -245,7 +245,7 @@ And also manages services that depend on tag values." ;; services. Stop on keypress. ;; NOTE ON COMMENTED SAFE HERE - ;; We used to not execute the services if the buffer wsa + ;; We used to not execute the services if the buffer was ;; unparseable. We now assume that they are lexically ;; safe to do, because we have marked the buffer unparseable ;; if there was a problem. @@ -254,11 +254,11 @@ And also manages services that depend on tag values." (save-excursion (semantic-throw-on-input 'idle-queue) (when semantic-idle-scheduler-verbose-flag - (message "IDLE: execture service %s..." service)) + (message "IDLE: execute service %s..." service)) (semantic-safe (format "Idle Service Error %s: %%S" service) (funcall service)) (when semantic-idle-scheduler-verbose-flag - (message "IDLE: execture service %s...done" service)) + (message "IDLE: execute service %s...done" service)) ))) ;;) ;; Finally loop over remaining buffers, trying to update them as diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el index a09928c7df..ce3500f83e 100644 --- a/lisp/cedet/semantic/symref/list.el +++ b/lisp/cedet/semantic/symref/list.el @@ -24,7 +24,7 @@ ;; Provide a simple user facing API to finding symbol references. ;; ;; This UI is the base of some refactoring tools. For any refactor, -;; the user will execture [FIXME what?] `semantic-symref' in a tag. +;; the user will execute `semantic-symref' in a tag. ;; Once that data is collected, the output will be listed in a buffer. ;; In the output buffer, the user can then initiate different ;; refactoring operations. @@ -103,7 +103,7 @@ Display the references in`semantic-symref-results-mode'." (when (not res) (error "No references found")) (semantic-symref-result-get-tags res t) (message "Gathering References...done") - ;; Build a refrences buffer. + ;; Build a references buffer. (let ((buff (get-buffer-create (format "*Symref %s" str))) ) diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el index 62ceff8244..1575ce7ae3 100644 --- a/lisp/cedet/srecode/dictionary.el +++ b/lisp/cedet/srecode/dictionary.el @@ -437,7 +437,7 @@ The root dictionary is usually for a current or active insertion." ;;; COMPOUND VALUE METHODS ;; ;; Compound values must provide at least the toString method -;; for use in converting the compound value into sometehing insertable. +;; for use in converting the compound value into something insertable. (defmethod srecode-compound-toString ((cp srecode-dictionary-compound-value) function diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 8b64cd84bb..820519e92d 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -392,7 +392,7 @@ DATA is displayed to the user and should state the reason of the failure." ;; compiling doesn't depend on cl and thus doesn't need an ;; environment arg for `macroexpand'. (if (fboundp 'cl-macroexpand) - ;; Suppress warning about run-time call to cl funtion: we + ;; Suppress warning about run-time call to cl function: we ;; only call it if it's fboundp. (with-no-warnings (cl-macroexpand form (and (boundp 'cl-macro-environment) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 0bd37ce1d4..8417aa8d38 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -277,7 +277,7 @@ contrast, `package-user-dir' contains packages for personal use." :version "24.1") ;; The value is precomputed in finder-inf.el, but don't load that -;; until it's needed (i.e. when `package-intialize' is called). +;; until it's needed (i.e. when `package-initialize' is called). (defvar package--builtins nil "Alist of built-in packages. The actual value is initialized by loading the library diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 9a02989335..3fd2c87d59 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2011-11-20 Juanma Barranquero + + * erc-log.el (erc-logging-enabled): Fix typo. + 2011-11-14 Juanma Barranquero * erc-notify.el (erc-notify-interval, erc-cmd-NOTIFY): Fix typos. diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01 index 001ab42926..f4e10d0598 100644 --- a/lisp/erc/ChangeLog.01 +++ b/lisp/erc/ChangeLog.01 @@ -399,7 +399,7 @@ * erc.el: * Tijs van Bakel's work from 10th Nov. merged in * My additions to that idea merged in too - Basicly, this is a major rewrite, if you are scared and want avoid problems, + Basically, this is a major rewrite, if you are scared and want avoid problems, stay at your current version. It seems fairly stable though. That changed? erc-buffer-name handling was completely rewritten, and erc-buffer-list local variable handling removed. diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03 index 322f7c93f7..fc7fd09e76 100644 --- a/lisp/erc/ChangeLog.03 +++ b/lisp/erc/ChangeLog.03 @@ -838,7 +838,7 @@ * erc.el: erc-log-channels: removed; set the directory to start logging (erc-directory-writeable-p): create directory if it doesn't exist, check if - it's writeable + it's writable (erc-logging-enabled): don't reference erc-log-channels 2003-04-07 Damien Elmes @@ -1556,7 +1556,7 @@ * erc.el: This is the "everything is suddenly broken!" release You know, this is CVS, you can still go back, and wait until the transition - is finished, but here is patch one, which basicly breaks every command + is finished, but here is patch one, which basically breaks every command which is typed on the prompt. Hit me, we can still revert, but something needs to be done about this. * (erc-extract-command-from-line): intern-soft the function here. diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index f86c9ef845..5baa676ab3 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -1432,7 +1432,7 @@ add things to `%s' instead." (when (string= cmd "PRIVMSG") (erc-auto-query proc parsed)))))) -;; FIXME: need clean way of specifiying extra hooks in +;; FIXME: need clean way of specifying extra hooks in ;; define-erc-response-handler. (add-hook 'erc-server-PRIVMSG-functions 'erc-auto-query) diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el index c6b0984fe6..f1754afd1a 100644 --- a/lisp/erc/erc-log.el +++ b/lisp/erc/erc-log.el @@ -314,7 +314,7 @@ Returns nil if `erc-server-buffer-p' returns t." "Return non-nil if logging is enabled for BUFFER. If BUFFER is nil, the value of `current-buffer' is used. Logging is enabled if `erc-log-channels-directory' is non-nil, the directory -is writeable (it will be created as necessary) and +is writable (it will be created as necessary) and `erc-enable-logging' returns a non-nil value." (and erc-log-channels-directory (or (functionp erc-log-channels-directory) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index a9db3c23fe..27693ab771 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2011-11-20 Juanma Barranquero + + * mm-util.el (mm-charset-after): Fix typo. + 2011-11-16 Juanma Barranquero * gnus-sum.el (gnus-summary-make-menu-bar): @@ -2849,7 +2853,7 @@ 2011-01-24 Lars Ingebrigtsen - * shr.el (shr-expand-newlines): Proof of concept implemantation of boxy + * shr.el (shr-expand-newlines): Proof of concept implementation of boxy backgrounds. (shr-expand-newlines): Switch to using overlays to enable kill'n'yank in a more sensible manner. @@ -19398,7 +19402,7 @@ * gnus-group.el (gnus-group-get-new-news-this-group): Don't update info that isn't there. -2004-06-29 Ilya N. Golubev . +2004-06-29 Ilya N. Golubev * mm-util.el (mm-mime-mule-charset-alist): Add the windows-1251 entry. diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index dcdf1c2934..d7defec1a7 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -2111,7 +2111,7 @@ * gnus-srvr.el (gnus-browse-foreign-server): Parse garbage NNTP groups correctly. -2003-06-06 Benjamin Rutt . +2003-06-06 Benjamin Rutt * message.el (message-fetch-field): Augment documentation to state the narrowed-to-headers restriction. @@ -6816,7 +6816,7 @@ downloaded variable if we're in an uncovered group. * gnus-agent.el (gnus-agent-downloaded-article-face): Change the - font to soemthing less noticeable. + font to something less noticeable. (gnus-agent-group-covered-p): New function. 2002-12-09 ShengHuo ZHU @@ -6972,7 +6972,7 @@ * gnus-agent.el (gnus-agent-check-overview-buffer): Make debugger print message on entry. -2002-11-25 Kevin Greiner . +2002-11-25 Kevin Greiner * gnus-range.el (gnus-range-difference): New function. * gnus-sum.el (gnus-summary-insert-old-articles): Use it. @@ -7964,7 +7964,7 @@ (mml2015-pgg-encrypt): New functions. (defvar, autoload): Prevent byte-compile warnings. -2002-09-24 TSUCHIYA Masatoshi . +2002-09-24 TSUCHIYA Masatoshi * gnus-art.el (article-strip-banner): Check for the existence of from header. @@ -8097,7 +8097,7 @@ * gnus-sum.el (gnus-summary-next-group): Semi-exit only when needed. -2002-09-12 John Paul Wallington . +2002-09-12 John Paul Wallington * gnus.el (gnus-visual, gnus-meta): Fix typo. @@ -8111,7 +8111,7 @@ (nnimap-split-rule): Doc fix. (nnimap-request-expire-articles): Cleanup code. -2002-09-11 TSUCHIYA Masatoshi . +2002-09-11 TSUCHIYA Masatoshi * gnus-art.el (gnus-article-address-banner-alist): New option. (article-strip-banner): Refer the above option to split banners of @@ -8205,7 +8205,7 @@ (gnus-group-fetch-control): New function. Add them to the keymap and menu. Require mm-url. -2002-08-30 Alex Schroeder . +2002-08-30 Alex Schroeder * gnus-mlspl.el (gnus-group-split-fancy): Doc fix. @@ -8270,7 +8270,7 @@ * gnus-util.el (gnus-select-frame-set-input-focus): New function. -2002-08-20 小関 吉則 (KOSEKI Yoshinori) . +2002-08-20 小関 吉則 (KOSEKI Yoshinori) * message.el (message-set-auto-save-file-name): Add support for the Cygwin Emacs; the system-type is `cygwin'. @@ -8396,7 +8396,7 @@ * nnimap.el (nnimap-split-articles): Do not call nnmail-fetch-field when splitting malformed messages without message-id. -2002-07-28 Niklas Morberg . +2002-07-28 Niklas Morberg * nnweb.el (nnweb-type, nnweb-type-definition) (nnweb-gmane-create-mapping, nnweb-gmane-wash-article) @@ -8440,18 +8440,18 @@ nnmail-expiry-target to 'delete, so that absolute deletion happens when absolute deletion is requested. -2002-07-21 Nevin Kapur . +2002-07-21 Nevin Kapur * nnmail.el (nnmail-fancy-expiry-target): Treat nonexisting headers as empty headers. -2002-07-21 Jochen Hein . +2002-07-21 Jochen Hein * gnus-art.el (gnus-emphasis-alist): Add strikethrough and correct typo. (gnus-emphasis-strikethru): New face. -2002-07-20 Jason Merrill . +2002-07-20 Jason Merrill * nnfolder.el (nnfolder-retrieve-headers): Avoid searching the entire file for each of a sequence of missing articles. @@ -9879,7 +9879,7 @@ (rfc2047-decode-region): Don't unfold. Let gnus-article-treat-unfold-headers do it. -2002-02-07 Matt Armstrong . +2002-02-07 Matt Armstrong * message.el (message-mode): Set local-abbrev-table. @@ -13226,7 +13226,7 @@ (gnus-topic-catchup-articles): New function. Suggested by Robin S. Socha . -2001-09-27 11:00:00 Gerd M,Avllmann . +2001-09-27 11:00:00 Gerd M,Avllmann * gnus-ems.el (gnus-article-display-xface): Insert xface after previous ones. @@ -13977,7 +13977,7 @@ * mml.el (mml-menu): Changed name to "Attachments". * mm-decode.el (mm-destroy-postponed-undisplay-list): Only message - when there is something to detroy. + when there is something to destroy. 2001-05-21 17:11:46 Lars Magne Ingebrigtsen diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index d57b61dac8..129609df10 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -956,7 +956,7 @@ This is a no-op in XEmacs." (defun mm-charset-after (&optional pos) "Return charset of a character in current buffer at position POS. -If POS is nil, it defauls to the current point. +If POS is nil, it defaults to the current point. If POS is out of range, the value is nil. If the charset is `composition', return the actual one." (let ((char (char-after pos)) charset) diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 6888056704..58a08f4506 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1572,7 +1572,7 @@ of `ctext-non-standard-encodings-alist'.") ;; character in CHARSET is encoded using extended segment. In the ;; latter case, a character in CHARSET is encoded using normal ISO2022 ;; designation sequence. If a character is not in any of CHARSETs, it -;; is encoded using UTF-8 encoding extention. +;; is encoded using UTF-8 encoding extension. (defun ctext-non-standard-encodings-table () (let* ((table (append ctext-non-standard-encodings @@ -1656,7 +1656,7 @@ in-place." (insert 2))) ;; Encode this range as characters in CHARSET. (put-text-property last-pos (point) 'charset charset)) - ;; Encode this range using UTF-8 encoding extention. + ;; Encode this range using UTF-8 encoding extension. (encode-coding-region last-pos (point) 'mule-utf-8) (save-excursion (goto-char last-pos) diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index eaac5c17cd..43d4361763 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -2261,9 +2261,9 @@ the counts." (while (string-match feedmail-queue-slug-suspect-regexp slug) (setq slug (replace-match "-" nil nil slug))) ;; collapse multiple hyphens to one (while (string-match "--+" slug) (setq slug (replace-match "-" nil nil slug))) - ;; for tidyness, peel off leading hyphens + ;; for tidiness, peel off leading hyphens (if (string-match "^-*" slug) (setq slug (replace-match "" nil nil slug))) - ;; for tidyness, peel off trailing hyphens + ;; for tidiness, peel off trailing hyphens (if (string-match "-*$" slug) (setq slug (replace-match "" nil nil slug))) slug ) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index a8efe10ec7..e2bbdd0a6b 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4504,7 +4504,7 @@ With prefix argument N moves forward N messages with these labels. ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "6296f0170a37670c49a88a1b92d78187") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "3aa9747bf925bd2cd450f4b1f9c7cd03") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 026b03e350..bc38b10124 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -975,7 +975,7 @@ The list is in preference order.") (subst-char-in-region (point-min) (point-max) 9 ? t) ; tab --> blank (goto-char (point-min)) - ;; tidyness in case hook is not robust when it looks at this + ;; tidiness in case hook is not robust when it looks at this (while (re-search-forward "[ \t]+" header-end t) (replace-match " ")) (goto-char (point-min)) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index ca179a78b6..802f2fab74 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,8 @@ +2011-11-20 Juanma Barranquero + + * mh-utils.el (mh-folder-list): Fix typo. + (mh-children-p): Move part of the docstring to a comment. + 2011-11-16 Juanma Barranquero * mh-search.el (mh-pick-parse-search-buffer): Fix typo. diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index b12c47e7f1..d35d7d4c67 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -10944,7 +10944,7 @@ 2001-11-21 Peter S Galbraith * mh-comp.el (mh-reply-show-message-p): The setting of this - variable determines whether the MH show-buffer is diplayed with + variable determines whether the MH show-buffer is displayed with the current message when using mh-reply without a prefix argument. Set it to nil if you already include the message automatically in your draft using "repl: -filter repl.filter" in your ~/.mh_profile diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el index 6132af17da..00a03c87ed 100644 --- a/lisp/mh-e/mh-utils.el +++ b/lisp/mh-e/mh-utils.el @@ -484,18 +484,18 @@ no effect." folder) (defmacro mh-children-p (folder) - "Return t if FOLDER from sub-folders cache has children. -The car of folder is the name, and the cdr is either t or some -sort of count that I do not understand. It's too small to be the -number of messages in the sub-folders and too large to be the -number of sub-folders. XXX" + "Return t if FOLDER from sub-folders cache has children." +;; The car of folder is the name, and the cdr is either t or some +;; sort of count that I do not understand. It's too small to be the +;; number of messages in the sub-folders and too large to be the +;; number of sub-folders. XXX" `(if (cdr ,folder) t nil)) ;;;###mh-autoload (defun mh-folder-list (folder) - "Return FOLDER and its descendents. + "Return FOLDER and its descendants. FOLDER may have a + prefix. Returns a list of strings without the + prefix. If FOLDER is nil, then all folders are considered. For example, if your Mail directory only contains the folders +inbox, diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el index fbf0e15924..9701b8dc6e 100644 --- a/lisp/nxml/xsd-regexp.el +++ b/lisp/nxml/xsd-regexp.el @@ -49,7 +49,7 @@ ;; Unicode character means a character in one of the Mule charsets ;; ascii, latin-iso8859-1, mule-unicode-0100-24ff, ;; mule-unicode-2500-33ff, mule-unicode-e000-ffff, eight-bit-control -;; or a character translateable to such a character (i.e a character +;; or a character translatable to such a character (i.e a character ;; for which `encode-char' will return non-nil). ;; ;; Using unify-8859-on-decoding-mode is probably a good idea here diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 477daf7553..4f4fbf0f93 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,7 @@ +2011-11-20 Juanma Barranquero + + * org-table.el (org-table-line-to-dline): Fix typo. + 2011-11-16 Juanma Barranquero * org-agenda.el (org-agenda-add-entry-text-descriptive-links) @@ -6185,8 +6189,8 @@ 2010-11-11 Carsten Dominik * org-indent.el (org-indent-add-properties): - Use `with-silent-modificatons'. - (org-indent-remove-properties): Use `with-silent-modificatons'. + Use `with-silent-modifications'. + (org-indent-remove-properties): Use `with-silent-modifications'. 2010-11-11 Carsten Dominik @@ -13637,7 +13641,7 @@ 2009-08-06 Carsten Dominik * org.el (org-remove-empty-overlays-at) - (org-clean-visibility-after-subtree-move): New functons. + (org-clean-visibility-after-subtree-move): New functions. (org-move-subtree-down): Simplify cleanup of display. 2009-08-06 Carsten Dominik @@ -15201,7 +15205,7 @@ * org-exp.el (org-export-as-html): Use IDs in the correct way. - * org.el (org-uuidgen-p): New funtion. + * org.el (org-uuidgen-p): New function. * org-agenda.el (org-agenda-fontify-priorities): New default value `cookies'. @@ -17067,7 +17071,7 @@ (org-file-apps-defaults-macosx): Let PostScript files be opened by preview. (org-time-stamp-inactive): Call `org-time-stamp'. - (org-time-stamp): New argument `inactive'. Also edit inacive + (org-time-stamp): New argument `inactive'. Also edit inactive stamps. Convert time stamp type. (org-open-file): Interpret the `default' value for the `command' in `org-file-apps'. diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index 7272384542..92c14f4cd5 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -1302,7 +1302,7 @@ However, when FORCE is non-nil, create new columns if necessary." (defun org-table-line-to-dline (line &optional above) "Turn a buffer line number into a data line number. If there is no data line in this line, return nil. -If there is no matching dline (most likely te refrence was a hline), the +If there is no matching dline (most likely the reference was a hline), the first dline below it is used. When ABOVE is non-nil, the one above is used." (catch 'exit (let ((ll (length org-table-dlines)) diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 76dfb3c7a2..4a6344727b 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -221,7 +221,7 @@ the evaluated constant value at compile time." ;; ;; OPS either has the structure of `c-operators', is a single ;; group in `c-operators', or is a plain list of operators. - ;; + ;; ;; OPGROUP-FILTER specifies how to select the operator groups. It ;; can be t to choose all groups, a list of group type symbols ;; (such as 'prefix) to accept, or a function which will be called diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el index eea822328f..823304bd25 100644 --- a/lisp/progmodes/cfengine.el +++ b/lisp/progmodes/cfengine.el @@ -24,7 +24,7 @@ ;;; Commentary: ;; Provides support for editing GNU Cfengine files, including -;; font-locking, Imenu and indention, but with no special keybindings. +;; font-locking, Imenu and indentation, but with no special keybindings. ;; The CFEngine 3.x support doesn't have Imenu support but patches are ;; welcome. diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el index 211c856f9b..0516aca8d2 100644 --- a/lisp/progmodes/cwarn.el +++ b/lisp/progmodes/cwarn.el @@ -210,16 +210,16 @@ This function is designed to be added to hooks, for example: (defun cwarn-is-enabled (mode &optional feature) "Non-nil if CWarn FEATURE is enabled for MODE. -feature is an atom representing one construction to highlight. +FEATURE is an atom representing one construction to highlight. Check if any feature is enabled for MODE if no feature is specified. The valid features are described by the variable `cwarn-font-lock-feature-keywords-alist'." - (let ((mode-configuraion (assq mode cwarn-configuration))) - (and mode-configuraion + (let ((mode-configuration (assq mode cwarn-configuration))) + (and mode-configuration (or (null feature) - (let ((list-or-t (nth 1 mode-configuraion))) + (let ((list-or-t (nth 1 mode-configuration))) (or (eq list-or-t t) (if (eq (car-safe list-or-t) 'not) (not (memq feature (cdr list-or-t))) @@ -235,7 +235,7 @@ The valid features are described by the variable (eq (char-after) ?#))) (defun cwarn-font-lock-keywords (addp) - "Install/Remove keywords into current buffer. + "Install/remove keywords into current buffer. If ADDP is non-nil, install else remove." (dolist (pair cwarn-font-lock-feature-keywords-alist) (let ((feature (car pair)) diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el index 204b6a91b0..7b63575195 100644 --- a/lisp/progmodes/ebnf-dtd.el +++ b/lisp/progmodes/ebnf-dtd.el @@ -515,7 +515,7 @@ ;; ----- ;; ;; At moment, only the `F42 from the termcap/terminfo information. On ;; a PC-style keyboard these keys correspond to ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-. The - ;; code here subsitutes the corresponding definitions in + ;; code here substitutes the corresponding definitions in ;; function-key-map. This substitution is needed because if a key ;; definition if found in function-key-map, there are no further ;; lookups in other keymaps. diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index d13437f4c7..e7f2e3f139 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -2338,7 +2338,7 @@ Octant are numbered 1--8, anti-clockwise as: 5 6)))) -;; Some inline funtions for creating, setting and reading +;; Some inline functions for creating, setting and reading ;; members of a coordinate ;; diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index 7de15c66ce..ff6ffffc38 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -361,7 +361,7 @@ will display info in the echo area." "View location in a LaTeX document which cites the BibTeX entry at point. Since BibTeX files can be used by many LaTeX documents, this function prompts upon first use for a buffer in RefTeX mode. To reset this -link to a document, call the function with with a prefix arg. +link to a document, call the function with a prefix arg. Calling this function several times find successive citation locations." (interactive "P") (when arg diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index 0b263e9c66..0fc7ba96fb 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -299,7 +299,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ids))) (defun vc-mtn-revision-completion-table (files) - ;; TODO: Implement completion for for selectors + ;; TODO: Implement completion for selectors ;; TODO: Implement completion for composite selectors. (lexical-let ((files files)) ;; What about using `files'?!? --Stef diff --git a/lisp/xml.el b/lisp/xml.el index 68aa5f4db6..478872dd92 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -756,7 +756,7 @@ This follows the rule [28] in the XML specifications." ;;******************************************************************* (defun xml-substitute-special (string) - "Return STRING, after subsituting entity references." + "Return STRING, after substituting entity references." ;; This originally made repeated passes through the string from the ;; beginning, which isn't correct, since then either "&amp;" or ;; "&amp;" won't DTRT. diff --git a/src/ChangeLog b/src/ChangeLog index 7accd0d5ee..6cb461b0ea 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-11-20 Juanma Barranquero + + * casetab.c (Fset_case_table): + * charset.c (Fcharset_after): Fix typos. + 2011-11-20 Paul Eggert Standardize on VIRT_ADDR_VARIES behavior (Bug#10042). diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index 37a75c3c99..85f6c00eaa 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -6604,9 +6604,9 @@ * keyboard.c (input_available_signal): Declare. (kbd_buffer_nr_stored): New function. (kbd_buffer_store_event_hold): If kbd_buffer_nr_stored returns - more than KBD_BUFFER_SIZE/2, stop reding input (Bug#6571). + more than KBD_BUFFER_SIZE/2, stop reading input (Bug#6571). (kbd_buffer_get_event): If input is suspended and kbd_buffer_nr_stored - returns less than KBD_BUFFER_SIZE/4, resume reding input (Bug#6571). + returns less than KBD_BUFFER_SIZE/4, resume reading input (Bug#6571). (tty_read_avail_input): If input is on hold, return. Don't read more that free slots in kbd_buffer (Bug#6571). @@ -7683,7 +7683,7 @@ 2010-05-20 Juri Linkov - * fileio.c (Fdelete_file): Change interative spec to use + * fileio.c (Fdelete_file): Change interactive spec to use `read-file-name' like in `find-file-read-args' where the default value is `default-directory' instead of `buffer-file-name'. http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00533.html @@ -11923,7 +11923,7 @@ * process.c (status_notify): Don't perform redisplay. (Fdelete_process, list_processes_1, process_send_signal): - Expliticly perform redisplay. + Explicitly perform redisplay. (wait_reading_process_output): Always check process status, but don't perform redisplay unless DO_DISPLAY is non-zero (Bug#2930). @@ -25081,7 +25081,7 @@ * keymap.c (describe_vector): Handle default value of a char table. * fontset.c (fontset_face): Handle fallback fonts correctly. - (Ffontset_info): Return infomation about fallback fonts. + (Ffontset_info): Return information about fallback fonts. 2008-02-01 Kenichi Handa @@ -30892,7 +30892,7 @@ 2007-06-14 Jason Rumney * w32.c (get_process_times_fn): New function pointer. - (globals_of_w32): Intialize it if present in kernel32.dll. + (globals_of_w32): Initialize it if present in kernel32.dll. (w32_get_internal_run_time): New function. * editfns.c (Fget_internal_run_time) [WINDOWSNT]: Use it. diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index fb3ec17205..cbf867829c 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -6089,7 +6089,7 @@ shrink below the minimum, this code would only try to delete it if it had a parent. Well, even if the window doesn't have a parent, you want Fdelete_window to signal an error, since you're trying to - resize one of the undeleteable windows into nothingness. So call + resize one of the undeletable windows into nothingness. So call Fdelete_window even if the window doesn't have a parent. * window.c (MINSIZE): Add kludge so that the minibuffer is always diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index ec4c27a4d9..fc97acdeb1 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 @@ -5774,7 +5774,7 @@ (w32_initialize): Set input mode. Use w32_msg_worker instead of windows_msg_worker. Dynamically link proportional scroll bar - functions and intialize proportional scroll bar variables. + functions and initialize proportional scroll bar variables. (syms_of_w32term): DEFVAR new variables. * w32term.h (w32_output): New fields menubar_widget, menubar_active, diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index bd51e55cdc..e21af17657 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -2723,7 +2723,7 @@ (CURSOR_FACE_ID, MOUSE_FACE_ID): New. * xfaces.c (Qscroll_bar, Qcursor, Qborder, Qmouse): New. - (syms_of_xfaces): Intialize new symbols. + (syms_of_xfaces): Initialize new symbols. * fns.c (Fmakehash): Take one argument, test, make all the rest keyword arguments. @@ -9227,7 +9227,7 @@ * xdisp.c (store_frame_title_char): New function to store a single character for the frame title with re-allocation of frame_title_buf. - (init_xdisp): Intialize frame_title_.* variables to null. + (init_xdisp): Initialize frame_title_.* variables to null. * dispnew.c (quit_error_check): Removed. @@ -12321,7 +12321,7 @@ (enumfont_t): Remove unused head pointer. (enum_font_cb2): Dereference elfLogFont. (w32_list_bdf_fonts): New function. - (w32_list_fonts): Use one_w32_dispay_info instead of insisting on + (w32_list_fonts): Use one_w32_display_info instead of insisting on valid frame. Remove MessageBox. Support BDF fonts. (Fw32_find_bdf_fonts): New function. (syms_of_w32fns): Add Vw32_bdf_filename_alist and diff --git a/src/bidi.c b/src/bidi.c index e688637a40..e0337927ec 100644 --- a/src/bidi.c +++ b/src/bidi.c @@ -51,7 +51,7 @@ along with GNU Emacs. If not, see . */ A note about references to UAX#9 rules: if the reference says something like "X9/Retaining", it means that you need to refer to - rule X9 and to its modifications decribed in the "Implementation + rule X9 and to its modifications described in the "Implementation Notes" section of UAX#9, under "Retaining Format Codes". */ #include diff --git a/src/buffer.c b/src/buffer.c index 8bc6e37732..a327a1650f 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -4400,7 +4400,7 @@ static int mmap_fd_1; static int mmap_page_size; -/* 1 means mmap has been intialized. */ +/* 1 means mmap has been initialized. */ static int mmap_initialized_p; diff --git a/src/casetab.c b/src/casetab.c index 3433b313c0..575a48ed14 100644 --- a/src/casetab.c +++ b/src/casetab.c @@ -95,7 +95,7 @@ CANONICALIZE maps each character to a canonical equivalent; any two characters that are related by case-conversion have the same canonical equivalent character; it may be nil, in which case it is deduced from DOWNCASE and UPCASE. -EQUIVALENCES is a map that cyclicly permutes each equivalence class +EQUIVALENCES is a map that cyclically permutes each equivalence class (of characters with the same canonical equivalent); it may be nil, in which case it is deduced from CANONICALIZE. */) (Lisp_Object table) diff --git a/src/charset.c b/src/charset.c index 266753f9d0..b6921a762b 100644 --- a/src/charset.c +++ b/src/charset.c @@ -2082,7 +2082,7 @@ that case, find the charset from what supported by that coding system. */) DEFUN ("charset-after", Fcharset_after, Scharset_after, 0, 1, 0, doc: /* Return charset of a character in the current buffer at position POS. -If POS is nil, it defauls to the current point. +If POS is nil, it defaults to the current point. If POS is out of range, the value is nil. */) (Lisp_Object pos) { diff --git a/src/dispextern.h b/src/dispextern.h index 486aa4f7a4..3225c1eb46 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2649,11 +2649,11 @@ struct redisplay_interface void (*flush_display) (struct frame *f); /* Flush the display of frame F if non-NULL. This is called - during redisplay, and should be NULL on systems which flushes + during redisplay, and should be NULL on systems which flush automatically before reading input. */ void (*flush_display_optional) (struct frame *f); - /* Clear the mouse hightlight in window W, if there is any. */ + /* Clear the mouse highlight in window W, if there is any. */ void (*clear_window_mouse_face) (struct window *w); /* Set *LEFT and *RIGHT to the left and right overhang of GLYPH on diff --git a/src/frame.c b/src/frame.c index 984651ae9c..039ed6543c 100644 --- a/src/frame.c +++ b/src/frame.c @@ -374,7 +374,7 @@ make_frame (int mini_p) /* Use set_window_buffer, not Fset_window_buffer, and don't let hooks be run by it. The reason is that the whole frame/window - arrangement is not yet fully intialized at this point. Windows + arrangement is not yet fully initialized at this point. Windows don't have the right size, glyph matrices aren't initialized etc. Running Lisp functions at this point surely ends in a SEGV. */ @@ -1712,7 +1712,7 @@ If omitted, FRAME defaults to the currently selected frame. */) } /* Update the display_time slot of the buffers shown in WINDOW - and all its descendents. */ + and all its descendants. */ static void make_frame_visible_1 (Lisp_Object window) diff --git a/src/search.c b/src/search.c index a3b4e1dcbc..a6a0fddb13 100644 --- a/src/search.c +++ b/src/search.c @@ -1892,7 +1892,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat, || CHAR_HEAD_P (cursor[1])) && (CHAR_HEAD_P (cursor[0]) /* Check if this is the last byte of - a translable character. */ + a translatable character. */ || (translate_prev_byte1 == cursor[-1] && (CHAR_HEAD_P (translate_prev_byte1) || (translate_prev_byte2 == cursor[-2] @@ -1991,7 +1991,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat, || CHAR_HEAD_P (ptr[1])) && (CHAR_HEAD_P (ptr[0]) /* Check if this is the last byte of a - translable character. */ + translatable character. */ || (translate_prev_byte1 == ptr[-1] && (CHAR_HEAD_P (translate_prev_byte1) || (translate_prev_byte2 == ptr[-2] diff --git a/src/xterm.c b/src/xterm.c index 0e529714eb..de7703c2ec 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8765,7 +8765,7 @@ x_wait_for_event (struct frame *f, int eventtype) pending_event_wait.f = f; pending_event_wait.eventtype = eventtype; - /* Set timeout to 0.1 second. Hopefully not noticable. + /* Set timeout to 0.1 second. Hopefully not noticeable. Maybe it should be configurable. */ EMACS_SET_SECS_USECS (tmo, 0, 100000); EMACS_GET_TIME (tmo_at); diff --git a/test/ChangeLog b/test/ChangeLog index 9afed6f5f9..80c26a9cf4 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2011-11-20 Juanma Barranquero + + * cedet/semantic-utest-c.el (semantic-utest-c-comparisons): Fix typo. + 2011-11-16 Juanma Barranquero * automated/icalendar-tests.el (icalendar-tests--get-ical-event) diff --git a/test/cedet/semantic-utest-c.el b/test/cedet/semantic-utest-c.el index 946a818e70..3fbd180290 100644 --- a/test/cedet/semantic-utest-c.el +++ b/test/cedet/semantic-utest-c.el @@ -28,7 +28,7 @@ (defvar semantic-utest-c-comparisons '( ("testsppreplace.c" . "testsppreplaced.c") ) - "List of files to parse and compare against eachother.") + "List of files to parse and compare against each other.") ;;; Code: ;;;###autoload -- cgit v1.2.3 From e47695319fc758da7ff07d7084386258b6c8b677 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 26 Nov 2011 20:43:11 -0800 Subject: Spelling fixes. --- admin/charsets/cp51932.awk | 2 +- doc/emacs/building.texi | 2 +- doc/lispref/spellfile | 2 - doc/misc/calc.texi | 2 +- doc/misc/eieio.texi | 2 +- doc/misc/gnus.texi | 2 +- doc/misc/idlwave.texi | 184 ++++++++++++++++++++-------------------- etc/NEWS.1-17 | 2 +- etc/NEWS.22 | 2 +- etc/NEWS.23 | 2 +- etc/TODO | 2 +- etc/e/eterm-color.ti | 2 +- lisp/ChangeLog | 2 +- lisp/ChangeLog.10 | 6 +- lisp/ChangeLog.12 | 4 +- lisp/ChangeLog.5 | 2 +- lisp/ChangeLog.7 | 4 +- lisp/ChangeLog.8 | 2 +- lisp/allout.el | 2 +- lisp/bookmark.el | 2 +- lisp/cedet/ede/autoconf-edit.el | 2 +- lisp/cedet/ede/proj.el | 4 +- lisp/cedet/semantic/analyze.el | 2 +- lisp/composite.el | 2 +- lisp/dframe.el | 2 +- lisp/emacs-lisp/byte-opt.el | 2 +- lisp/emacs-lisp/bytecomp.el | 4 +- lisp/emacs-lisp/cconv.el | 2 +- lisp/emacs-lisp/smie.el | 2 +- lisp/filesets.el | 4 +- lisp/follow.el | 2 +- lisp/gnus/ChangeLog | 4 +- lisp/gnus/ChangeLog.1 | 2 +- lisp/gnus/ChangeLog.2 | 6 +- lisp/gnus/mm-bodies.el | 4 +- lisp/gnus/mml.el | 2 +- lisp/gnus/nnml.el | 2 +- lisp/gnus/pop3.el | 6 +- lisp/ido.el | 4 +- lisp/international/cp51932.el | 3 +- lisp/ldefs-boot.el | 6 +- lisp/man.el | 4 +- lisp/mh-e/ChangeLog.1 | 2 +- lisp/mpc.el | 2 +- lisp/net/ange-ftp.el | 2 +- lisp/nxml/rng-valid.el | 2 +- lisp/org/org-agenda.el | 2 +- lisp/play/gomoku.el | 2 +- lisp/play/landmark.el | 2 +- lisp/progmodes/ada-mode.el | 4 +- lisp/progmodes/cc-langs.el | 2 +- lisp/progmodes/cperl-mode.el | 4 +- lisp/progmodes/f90.el | 2 +- lisp/progmodes/fortran.el | 2 +- lisp/progmodes/gud.el | 2 +- lisp/progmodes/idlw-shell.el | 2 +- lisp/progmodes/sql.el | 12 +-- lisp/replace.el | 2 +- lisp/speedbar.el | 2 +- lisp/term.el | 4 +- lisp/term/common-win.el | 4 +- lisp/textmodes/conf-mode.el | 6 +- lisp/textmodes/ispell.el | 5 +- lisp/textmodes/reftex-sel.el | 4 +- lisp/textmodes/rst.el | 2 +- lisp/textmodes/tex-mode.el | 2 +- lisp/url/ChangeLog | 3 +- lisp/vc/ediff-help.el | 10 +-- lisp/window.el | 4 +- src/ChangeLog.10 | 2 +- src/ChangeLog.11 | 4 +- src/ChangeLog.3 | 2 +- src/ChangeLog.8 | 2 +- src/buffer.c | 4 +- src/charset.c | 4 +- src/dispextern.h | 2 +- src/gtkutil.h | 4 +- src/lisp.h | 4 +- src/lread.c | 2 +- src/nsterm.m | 2 +- src/w32fns.c | 3 +- src/widget.c | 2 +- src/widget.h | 3 +- src/window.c | 4 +- src/xdisp.c | 3 +- src/xfaces.c | 4 +- 86 files changed, 221 insertions(+), 223 deletions(-) (limited to 'src/dispextern.h') diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk index b611def710..c8879b3020 100644 --- a/admin/charsets/cp51932.awk +++ b/admin/charsets/cp51932.awk @@ -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"; } diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index ac62e2d965..9c5b2e7dcd 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -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 diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile index 1f4a690550..e0d77ee054 100644 --- a/doc/lispref/spellfile +++ b/doc/lispref/spellfile @@ -253,7 +253,6 @@ deletable deletion' delq depiction -descendents deselecting destructive' destructively' @@ -299,7 +298,6 @@ excess' exec exitcode expression' -extendible extra' fails' fascist diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index b84212afa7..32311ff5c3 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -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 diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index 7b4945027d..d65c7a15f7 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi @@ -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 diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 3aa923cc34..a1da74710a 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 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 diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 8e17230191..3e13dbb0f2 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -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 "\\[ \t]+\\<" + (idlwave-action-and-binding "\\[ \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. diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 8db283b537..8b861cca87 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 @@ -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. diff --git a/etc/NEWS.22 b/etc/NEWS.22 index c4aeda62c2..87d77cf52f 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 @@ -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. diff --git a/etc/NEWS.23 b/etc/NEWS.23 index 9b8909d794..ec33037acb 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 @@ -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. diff --git a/etc/TODO b/etc/TODO index f9d37c4b96..5acd8734ad 100644 --- a/etc/TODO +++ b/etc/TODO @@ -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 diff --git a/etc/e/eterm-color.ti b/etc/e/eterm-color.ti index 0ddb7ec540..a6ef814990 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, # 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, diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 230e299b7c..32de942b03 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 0d2255ac0a..a1cfaee6ea 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -1837,7 +1837,7 @@ 2003-05-31 Stefan Monnier * 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 * 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 diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 7df2b4b748..8721130ec5 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -15100,7 +15100,7 @@ 2005-12-21 Stefan Monnier * 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 @@ -31734,7 +31734,7 @@ 2005-02-23 Stefan Monnier * 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. diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index b536f7f1b6..b3e92b1a50 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 @@ -2579,7 +2579,7 @@ 1995-03-13 Karl Fogel * 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'. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index df2f5cce23..b9f8de3b59 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -15185,7 +15185,7 @@ 1997-06-16 Dan Nicolaescu * 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. diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index 77ea9fd9d5..cd68520476 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -4294,7 +4294,7 @@ 1999-07-21 Gerd Moellmann - * faces.el (toolbar): Grey default background. + * faces.el (toolbar): Gray default background. (modeline): Ditto. * image.el (image-type-regexps): New. diff --git a/lisp/allout.el b/lisp/allout.el index 47db77f2bb..68330aa538 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 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. diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 51e869e3a2..4d93e01fb2 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 "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'.") diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el index bd4a5a627a..c6545dd901 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'. 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)) diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el index 79022be6a5..a77bb02218 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." (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))) diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el index c275ba96ee..ef09ea13b4 100644 --- a/lisp/cedet/semantic/analyze.el +++ b/lisp/cedet/semantic/analyze.el @@ -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 diff --git a/lisp/composite.el b/lisp/composite.el index 487962ee07..72317ac470 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -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) diff --git a/lisp/dframe.el b/lisp/dframe.el index b1eb2d636b..b4f44e1a30 100644 --- a/lisp/dframe.el +++ b/lisp/dframe.el @@ -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." diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 0630f5f4e4..c9027fb663 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -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. ;; diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 3d593570c4..9aa230cfe9 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -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") diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el index 22db9ddba3..daafd2226e 100644 --- a/lisp/emacs-lisp/cconv.el +++ b/lisp/emacs-lisp/cconv.el @@ -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 diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index d43ba6c0d3..afc8c7faa4 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 (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 diff --git a/lisp/filesets.el b/lisp/filesets.el index 269ee331fb..680a107adf 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 (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))) diff --git a/lisp/follow.el b/lisp/follow.el index 3badb381c5..2273e8920f 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -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. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 39f43bd8e3..7e0d60018c 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -10961,7 +10961,7 @@ 2007-11-14 Denys Duchier (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 @@ -16516,7 +16516,7 @@ 2005-07-01 Katsumi Yamaoka * 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 diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1 index 8d4b1a086d..a2d6d61efd 100644 --- a/lisp/gnus/ChangeLog.1 +++ b/lisp/gnus/ChangeLog.1 @@ -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. diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 952aae28b1..6b11a956a9 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -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 * 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. diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el index 695451ddc4..ee7ba1c193 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." (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. diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index 352fa329e3..8aa5fbff6b 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." "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." diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el index 399008cec1..59e06364f4 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." ;; #### 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))) diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el index ee3e6582e8..0f7a450b30 100644 --- a/lisp/gnus/pop3.el +++ b/lisp/gnus/pop3.el @@ -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 diff --git a/lisp/ido.el b/lisp/ido.el index f425fd5fc6..f2dcba614a 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -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) diff --git a/lisp/international/cp51932.el b/lisp/international/cp51932.el index d4a347d43a..a648926857 100644 --- a/lisp/international/cp51932.el +++ b/lisp/international/cp51932.el @@ -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)) - diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index f6c706fdce..fb1735cf6a 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 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 diff --git a/lisp/man.el b/lisp/man.el index 14fdac4e5d..0d991a76f5 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -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)) diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 1c0f3ff630..871b84dd03 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -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 ;-). diff --git a/lisp/mpc.el b/lisp/mpc.el index 6c2556b1f3..224131623f 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el @@ -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). diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 48502540e2..7ae6912cf8 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -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. diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el index 876e582ed2..9a29e3d4cc 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 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 diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 50761ede7c..2f4617f514 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -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 diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el index 33fcf451eb..ee6b67e610 100644 --- a/lisp/play/gomoku.el +++ b/lisp/play/gomoku.el @@ -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)))) diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el index 8629baf35d..9ef03725c6 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'." 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)))) diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index ad5d5def88..64734420a8 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." ;; 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 "\\")) (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 diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 4a6344727b..37818638d4 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 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")) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 0735953925..13fa310106 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." ;;; 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.") diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index ce04d8b390..95b8d81002 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'.") ["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] diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index e98ca58f3e..2dac46a6d5 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'.") ["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] diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 854cc664b3..406db76487 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." (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.") diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index c35562a9c5..aa46b54d84 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." ;; 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)) diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index af9ab53789..03e095b6bf 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -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) diff --git a/lisp/replace.el b/lisp/replace.el index 4ea3f747ca..a46f62ae13 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -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 diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 30642e8f2f..b8a734784b 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -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))) diff --git a/lisp/term.el b/lisp/term.el index aa76e41f59..484bc36363 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -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) diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el index c13d22dde7..63c8840621 100644 --- a/lisp/term/common-win.el +++ b/lisp/term/common-win.el @@ -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)) diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el index 1127e6a5d2..40d682c3d9 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')." (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).") diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 704fad4fb3..d0967d6374 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -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 diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el index b4e15fd277..f4f10f1d1e 100644 --- a/lisp/textmodes/reftex-sel.el +++ b/lisp/textmodes/reftex-sel.el @@ -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 () diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 81e92487eb..64dffe78d5 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -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." diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index c4892ce572..34bd24fba3 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." ;; 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) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 47f006eebd..48d2caf35f 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -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 @@ -2516,4 +2516,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el index ddd9371b06..ee7837b29a 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 (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 diff --git a/lisp/window.el b/lisp/window.el index 0796b7fa49..35d80e30ee 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -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) diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index 4c0590aa94..42af99ccc5 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -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. diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index 7c027f1cae..7c46dea675 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -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 @@ -31330,7 +31330,7 @@ 2007-05-12 Chong Yidong - * 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). diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 493e8e1ab0..34906e505d 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -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 diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 4c9ecfb4d4..2f3ee45a1a 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -5409,7 +5409,7 @@ 1998-11-10 Gerd Moellmann - * 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 diff --git a/src/buffer.c b/src/buffer.c index f8482c351c..a482493fac 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -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: diff --git a/src/charset.c b/src/charset.c index b6921a762b..3c15f1bee5 100644 --- a/src/charset.c +++ b/src/charset.c @@ -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; diff --git a/src/dispextern.h b/src/dispextern.h index 3225c1eb46..5228a71ba3 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -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. */ diff --git a/src/gtkutil.h b/src/gtkutil.h index 2dfb3a5ed6..7cc2d21f9c 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h @@ -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); diff --git a/src/lisp.h b/src/lisp.h index dcd1167e0a..fa41239a1c 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -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; diff --git a/src/lread.c b/src/lread.c index f1f6f0cbd7..cdbd09d2f8 100644 --- a/src/lread.c +++ b/src/lread.c @@ -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; diff --git a/src/nsterm.m b/src/nsterm.m index b02561442e..5e19a397c3 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -559,7 +559,7 @@ ns_constrain_all_frames (void) { 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]; } diff --git a/src/w32fns.c b/src/w32fns.c index 96b3f69b72..7a17c108d4 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -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. */ diff --git a/src/widget.c b/src/widget.c index 0582718948..181811b836 100644 --- a/src/widget.c +++ b/src/widget.c @@ -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) { diff --git a/src/widget.h b/src/widget.h index f64f188e15..b5b4147b16 100644 --- a/src/widget.h +++ b/src/widget.h @@ -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 */ - diff --git a/src/window.c b/src/window.c index bb2478d78f..af4fad054a 100644 --- a/src/window.c +++ b/src/window.c @@ -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. */ diff --git a/src/xdisp.c b/src/xdisp.c index 921155940b..c9b9b5c5e8 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -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) { diff --git a/src/xfaces.c b/src/xfaces.c index 849ad6bbdf..7e3ce4103d 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -66,7 +66,7 @@ along with GNU Emacs. If not, see . */ 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) -- cgit v1.2.3