From 91af3942e9ab5540b3ab4dde6733bc883dc2abdd Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 14 Nov 2011 15:59:56 -0800 Subject: [PATCH] Spelling fixes. --- admin/README | 3 +- admin/alloc-colors.c | 3 +- admin/grammars/c.by | 2 +- admin/notes/multi-tty | 23 +++-- admin/notes/nextstep | 3 +- doc/emacs/ack.texi | 2 +- doc/emacs/building.texi | 2 +- doc/emacs/macos.texi | 2 +- doc/lispref/processes.texi | 2 +- doc/misc/ChangeLog | 2 +- doc/misc/cc-mode.texi | 78 +++++++-------- doc/misc/eshell.texi | 2 +- doc/misc/gnus-faq.texi | 98 +++++++++---------- doc/misc/gnus.texi | 2 +- doc/misc/org.texi | 4 +- doc/misc/sc.texi | 4 +- doc/misc/semantic.texi | 2 +- doc/misc/tramp.texi | 2 +- etc/ChangeLog | 2 +- etc/NEWS.1-17 | 3 +- etc/NEWS.23 | 2 +- etc/PROBLEMS | 2 +- etc/gnus-tut.txt | 4 +- etc/srecode/wisent.srt | 2 +- etc/themes/manoj-dark-theme.el | 2 +- lisp/ChangeLog.15 | 2 +- lisp/apropos.el | 2 +- lisp/arc-mode.el | 2 +- lisp/cedet/ede.el | 2 +- lisp/cedet/ede/generic.el | 2 +- lisp/cedet/semantic/analyze.el | 2 +- lisp/cedet/semantic/db-find.el | 2 +- lisp/cedet/semantic/decorate.el | 2 +- lisp/cedet/semantic/decorate/include.el | 2 +- lisp/cedet/semantic/ia.el | 4 +- lisp/cedet/semantic/lex-spp.el | 2 +- lisp/cedet/semantic/lex.el | 2 +- lisp/cedet/semantic/scope.el | 2 +- lisp/cedet/srecode/ctxt.el | 2 +- lisp/cedet/srecode/document.el | 4 +- lisp/cedet/srecode/extract.el | 2 +- lisp/cedet/srecode/fields.el | 2 +- lisp/comint.el | 2 +- lisp/desktop.el | 2 +- lisp/dired.el | 2 +- lisp/emacs-lisp/eieio.el | 4 +- lisp/emacs-lisp/eldoc.el | 2 +- lisp/emacs-lisp/rx.el | 2 +- lisp/emulation/crisp.el | 2 +- lisp/erc/erc-autoaway.el | 3 +- lisp/eshell/esh-cmd.el | 2 +- lisp/gnus/ChangeLog | 16 +-- lisp/gnus/gnus-art.el | 2 +- lisp/gnus/gnus-diary.el | 2 +- lisp/gnus/gnus-start.el | 2 +- lisp/help-fns.el | 2 +- lisp/info.el | 2 +- lisp/isearch.el | 2 +- lisp/language/ethio-util.el | 2 +- lisp/language/lao-util.el | 2 +- lisp/ldefs-boot.el | 2 +- lisp/mail/feedmail.el | 2 +- lisp/mh-e/mh-alias.el | 2 +- lisp/net/quickurl.el | 2 +- lisp/net/tramp-sh.el | 2 +- lisp/net/zeroconf.el | 2 +- lisp/obsolete/iso-acc.el | 2 +- lisp/org/ChangeLog | 8 +- lisp/org/org-beamer.el | 2 +- lisp/org/org-ctags.el | 8 +- lisp/org/org-footnote.el | 2 +- lisp/org/org-publish.el | 4 +- lisp/org/org.el | 2 +- lisp/play/5x5.el | 6 +- lisp/progmodes/ada-xref.el | 2 +- lisp/progmodes/cc-engine.el | 16 +-- lisp/progmodes/cc-vars.el | 2 +- lisp/progmodes/cperl-mode.el | 2 +- lisp/progmodes/fortran.el | 2 +- lisp/progmodes/gdb-mi.el | 4 +- lisp/progmodes/gud.el | 2 +- lisp/progmodes/meta-mode.el | 2 +- lisp/progmodes/prolog.el | 2 +- lisp/progmodes/sql.el | 18 ++-- lisp/simple.el | 2 +- lisp/tar-mode.el | 2 +- lisp/textmodes/artist.el | 2 +- lisp/textmodes/reftex-parse.el | 2 +- lisp/textmodes/reftex-toc.el | 4 +- lisp/textmodes/reftex.el | 4 +- lisp/textmodes/remember.el | 2 +- lisp/textmodes/rst.el | 2 +- lisp/vc/ediff-wind.el | 2 +- lisp/vc/vc-rcs.el | 2 +- lisp/whitespace.el | 2 +- lisp/windmove.el | 2 +- lisp/xml.el | 2 +- src/alloc.c | 2 +- src/bytecode.c | 2 +- src/coding.h | 2 +- src/emacs.c | 2 +- src/font.c | 2 +- src/image.c | 2 +- src/indent.c | 2 +- src/keyboard.c | 2 +- src/nsterm.m | 2 +- src/sound.c | 2 +- src/w32fns.c | 2 +- src/w32font.c | 2 +- src/w32menu.c | 2 +- src/w32term.c | 2 +- test/indent/octave.m | 166 ++++++++++++++++---------------- 112 files changed, 329 insertions(+), 337 deletions(-) diff --git a/admin/README b/admin/README index 4dd1705fe74..10a8f2244fc 100644 --- a/admin/README +++ b/admin/README @@ -18,7 +18,7 @@ Living list of activities that must be completed before the next release. ** make-tarball.txt -Instructions to create pretest or release tarballs, annoucements, etc. +Instructions to create pretest or release tarballs, announcements, etc. ** admin.el @@ -88,4 +88,3 @@ Local variables: mode: outline paragraph-separate: "[ ]*$" end: - diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index e09ddd62b97..b3ea8af9d70 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c @@ -40,7 +40,7 @@ void usage (const char *progname) { fprintf (stderr, "Usage %s options\n", progname); - fprintf (stderr, "-n NCOLORS allcoate NCOLORS colors\n"); + fprintf (stderr, "-n NCOLORS allocate NCOLORS colors\n"); exit (1); } @@ -111,4 +111,3 @@ main (int argc, char **argv) XCloseDisplay (dpy); return 0; } - diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 9fbb6592b75..8c97261debd 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by @@ -1105,7 +1105,7 @@ fun-or-proto-end ( t ) | semantic-list ( nil ) - ;; Here is an anoying feature of C++ pure virtual methods + ;; Here is an annoying feature of C++ pure virtual methods | EQUAL ZERO SEMICOLON ( :pure-virtual-flag ) | fun-try-end diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 85babb903b9..410e3aa8614 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -160,7 +160,7 @@ I use the following two bash scripts to handle my Emacs sessions: name="$1" shift - + if [ -z "$name" ]; then echo "Usage: connect_emacs ..." >&2 exit 1 @@ -184,7 +184,7 @@ screendir="/var/run/screen/S-$USER" serverdir="/tmp/emacs$UID" emacs=/usr/bin/emacs-multi-tty # Or wherever you installed your multi-tty Emacs -if [ -z "$name" ]; then +if [ -z "$name" ]; then echo "Usage: preload_emacs []" >&2 exit 1 fi @@ -314,7 +314,7 @@ THINGS TO DO Emacs with GTK support. If you want to play around with GTK multidisplay (and don't mind core dumps), you can edit src/config.h and define HAVE_GTK_MULTIDISPLAY there by hand. - + http://bugzilla.gnome.org/show_bug.cgi?id=85715 Update: Han reports that GTK+ version 2.8.9 almost gets display @@ -414,7 +414,7 @@ THINGS TO DO sometimes; Emacs does not respond to stimuli from other keyboards. At least a beep or a message would be important, if the single-mode is still required to prevent interference. (Reported by Dan - Nicolaescu.) + Nicolaescu.) Update: selecting a region with the mouse enables single_kboard under X. This is very confusing. @@ -542,7 +542,7 @@ THINGS TO DO are not useful; before starting work on DOS support, revert to pristine, pre-multi-tty versions. -** Fix Windows support. Currently bootstraping works on w32, but Emacs +** Fix Windows support. Currently bootstrapping works on w32, but Emacs crashes on startup and none of the multi-tty features are implemented. Many XXX comments mark things that probably need updating, ChangeLogs will help in spotting changes to X specific @@ -1026,7 +1026,7 @@ DIARY OF CHANGES settings as Emacs itself. This may lead to bogus results in a multi-locale setup. (E.g., while logging in from a remote client with a different locale.) - (Update after new bugreport by Friedrich Delgado Friedrichs: + (Update after new bugreport by Friedrich Delgado Friedrichs: (at least) the structs terminal_coding and keyboard_coding in coding.c must be moved to struct display, and the Lisp interface [set-]keyboard-coding-system must be adapted for the change.) @@ -1088,7 +1088,7 @@ DIARY OF CHANGES -- Miles Bader suggests that C-x C-c on an emacsclient frame should only close the frame, not exit the entire Emacs session. Update: see above for a function that does this. Maybe this should be the - new default? + new default? (Done. This is the new default. No complaints so far.) @@ -1131,7 +1131,7 @@ DIARY OF CHANGES from exiting Emacs. (Reported by Mnemonikk on freenode.) (Done, I hope.) - + -- Having {reset,init}_all_sys_modes in set-input-mode breaks arrow keys on non-selected terminals under screen, and sometimes on other @@ -1157,7 +1157,7 @@ DIARY OF CHANGES > Cursor mode. Applications have to send the smkx and rmkx terminfo > strings to switch between the 2 modes. So Emacs (and emacsclient) have > to send smkx when initializing and rmkx when quitting (or on - > suspend). + > suspend). (I think patch-370 fixed this.) @@ -1166,7 +1166,7 @@ DIARY OF CHANGES emacs M-x server-start - + # From another xterm: emacsclient -e '(y-or-n-p "Do you want me to crash? ")' # Notice how the answer ends up in the *scratch* buffer @@ -1205,7 +1205,7 @@ DIARY OF CHANGES it is not recognized correctly. May be related to the bug below. (Seems to have been fixed as a side effect of patch-434. "The bug - below" was the set-input-mode madness.) + below" was the set-input-mode madness.) (Update: this bug was fixed for good in patch-449. It was tracked down to a bug in `read_key_sequence': it failed to reinitialize its @@ -1359,4 +1359,3 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - diff --git a/admin/notes/nextstep b/admin/notes/nextstep index 462101f9abf..cf0ebbc11aa 100644 --- a/admin/notes/nextstep +++ b/admin/notes/nextstep @@ -78,7 +78,7 @@ Text Rendering and Font Handling nsfont.m implements the font driver, responsible for managing fonts and rendering text. Fonts are obtained through NSFontManager. Rendering must be done at a low level due to emacs' fine control over this process, therefore -there are different approachs under Cocoa and GNUstep. Under GNUstep, the +there are different approaches under Cocoa and GNUstep. Under GNUstep, the original NeXT Display PostScript (DPS) APIs are available and used. Under Cocoa, these were removed and Quartz drawing functions replaced them. @@ -156,4 +156,3 @@ EmacsPrefsController : NSObject EmacsSavePanel : NSSavePanel EmacsOpenPanel : NSOpenPanel - utility override for panel notifications - diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index c2242c444dd..6801c7f1e0e 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -206,7 +206,7 @@ use it, Snake and Tetris. @item Andrew Cohen wrote @file{spam-wash.el}, to decode and clean email before -it is analysed for spam. +it is analyzed for spam. @item Georges Brun-Cottan and Stefan Monnier wrote @file{easy-mmode.el}, a diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index cca9e441ed4..ac62e2d9652 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -1251,7 +1251,7 @@ screen Emacs frame. In all-stop mode, whenever your program stops, @emph{all} threads of execution stop. Likewise, whenever you restart the program, all threads start executing. @xref{All-Stop Mode, , All-Stop Mode, gdb, -The GNU debugger}. You can enable this behaviour in Emacs by setting +The GNU debugger}. You can enable this behavior in Emacs by setting @code{gdb-non-stop-setting} to @code{nil} before starting a debugging session. diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index 5a97fa8460b..3e1e67fecd8 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -120,7 +120,7 @@ Useful in this context is the listing of all faces obtained by @key{M-x} @subsection Open files by dragging to an Emacs window -The default behaviour when a user drags files from another application +The default behavior when a user drags files from another application into an Emacs frame is to insert the contents of all the dragged files into the current buffer. To remap the @code{ns-drag-file} event to open the dragged files in the current frame use the following line: diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index d4f8ee9708b..51d91572d0e 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -420,7 +420,7 @@ remote files. Per default, this variable is always set to @code{t}, meaning that a call of @code{process-file} could potentially change any file on a remote host. When set to @code{nil}, a file handler could optimize -its behaviour with respect to remote file attributes caching. +its behavior with respect to remote file attributes caching. This variable should never be changed by @code{setq}. Instead of, it shall be set only by let-binding. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index f06405be625..ec12b77e826 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -2299,7 +2299,7 @@ 2009-08-25 Michael Albinus * dbus.texi (Bus names): Add optional parameter TIMEOUT to dbus-ping. - Describe autostart behaviour of dbus-ping. + Describe autostart behavior of dbus-ping. (Synchronous Methods, Asynchronous Methods): Use English numeric format for timeout values. (Top): Remove footnote saying D-Bus is not enabled by diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 887e3f3c808..a4d377ebdce 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -287,11 +287,11 @@ Configuration Basics Styles -* Built-in Styles:: -* Choosing a Style:: -* Adding Styles:: -* Guessing the Style:: -* File Styles:: +* Built-in Styles:: +* Choosing a Style:: +* Adding Styles:: +* Guessing the Style:: +* File Styles:: Customizing Auto-newlines @@ -311,19 +311,19 @@ Indentation Engine Basics Syntactic Symbols -* Function Symbols:: -* Class Symbols:: -* Conditional Construct Symbols:: -* Switch Statement Symbols:: -* Brace List Symbols:: -* External Scope Symbols:: -* Paren List Symbols:: -* Literal Symbols:: -* Multiline Macro Symbols:: -* Objective-C Method Symbols:: +* Function Symbols:: +* Class Symbols:: +* Conditional Construct Symbols:: +* Switch Statement Symbols:: +* Brace List Symbols:: +* External Scope Symbols:: +* Paren List Symbols:: +* Literal Symbols:: +* Multiline Macro Symbols:: +* Objective-C Method Symbols:: * Java Symbols:: -* Statement Block Symbols:: -* K&R Symbols:: +* Statement Block Symbols:: +* K&R Symbols:: Customizing Indentation @@ -343,8 +343,8 @@ Line-Up Functions Customizing Macros -* Macro Backslashes:: -* Macros with ;:: +* Macro Backslashes:: +* Macros with ;:: @end detailmenu @end menu @@ -912,7 +912,7 @@ construct, should the point start inside it. If @ccmode fails to find function beginnings or ends inside the current declaration scope, it will search the enclosing scopes. If you want @ccmode to recognize functions only at the top level@footnote{this was @ccmode{}'s -behaviour prior to version 5.32.}, set @code{c-defun-tatic} to +behavior prior to version 5.32.}, set @code{c-defun-tatic} to @code{t}. These functions are analogous to the Emacs built-in commands @@ -2537,11 +2537,11 @@ As an alternative to writing a style definition yourself, you can have already formatted piece of your code, @ref{Guessing the Style}. @menu -* Built-in Styles:: -* Choosing a Style:: -* Adding Styles:: -* Guessing the Style:: -* File Styles:: +* Built-in Styles:: +* Choosing a Style:: +* Adding Styles:: +* Guessing the Style:: +* File Styles:: @end menu @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -4266,19 +4266,19 @@ Java. @ref{Java Symbols}. @end table @menu -* Function Symbols:: -* Class Symbols:: -* Conditional Construct Symbols:: -* Switch Statement Symbols:: -* Brace List Symbols:: -* External Scope Symbols:: -* Paren List Symbols:: -* Literal Symbols:: -* Multiline Macro Symbols:: -* Objective-C Method Symbols:: +* Function Symbols:: +* Class Symbols:: +* Conditional Construct Symbols:: +* Switch Statement Symbols:: +* Brace List Symbols:: +* External Scope Symbols:: +* Paren List Symbols:: +* Literal Symbols:: +* Multiline Macro Symbols:: +* Objective-C Method Symbols:: * Java Symbols:: -* Statement Block Symbols:: -* K&R Symbols:: +* Statement Block Symbols:: +* K&R Symbols:: @end menu @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -6653,8 +6653,8 @@ these macros properly, see @ref{Macros with ;}. @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @menu -* Macro Backslashes:: -* Macros with ;:: +* Macro Backslashes:: +* Macros with ;:: @end menu @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 74082bfd3b1..d2705155887 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -379,7 +379,7 @@ eshell/sudo is a compiled Lisp function in `em-unix.el' sudo is an alias, defined as "*sudo $*" @end example -Some of the built-in commands have a special behaviour in Eshell: +Some of the built-in commands have a special behavior in Eshell: @table @code diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index e8e89ed2a30..b5bb75f7284 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -12,7 +12,7 @@ @section Frequently Asked Questions @menu -* FAQ - Changes:: +* FAQ - Changes:: * FAQ - Introduction:: About Gnus and this FAQ. * FAQ 1 - Installation FAQ:: Installation of Gnus. * FAQ 2 - Startup / Group buffer:: Start up questions and the @@ -37,7 +37,7 @@ This is the new Gnus Frequently Asked Questions list. -Please submit features and suggestions to the +Please submit features and suggestions to the @email{ding@@gnus.org, ding list}. @node FAQ - Changes @@ -166,7 +166,7 @@ package system might not be up to date (e.g. Gnus 5.9 bundled with Emacs 21 is outdated). You can get the latest released version of Gnus from @uref{http://www.gnus.org/dist/gnus.tar.gz} -or via anonymous FTP from +or via anonymous FTP from @uref{ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz}. @node FAQ 1-4 @@ -176,7 +176,7 @@ What to do with the tarball now? @subsubheading Answer -Untar it via @samp{tar xvzf gnus.tar.gz} and do the common +Untar it via @samp{tar xvzf gnus.tar.gz} and do the common @samp{./configure; make; make install} circle. (under MS-Windows either get the Cygwin environment from @uref{http://www.cygwin.com} @@ -344,7 +344,7 @@ hit @samp{C-y}. @subsection Getting Messages @menu -* FAQ 3-1:: I just installed Gnus, started it via @samp{M-x gnus} +* FAQ 3-1:: I just installed Gnus, started it via @samp{M-x gnus} but it only says "nntp (news) open error", what to do? * FAQ 3-2:: I'm working under Windows and have no idea what ~/.gnus.el means. @@ -369,8 +369,8 @@ hit @samp{C-y}. @node FAQ 3-1 @subsubheading Question 3.1 -I just installed Gnus, started it via -@samp{M-x gnus} +I just installed Gnus, started it via +@samp{M-x gnus} but it only says "nntp (news) open error", what to do? @subsubheading Answer @@ -396,14 +396,14 @@ I'm working under Windows and have no idea what ~/.gnus.el means. The ~/ means the home directory where Gnus and Emacs look for the configuration files. However, you don't really need to know what this means, it suffices that Emacs knows -what it means :-) You can type -@samp{C-x C-f ~/.gnus.el RET } +what it means :-) You can type +@samp{C-x C-f ~/.gnus.el RET } (yes, with the forward slash, even on Windows), and Emacs will open the right file for you. (It will most likely be new, and thus empty.) However, I'd discourage you from doing so, since the directory Emacs chooses will most certainly not be what -you want, so let's do it the correct way. +you want, so let's do it the correct way. The first thing you've got to do is to create a suitable directory (no blanks in directory name please) e.g. c:\myhome. Then you must set the environment @@ -442,7 +442,7 @@ machine news.yourprovider.net login YourUserName password YourPassword . Make sure that the file isn't readable to others if you work on a OS which is capable of doing so. (Under Unix -say +say @example chmod 600 ~/.authinfo @end example @@ -477,13 +477,13 @@ post on this server as well as I am, what's that? Some providers allow restricted anonymous access and full access only after authorization. To make Gnus send authinfo -to those servers append +to those servers append @example force yes @end example @noindent - + to the line for those servers in ~/.authinfo. @node FAQ 3-6 @@ -774,7 +774,7 @@ When I enter a group, all read messages are gone. How to view them again? @subsubheading Answer -If you enter the group by saying +If you enter the group by saying @samp{RET} in group buffer with point over the group, only unread and ticked messages are loaded. Say @samp{C-u RET} @@ -787,13 +787,13 @@ Loading only unread messages can be annoying if you have threaded view enabled, (setq gnus-fetch-old-headers 'some) @end example @noindent - + in ~/.gnus.el to load enough old articles to prevent teared threads, replace 'some with t to load -all articles (Warning: Both settings enlarge the amount of data which is +all articles (Warning: Both settings enlarge the amount of data which is fetched when you enter a group and slow down the process of entering a group). -If you already use Gnus 5.10, you can say -@samp{/o N} +If you already use Gnus 5.10, you can say +@samp{/o N} In summary buffer to load the last N messages, this feature is not available in 5.8.8 If you don't want all old messages, but the parent of the message you're just reading, @@ -822,9 +822,9 @@ How to view the headers of a message? @subsubheading Answer -Say @samp{t} +Say @samp{t} to show all headers, one more -@samp{t} +@samp{t} hides them again. @node FAQ 4-4 @@ -834,10 +834,10 @@ How to view the raw unformatted message? @subsubheading Answer -Say -@samp{C-u g} +Say +@samp{C-u g} to show the raw message -@samp{g} +@samp{g} returns to normal view. @node FAQ 4-5 @@ -873,7 +873,7 @@ Say @example (eval-after-load "mm-decode" - '(progn + '(progn (add-to-list 'mm-discouraged-alternatives "text/html") (add-to-list 'mm-discouraged-alternatives "text/richtext"))) @end example @@ -1042,7 +1042,7 @@ back ends. Gnus thinks "highest-article-number - lowest-article-number = total-number-of-articles". This works OK for Usenet groups, but if you delete and move many messages in mail groups, this fails. To cure the -symptom, enter the group via @samp{C-u RET} +symptom, enter the group via @samp{C-u RET} (this makes Gnus get all messages), then hit @samp{M P b} to mark all messages and then say @samp{B m name.of.group} to move @@ -1162,7 +1162,7 @@ general rule (regular expression .*) which denotes where articles should go which don't match any other rule. If the folder doesn't exist yet, it will be created as soon as an article lands there. By default the mail will be -send to all groups whose rules match. If you +send to all groups whose rules match. If you don't want that (you probably don't want), say @example @@ -1203,7 +1203,7 @@ from using them): ("Spam" "^CC: .*azzrael@@t-online.invalid") ("Spam" "^X-Mailer-Version: 1.50 BETA") ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.invalid.*") - ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|adress@@two.invalid\\)") + ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|address@@two.invalid\\)") ("Spam" ""))) @end example @noindent @@ -1393,13 +1393,13 @@ You can use ispell.el to spell-check stuff in Emacs. So the first thing to do is to make sure that you've got either @uref{http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell.html, ispell} or @uref{http://aspell.sourceforge.net/, aspell} -installed and in your Path. Then you need +installed and in your Path. Then you need @uref{http://www.kdstevens.com/~stevens/ispell-page.html, ispell.el} -and for on-the-fly spell-checking +and for on-the-fly spell-checking @uref{http://www-sop.inria.fr/members/Manuel.Serrano/flyspell/flyspell.html, flyspell.el}. -Ispell.el is shipped with Emacs and available through the XEmacs package system, -flyspell.el is shipped with Emacs and part of XEmacs text-modes package which is -available through the package system, so there should be no need to install them +Ispell.el is shipped with Emacs and available through the XEmacs package system, +flyspell.el is shipped with Emacs and part of XEmacs text-modes package which is +available through the package system, so there should be no need to install them manually. Ispell.el assumes you use ispell, if you choose aspell say @@ -1408,7 +1408,7 @@ Ispell.el assumes you use ispell, if you choose aspell say (setq ispell-program-name "aspell") @end example @noindent - + in your Emacs configuration file. If you want your outgoing messages to be spell-checked, say @@ -1445,7 +1445,7 @@ Yes, say something like (ispell-change-dictionary "english"))))) @end example @noindent - + in ~/.gnus.el. Change "^de\\." and "deutsch8" to something that suits your needs. @@ -1472,7 +1472,7 @@ cause Gnus to insert the full address for you. See the node "Mail Aliases" in Message (not Gnus) manual for details. -However, what you really want is the Insidious Big Brother +However, what you really want is the Insidious Big Brother Database bbdb. Get it through the XEmacs package system or from @uref{http://bbdb.sourceforge.net/, bbdb's homepage}. Now place the following in ~/.gnus.el, to activate bbdb for Gnus: @@ -1488,7 +1488,7 @@ place them in ~/.emacs: @example (require 'bbdb) -;;If you don't live in Northern America, you should disable the +;;If you don't live in Northern America, you should disable the ;;syntax check for telephone numbers by saying (setq bbdb-north-american-phone-numbers-p nil) ;;Tell bbdb about your email address: @@ -1529,7 +1529,7 @@ X-Face. So fire up some image manipulation program (say Gimp), open the image you want to include, cut out the relevant part, reduce color depth to 1 bit, resize to 48*48 and save as bitmap. Now you should get the compface -package from +package from @uref{ftp://ftp.cs.indiana.edu:/pub/faces/, this site}. and create the actual X-face by saying @@ -1539,7 +1539,7 @@ cat file.face | sed 's/\\/\\\\/g;s/\"/\\\"/g;' > file.face.quoted @end example @noindent -If you can't use compface, there's an online X-face converter at +If you can't use compface, there's an online X-face converter at @uref{http://www.dairiki.org/xface/}. If you use MS Windows, you could also use the WinFace program from @uref{http://www.xs4all.nl/~walterln/winface/}. @@ -1668,7 +1668,7 @@ by saying: @noindent in ~/.gnus.el. If you use Gnus 5.9 or earlier, you can use this -instead (works for newer versions as well): +instead (works for newer versions as well): @example (eval-after-load "message" @@ -1961,12 +1961,12 @@ receives the mail you write from Gnus and sends them when you're online. Let's talk about Unix systems first: For the news part, -the easiest solution is a small nntp server like +the easiest solution is a small nntp server like @uref{http://www.leafnode.org/, Leafnode} or @uref{http://infa.abo.fi/~patrik/sn/, sn}, of course you can also install a full featured news -server like -@uref{http://www.isc.org/products/INN/, inn}. +server like +@uref{http://www.isc.org/products/INN/, inn}. Then you want to fetch your Mail, popular choices are @uref{http://www.catb.org/~esr/fetchmail/, fetchmail} and @uref{http://pyropus.ca/software/getmail/, getmail}. @@ -1978,8 +1978,8 @@ sending part: This can be done with every MTA like @uref{http://www.exim.org/, exim} or @uref{http://www.qmail.org/, qmail}. -On windows boxes I'd vote for -@uref{http://www.tglsoft.de/, Hamster}, +On windows boxes I'd vote for +@uref{http://www.tglsoft.de/, Hamster}, it's a small freeware, open-source program which fetches your mail and news from remote servers and offers them to Gnus (or any other mail and/or news reader) via nntp @@ -2136,7 +2136,7 @@ Which mailing lists and newsgroups are there? @subsubheading Answer There's the newsgroup gnu.emacs.gnus (also available as -@uref{http://dir.gmane.org/gmane.emacs.gnus.user, +@uref{http://dir.gmane.org/gmane.emacs.gnus.user, gmane.emacs.gnus.user}) which deals with general Gnus questions. If you have questions about development versions of Gnus, you should better ask on the ding mailing list, see below. @@ -2149,7 +2149,7 @@ de.comm.software.gnus. The ding mailing list (ding@@gnus.org) deals with development of Gnus. You can read the ding list via NNTP, too under the name -@uref{http://dir.gmane.org/gmane.emacs.gnus.general, +@uref{http://dir.gmane.org/gmane.emacs.gnus.general, gmane.emacs.gnus.general} from news.gmane.org. @node FAQ 8-5 @@ -2160,7 +2160,7 @@ Where to report bugs? @subsubheading Answer Say @samp{M-x gnus-bug}, this will start -a message to the +a message to the @email{bugs@@gnus.org, gnus bug mailing list} including information about your environment which make it easier to help you. @@ -2237,7 +2237,7 @@ building of summary say at the bottom of your ~/.gnus.el, this will make gnus byte-compile things like -gnus-summary-line-format. +gnus-summary-line-format. then you could increase the value of gc-cons-threshold by saying something like @@ -2254,7 +2254,7 @@ recent GNU Emacs, you should say (setq gnus-use-correct-string-widths nil) @end example @noindent - + in ~/.gnus.el (thanks to Jesper harder for the last two suggestions). Finally if you are still using 5.8.8 or 5.9 and experience speed problems with summary diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 545306e4dc7..6d9ffaf17d8 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -18001,7 +18001,7 @@ see the event's date. @code{gnus-diary} provides two supplemental user formats to be used in summary line formats. @code{D} corresponds to a formatted time string for the next occurrence of the event (e.g. ``Sat, Sep 22 01, 12:00''), -while @code{d} corresponds to an approximative remaining time until the +while @code{d} corresponds to an approximate remaining time until the next occurrence of the event (e.g. ``in 6 months, 1 week''). For example, here's how Joe's birthday is displayed in my diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 2a3d99ca7f4..9d164999b7c 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -3883,7 +3883,7 @@ special faces for some of them. This can be done using the variable @end lisp While using a list with face properties as shown for CANCELED @emph{should} -work, this does not aways seem to be the case. If necessary, define a +work, this does not always seem to be the case. If necessary, define a special face and use that. A string is interpreted as a color. The variable @code{org-faces-easy-properties} determines if that color is interpreted as a foreground or a background color. @@ -5664,7 +5664,7 @@ an item: @orgcmd{C-c C-d,org-deadline} Insert @samp{DEADLINE} keyword along with a stamp. The insertion will happen in the line directly following the headline. Any CLOSED timestamp will be -removed. When called with a prefix arg, an existing deadline will be removed +removed. When called with a prefix arg, an existing deadline will be removed from the entry. Depending on the variable @code{org-log-redeadline}@footnote{with corresponding @code{#+STARTUP} keywords @code{logredeadline}, @code{lognoteredeadline}, and @code{nologredeadline}}, a note will be taken when changing an existing diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index 8853192af04..37ccc4045be 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi @@ -56,7 +56,7 @@ developing GNU and promoting software freedom.'' @top Supercite @comment node-name, next, previous, up -@insertcopying +@insertcopying The manual is divided into the following chapters. @@ -1877,7 +1877,7 @@ been continuously added through the comments and suggestions of the Supercite mailing list participants. With version 3, Supercite underwent an almost complete rewrite, -benefitting in a number of ways, including vast improvements in the +benefiting in a number of ways, including vast improvements in the speed of performance, a big reduction in size of the code and in the use of Emacs resources, and a much cleaner and flexible internal architecture. Most of this work was internal and not of very great diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index f6cf7a07ae8..eb59f6d6b94 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -349,7 +349,7 @@ This file also provides support for @code{semanticdb-minor-mode}, which automatically associates files with tables in databases so that tags are @emph{saved} while a buffer is not in memory. -The database and tables both also provide applicate cache information, +The database and tables both also provide applicable cache information, and cache flushing system. The semanticdb search routines use caches to save datastructures that are complex to calculate. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index a4e06ab22f1..0accc6fac43 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -1575,7 +1575,7 @@ password handling. Consider @command{ssh-agent} for @option{ssh}-like methods, or @command{pageant} for @option{plink}-like methods. However, if you cannot apply such native password handling, -@value{tramp} offers altenatives. +@value{tramp} offers alternatives. @anchor{Using an authentication file} diff --git a/etc/ChangeLog b/etc/ChangeLog index 1b1bc3f2abd..1db595b3175 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -375,7 +375,7 @@ 2011-01-04 Jan Moringen - * NEWS: Extended behaviour of dbus-register-{method,property}. + * NEWS: Extended behavior of dbus-register-{method,property}. 2011-01-02 Kenichi Handa diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index e8570cb7c48..d835cd6f33e 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 @@ -1074,7 +1074,7 @@ Another `t' switches back to the usual display. * Rmail commands `a' and `k' set message attributes. `a' adds an attribute and `k' removes one. You specify -the attrbute by name. You can specify either a built-in +the attribute by name. You can specify either a built-in flag such as "deleted" or "filed", or a user-defined keyword (anything not recognized as built-in). @@ -2530,4 +2530,3 @@ along with GNU Emacs. If not, see . Local variables: mode: text end: - diff --git a/etc/NEWS.23 b/etc/NEWS.23 index 182a8a4a008..43c085ad803 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 @@ -2102,7 +2102,7 @@ function to use for searching in `query-replace-regexp', *** New keymap `search-map' bound to `M-s' provides global bindings for search related commands. -*** New keymap `multi-query-replace-map' contains additonal keys bound +*** New keymap `multi-query-replace-map' contains additional keys bound to `automatic-all' and `exit-current' for multi-buffer interactive replacement. *** The variable `inhibit-changing-match-data', if non-nil, prevents diff --git a/etc/PROBLEMS b/etc/PROBLEMS index e85972f0bfd..57a3387ee40 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1250,7 +1250,7 @@ be carried out at the same time: 4) Use lbxproxy on the remote end of the connection. This is an interface to the low bandwidth X extension in most modern X servers, which improves performance dramatically, at the slight expense of correctness - of the X protocol. lbxproxy acheives the performance gain by grouping + of the X protocol. lbxproxy achieves the performance gain by grouping several X requests in one TCP packet and sending them off together, instead of requiring a round-trip for each X request in a separate packet. The switches that seem to work best for emacs are: diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index 80a652ba25f..9132ece533e 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt @@ -188,7 +188,7 @@ remove all hilit code from all the Gnus hooks (`gnus-group-prepare-hook', `gnus-summary-prepare-hook' and `gnus-summary-article-hook'). (Well, at the very least the first two.) Gnus provides various integrated functions for highlighting, -which are both faster and more accurated. +which are both faster and more accurate. There is absolutely no chance, whatsoever, of getting Gnus to work with Emacs 18. It won't even work on Emacsen older than Emacs @@ -288,5 +288,3 @@ me the patches, but one can't have everything. If you have any questions on usage, the "ding@ifi.uio.no" mailing list is where to post the questions. - - diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt index d45392e93dd..b66a17a4be5 100644 --- a/etc/srecode/wisent.srt +++ b/etc/srecode/wisent.srt @@ -55,7 +55,7 @@ goal %% (define-lex wisent-{{TARGETMODE}}-lexer - "Lexical analzer to handle {{TARGETMODE}} buffers." + "Lexical analyzer to handle {{TARGETMODE}} buffers." ;; semantic-lex-newline semantic-lex-ignore-whitespace semantic-lex-ignore-newline diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el index bd6bbaa88a2..55b07e6eaef 100644 --- a/etc/themes/manoj-dark-theme.el +++ b/etc/themes/manoj-dark-theme.el @@ -52,7 +52,7 @@ ;; reading mail/USENET. ;; In the message itself, quoted mail messages from different people -;; are color coordinated, with high contrast beteen citations that are +;; are color coordinated, with high contrast between citations that are ;; close to each other in the heirarchy, so it is less likely that one ;; misunderstands who said what in a long conversation. diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index aa9c9066dc1..e51e10df6a5 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -5815,7 +5815,7 @@ querying the password for. * ibuffer.el (ibuffer-visit-buffer): To mimick list-buffers - behaviour, don't bury the ibuffer buffer when visiting other buffers. + behavior, don't bury the ibuffer buffer when visiting other buffers. 2010-10-08 Chong Yidong diff --git a/lisp/apropos.el b/lisp/apropos.el index 1dfe5cde9ed..9a372f27991 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -1052,7 +1052,7 @@ If non-nil TEXT is a string that will be printed as a heading." ;; omitting any that contain a buffer or a frame. ;; FIXME: Why omit keys that contain buffers and ;; frames? This looks like a bad workaround rather - ;; than a proper fix. Does anybod know what problem + ;; than a proper fix. Does anybody know what problem ;; this is trying to address? --Stef (dolist (key keys) (let ((i 0) diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index e3d1955ded5..4e45383eaec 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -1036,7 +1036,7 @@ using `make-temp-file', and the generated name is returned." (setq archive-file-name-coding-system file-name-coding) (if (and (null - (let (;; We may have to encode file name arguement for + (let (;; We may have to encode the file name argument for ;; external programs. (coding-system-for-write (and enable-multibyte-characters diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index 14f09517b1d..987351a25e0 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el @@ -909,7 +909,7 @@ Optional ROOTRETURN will return the root project for DIR." ;; recomment as we go ;;nil )) - ;; Do nothing if we are buiding an EDE project already + ;; Do nothing if we are building an EDE project already. (ede-constructing nil) ;; Load in the project in question. diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el index b557d703f29..5ed83b39163 100644 --- a/lisp/cedet/ede/generic.el +++ b/lisp/cedet/ede/generic.el @@ -249,7 +249,7 @@ All directories need at least one target.") "EDE Generic Project target for Misc files. All directories need at least one target.") -;;; Automatic target aquisition. +;;; Automatic target acquisition. (defun ede-generic-find-matching-target (class dir targets) "Find a target that is a CLASS and is in DIR in the list of TARGETS." (let ((match nil)) diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el index a61fb6b1cf2..636ac30b166 100644 --- a/lisp/cedet/semantic/analyze.el +++ b/lisp/cedet/semantic/analyze.el @@ -302,7 +302,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error (mapcar 'semantic-tag-type-members tagtype)))) (oset miniscope fullscope rawscope))) - ;; Now analayze the type to remove metatypes. + ;; Now analyze the type to remove metatypes. (or (semantic-analyze-type tmp miniscope) tmp)) (t diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 74c4d8e3788..35aef5d16ef 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -918,7 +918,7 @@ but should be good enough for debugging assertions." result " ") ">") - ;; Longer results should have an abreviated form. + ;; Longer results should have an abbreviated form. (format "#" (semanticdb-find-result-length result) (length result)))) diff --git a/lisp/cedet/semantic/decorate.el b/lisp/cedet/semantic/decorate.el index ee356ad3a9e..4eeac8de141 100644 --- a/lisp/cedet/semantic/decorate.el +++ b/lisp/cedet/semantic/decorate.el @@ -107,7 +107,7 @@ the extent 'intangible' property does not exist." "Hook used in modification hooks to prevent modification. Allows deletion of the entire text. Argument OVERLAY, AFTER, START, END, and LEN are passed in by the system." - ;; Stolen blithly from cpp.el in Emacs 21.1 + ;; Stolen blithely from cpp.el in Emacs 21.1 (if (and (not after) (or (< (semantic-overlay-start overlay) start) (> (semantic-overlay-end overlay) end))) diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index a37f43d177f..e32aca54b0f 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -459,7 +459,7 @@ to add the path to Semantic's search. If this is an include file that belongs to your project, then you may need to update `semanticdb-project-roots' or better yet, use `ede' to manage your project. See the ede manual for projects that will -wrap existing project code for Semantic's benifit. +wrap existing project code for Semantic's benefit. ") (when (or (eq mm 'c++-mode) (eq mm 'c-mode)) diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el index 69b1dba0bcf..3941424e4b5 100644 --- a/lisp/cedet/semantic/ia.el +++ b/lisp/cedet/semantic/ia.el @@ -199,7 +199,7 @@ Completion options are calculated with `semantic-analyze-possible-completions'." ) (if pf (message "%s" (semantic-format-tag-summarize pf nil t)) - (message "No summary info availalble")))) + (message "No summary info available")))) ;;; Variants ;; @@ -245,7 +245,7 @@ Completion options are calculated with `semantic-analyze-possible-completions'." ;; Jump to a destination based on the local context. ;; ;; This shows how to use the analyzer context, and the -;; analyer references objects to choose a good destination. +;; analyzer references objects to choose a good destination. (defun semantic-ia--fast-jump-helper (dest) "Jump to DEST, a Semantic tag. diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index e49968b07e7..5489765dcc8 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -709,7 +709,7 @@ ARGVALUES are values for any arg list, or nil." ;;; Symbol Is Macro ;; -;; An analyser that will push tokens from a macro in place +;; An analyzer that will push tokens from a macro in place ;; of the macro symbol. ;; (defun semantic-lex-spp-anlyzer-do-replace (sym val beg end) diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index d6b8e1a8bf5..a9a5ab586d0 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -1437,7 +1437,7 @@ Return either a paren token or a semantic list token depending on ;;; Comment lexer ;; ;; Predefined lexers that could be used instead of creating new -;; analyers. +;; analyzers. (define-lex semantic-comment-lexer "A simple lexical analyzer that handles comments. diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el index 30c57571599..64e60fae0f2 100644 --- a/lisp/cedet/semantic/scope.el +++ b/lisp/cedet/semantic/scope.el @@ -384,7 +384,7 @@ be found." ;;------------------------------------------------------------ (define-overloadable-function semantic-analyze-scoped-tags (typelist parentlist) - "Return accessable tags when TYPELIST and PARENTLIST is in scope. + "Return accessible tags when TYPELIST and PARENTLIST is in scope. Tags returned are not in the global name space, but are instead scoped inside a class or namespace. Such items can be referenced without use of \"object.function()\" style syntax due to an diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el index cae52428e75..f392379347a 100644 --- a/lisp/cedet/srecode/ctxt.el +++ b/lisp/cedet/srecode/ctxt.el @@ -73,7 +73,7 @@ Some useful context values used by the provided srecode templates are: ) (defun srecode-calculate-nearby-things () - ;; NOTE: May need to add bounes to this FCN + ;; NOTE: May need to add bounds to this FCN "Calculate the CONTEXT type items nearby the current point. Assume that what we want to insert next is based on what is just before point. If there is nothing, then assume it is whatever is diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el index a52cadbfb2c..61cbab19998 100644 --- a/lisp/cedet/srecode/document.el +++ b/lisp/cedet/srecode/document.el @@ -811,8 +811,8 @@ not account for verb parts." (if (string-match (car (car al)) (downcase ts)) (progn (setq newstr (concat newstr (cdr (car al)))) - ;; don't terminate because we may actuall have 2 words - ;; next to eachother we didn't identify before + ;; don't terminate because we may actually have 2 words + ;; next to each other we didn't identify before (setq llow t))) (setq al (cdr al))) (if (not llow) (setq newstr (concat newstr ts))) diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el index 80e6f9d8d1c..d87dc315829 100644 --- a/lisp/cedet/srecode/extract.el +++ b/lisp/cedet/srecode/extract.el @@ -61,7 +61,7 @@ (oset st lastdict dict)) (defmethod srecode-extract-state-set-anchor ((st srecode-extract-state)) - "Reset the achor point on extract state ST." + "Reset the anchor point on extract state ST." (oset st anchor (point))) (defmethod srecode-extract-state-extract ((st srecode-extract-state) diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el index 088781cfb53..d7ca84c1f97 100644 --- a/lisp/cedet/srecode/fields.el +++ b/lisp/cedet/srecode/fields.el @@ -101,7 +101,7 @@ Has virtual :start and :end initializers.") )) ;; Create a temporary overlay now. We have to use an overlay and - ;; not a marker becaues of the in-front insertion rules. The rules + ;; not a marker because of the in-front insertion rules. The rules ;; are backward from what is wanted while typing. (setq olay (make-overlay start end (current-buffer) t nil)) (overlay-put olay 'srecode-init-only t) diff --git a/lisp/comint.el b/lisp/comint.el index b91b82adb21..f25293ff3ac 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -3442,7 +3442,7 @@ Also print a message when redirection is completed." :group 'comint :type 'boolean) -;; Directly analagous to comint-preoutput-filter-functions +;; Directly analogous to comint-preoutput-filter-functions (defvar comint-redirect-filter-functions nil "List of functions to call before inserting redirected process output. Each function gets one argument, a string containing the text received diff --git a/lisp/desktop.el b/lisp/desktop.el index cdc787dfde9..f4991c5bcc6 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1176,7 +1176,7 @@ directory DIRNAME." (setq desktop-buffer-fail-count (1+ desktop-buffer-fail-count)) (setq result nil)) ;; Restore buffer list order with new buffer at end. Don't change - ;; the order for old desktop files (old desktop module behaviour). + ;; the order for old desktop files (old desktop module behavior). (unless (< desktop-file-version 206) (mapc 'bury-buffer buffer-list) (when result (bury-buffer result))) diff --git a/lisp/dired.el b/lisp/dired.el index 4e03d61a06e..90cf610116a 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1025,7 +1025,7 @@ BEG..END is the line where the file info is located." ;; spaces there (and within the filename as well, of course). (save-excursion (let (file file-col other other-col) - ;; Check that there is indeed a file, and that there is anoter adjacent + ;; Check that there is indeed a file, and that there is another adjacent ;; file with which to align, and that additional spaces are needed to ;; align the filenames. (when (and (setq file (progn (goto-char beg) diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 68a3440b179..119424e789c 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -958,7 +958,7 @@ if default value is nil." (progn (eieio-perform-slot-validation-for-default a type value skipnil) ;; Here we have found a :class version of a slot. This - ;; requires a very different aproach. + ;; requires a very different approach. (aset newc class-class-allocation-a (cons a (aref newc class-class-allocation-a))) (aset newc class-class-allocation-doc (cons doc (aref newc class-class-allocation-doc))) (aset newc class-class-allocation-type (cons type (aref newc class-class-allocation-type))) @@ -2563,7 +2563,7 @@ This is usually a symbol that starts with `:'." ;;; ;; We want all objects created by EIEIO to have some default set of -;; behaviours so we can create object utilities, and allow various +;; behaviors so we can create object utilities, and allow various ;; types of error checking. To do this, create the default EIEIO ;; class, and when no parent class is specified, use this as the ;; default. (But don't store it in the other classes as the default, diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 901b6d1bf6a..9822b556f34 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -434,7 +434,7 @@ In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'." nil (list (eldoc-current-symbol) argument-index))))) -;; Move to the beginnig of current sexp. Return the number of nested +;; Move to the beginning of current sexp. Return the number of nested ;; sexp the point was over or after. (defun eldoc-beginning-of-sexp () (let ((parse-sexp-ignore-comments t) diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 56efd142198..2e388d20114 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -393,7 +393,7 @@ FORM is of the form `(and FORM1 ...)'." (defun rx-anything (form) "Match any character." (if (consp form) - (error "rx `anythng' syntax error: %s" form)) + (error "rx `anything' syntax error: %s" form)) (rx-or (list 'or 'not-newline ?\n))) diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el index 010e32857c5..71e607140de 100644 --- a/lisp/emulation/crisp.el +++ b/lisp/emulation/crisp.el @@ -34,7 +34,7 @@ ;; you put (setq crisp-load-scroll-all t) in your .emacs before ;; loading this package. If this feature is enabled, it will bind ;; meta-f1 to the scroll-all mode toggle. The scroll-all package -;; duplicates the scroll-alling feature in CRiSP. +;; duplicates the scroll-all feature in CRiSP. ;; Also, the default keybindings for brief/CRiSP override the M-x ;; key to exit the editor. If you don't like this functionality, you diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el index a15e038dddc..74172b2573f 100644 --- a/lisp/erc/erc-autoaway.el +++ b/lisp/erc/erc-autoaway.el @@ -263,7 +263,7 @@ exceeds `erc-autoaway-idle-seconds'." "Set the away state globally. If NOTEST is specified, do not check to see whether there is an -activer server buffer available." +active server buffer available." ;; Note that the idle timer runs, even when Emacs is inactive. In ;; order to prevent flooding when we connect, we test for an ;; existing process. @@ -284,4 +284,3 @@ activer server buffer available." ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: - diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index 52c8c2ddc20..a7c92084bf9 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -247,7 +247,7 @@ will have to visit the file 'eshell-cmd.el' and run the command '(eshell-named-command eshell-lisp-command eshell-process-identity) - "A list of functions which might return an ansychronous process. + "A list of functions which might return an asynchronous process. If they return a process object, execution of the calling Eshell command will wait for completion (in the background) before finishing the command." diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index fbbf3bad5a8..0a6e3a426a1 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1820,7 +1820,7 @@ 2011-03-15 Lars Magne Ingebrigtsen - * gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if + * gnus-sum.el (gnus-articles-to-read): Revert back to old behavior if we're selecting a group with unread articles. * nnimap.el (nnimap-open-connection-1): Allow `network-only', too. @@ -4557,7 +4557,7 @@ * shr.el (shr-put-image): Use point even if only inserting text. (shr-put-image): Save excursion when inserting alt text on non-graphic - display, so the behaviour is the same when we are on a graphic display. + display, so the behavior is the same when we are on a graphic display. * nnir.el (nnir-run-swish-e): Remove hyrex support. @@ -5178,7 +5178,7 @@ bidning gnus-agent variables. * shr.el (shr-render-td): Use a cache for the table rendering function - to avoid getting an exponential rendering behaviour in nested tables. + to avoid getting an exponential rendering behavior in nested tables. (shr-insert): Rework the line-breaking algorithm. (shr-insert): Don't leave trailing spaces. (shr-insert-table): Also insert empty TDs. @@ -6783,7 +6783,7 @@ * gnus-start.el (gnus-get-unread-articles): Allow the backends to update the group info. This makes the nndraft groups, for instance, go - back to their old behaviour. + back to their old behavior. * gnus-sum.el (gnus-select-newsgroup): Indent. @@ -7175,7 +7175,7 @@ * gnus-agent.el (gnus-agent-auto-agentize-methods): Change the default so that nnimap methods aren't agentized by default. There's apparently - many problems related to agent/imap behaviour. + many problems related to agent/imap behavior. * gnus-art.el (gnus-article-copy-string): New command and key binding. @@ -7220,7 +7220,7 @@ storage than before. * gnus.el (gnus-refer-article-method): Change default to 'current. - When referring an article, the common behaviour is to refer it from the + When referring an article, the common behavior is to refer it from the current select method, not the native select method. The chances of the native select method having the message in question is rather slim these days. @@ -7236,7 +7236,7 @@ * gnus-sum.el (gnus-summary-goto-unread): Change default to nil, so that commands like `d' (and the like) go to the next line in the buffer, instead of the next unread article. I think this is the - behaviour that is most natural for most users. + behavior that is most natural for most users. (gnus-single-article-buffer): Change default to nil, so that people can have as many article buffers open as they have summary buffer. I think this is the most natural way for the groups to behave. @@ -16517,7 +16517,7 @@ 2005-06-16 Arne Jørgensen * smime.el (smime-cert-by-ldap-1): Detect PEM format without - header by looking for magic "MII" at the beginnig. + header by looking for magic "MII" at the beginning. 2005-06-16 Miles Bader diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 0068fbad6e2..a11e9ebf0fa 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -1559,7 +1559,7 @@ node `(gnus)Gravatars' for details." gnus-treat-from-picon gnus-treat-from-gravatar gnus-treat-mail-gravatar) - ;; If there's much decoration, the user might prefer a boundery. + ;; If there's much decoration, the user might prefer a boundary. 'head nil) "Draw a boundary at the end of the headers. diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el index 0b5a7ebf1f9..9f86e74bd99 100644 --- a/lisp/gnus/gnus-diary.el +++ b/lisp/gnus/gnus-diary.el @@ -157,7 +157,7 @@ There are currently two built-in format functions: ;; I just ignore it. ;;;###autoload (defun gnus-user-format-function-d (header) - ;; Returns an aproximative delay string for the next occurrence of this + ;; Return an approximate delay string for the next occurrence of this ;; message. The delay is given only in the first non zero unit. ;; Code partly stolen from article-make-date-line (let* ((extras (mail-header-extra header)) diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 7c63d5e2653..b18b78df063 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -1678,7 +1678,7 @@ If SCAN, request a scan of that group as well." ;; Sort the methods based so that the primary and secondary ;; methods come first. This is done for legacy reasons to try to - ;; ensure that side-effect behaviour doesn't change from previous + ;; ensure that side-effect behavior doesn't change from previous ;; Gnus versions. (setq type-cache (sort (nreverse type-cache) diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 5e034b14fde..efdc237d11f 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -256,7 +256,7 @@ if the variable `help-downcase-arguments' is non-nil." ;; so let's skip over it (search-backward "(") (goto-char (scan-sexps (point) 1))))) - ;; Highlight aguments in the USAGE string + ;; Highlight arguments in the USAGE string (setq usage (help-do-arg-highlight (buffer-string) args)) ;; Highlight arguments in the DOC string (setq doc (and doc (help-do-arg-highlight doc args)))))) diff --git a/lisp/info.el b/lisp/info.el index b3bdbc5e5be..0148ee544f9 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -264,7 +264,7 @@ Before leaving the initial Info node, where isearch was started, it fails once with the error message [initial node], and with subsequent C-s/C-r continues through other nodes without failing with this error message in other nodes. When isearch fails for -the rest of the manual, it wraps aroung the whole manual and +the rest of the manual, it wraps around the whole manual and restarts the search from the top/final node depending on search direction. diff --git a/lisp/isearch.el b/lisp/isearch.el index 3ffe6e8a656..2013d7f7078 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -2243,7 +2243,7 @@ If there is no completion possible, say so and continue searching." ;; Searching (defvar isearch-search-fun-function nil - "Overrides the default `isearch-search-fun' behaviour. + "Overrides the default `isearch-search-fun' behavior. This variable's value should be a function, which will be called with no arguments, and should return a function that takes three arguments: STRING, BOUND, and NOERROR. diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index bb242a50acc..444f4d519da 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el @@ -582,7 +582,7 @@ See also the descriptions of the variables (narrow-to-region p (point)) (robin-invert-region (point-min) (point-max) "ethiopic-sera") - ;; ethio-quote-vowel-alwyas + ;; ethio-quote-vowel-always (goto-char (point-min)) (while (re-search-forward "'[eauio]" nil t) (save-excursion diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index 81c5577fa57..83386f2e852 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el @@ -372,7 +372,7 @@ indicate the place to embed a consonant. Optional WITH-MAA-SAKOD-RULE is a rule to re-order and modify VOWEL follwoing a consonant and preceding a maa-sakod character. If it is -nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is alwasy +nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is always appended at the tail. For instance, rule `(\"(1`WM(B\" (?(1`(B t ?(1W(B ?(1M(B))' tells that this vowel diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 8847c16bfb4..744560a8223 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -20621,7 +20621,7 @@ normalized footnotes towards the end of the pre-processing buffer. Some exporters like docbook, odt, etc. expect that footnote definitions be available before any references to them. Such exporters can let bind `org-footnote-insert-pos-for-preprocessor' to -symbol 'point-min to achieve the desired behaviour. +symbol 'point-min to achieve the desired behavior. Additional note on `org-footnote-insert-pos-for-preprocessor': 1. This variable has not effect when FOR-PREPROCESSOR is nil. diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index f4b29958aab..d0907b078ac 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -1356,7 +1356,7 @@ for you. Add this function to `mail-send-hook' with something like this: (add-hook 'mail-send-hook 'feedmail-mail-send-hook-splitter) Then add the functions you want called to either `feedmail-mail-send-hook-queued' -or `feedmail-mail-send-hook', as apprpriate. The distinction is that +or `feedmail-mail-send-hook', as appropriate. The distinction is that `feedmail-mail-send-hook' will be called when you send mail from a composition buffer (typically by typing C-c C-c), whether the message is sent immediately or placed in the queue or drafts directory. `feedmail-mail-send-hook-queued' is diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el index d1b3ccebf46..c6d60b3b2e2 100644 --- a/lisp/mh-e/mh-alias.el +++ b/lisp/mh-e/mh-alias.el @@ -272,7 +272,7 @@ Blind aliases or users from /etc/passwd are not expanded." (completing-read prompt mh-alias-alist nil nil) ","))))) (if (not mh-alias-expand-aliases-flag) (mapconcat 'identity the-answer ", ") - ;; Loop over all elements, checking if in passwd aliast or blind first + ;; Loop over all elements, checking if in passwd alias or blind first (mapconcat 'mh-alias-expand the-answer ",\n "))))) ;;;###mh-autoload diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el index 3f1437f0799..791e566fc8e 100644 --- a/lisp/net/quickurl.el +++ b/lisp/net/quickurl.el @@ -26,7 +26,7 @@ ;; ;; This package provides a simple method of inserting a URL based on the ;; text at point in the current buffer. This is part of an on-going effort -;; to increase the information I provide people while reducing the ammount +;; to increase the information I provide people while reducing the amount ;; of typing I need to do. No-doubt there are undiscovered Emacs packages ;; out there that do all of this and do it better, feel free to point me to ;; them, in the mean time I'm having fun playing with Emacs Lisp. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 55732194bc8..6cba1a5b7a6 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4307,7 +4307,7 @@ connection if a previous connection has died for some reason." (tramp-compat-temporary-file-directory))))) spec) - ;; Add arguments for asynchrononous processes. + ;; Add arguments for asynchronous processes. (when (and process-name async-args) (setq login-args (append async-args login-args))) diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el index 9060e091587..cc538c224dc 100644 --- a/lisp/net/zeroconf.el +++ b/lisp/net/zeroconf.el @@ -249,7 +249,7 @@ qualified name, i.e., it contains DOMAIN. APROTOCOL stands for the network protocol family ADDRESS is encoded (`zeroconf-avahi-protocol-inet4' means INET4, `zeroconf-avahi-protocol-inet6' means INET6). It can be -different from PROTOCOL, when an adrress resolution has been +different from PROTOCOL, when an address resolution has been requested for another protocol family but the default one. ADDRESS is the service address, encoded according to the diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el index cb06091dfcf..347db281f1a 100644 --- a/lisp/obsolete/iso-acc.el +++ b/lisp/obsolete/iso-acc.el @@ -32,7 +32,7 @@ ;; In `iso-accents-mode', pseudo accent characters are used to ;; introduce accented keys. The pseudo-accent characters are: ;; -;; ' (minute) -> actue accent +;; ' (minute) -> acute accent ;; ` (backtick) -> grave accent ;; " (second) -> diaeresis ;; ^ (caret) -> circumflex diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 704da5fa68e..d4f993fedf6 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -7163,7 +7163,7 @@ src blocks. (org-speed-command-default-hook): The default hook for org-speed-command-hook. Factored out from org-self-insert-command - and mimics existing behaviour. + and mimics existing behavior. (org-self-insert-command): Modified to use org-speed-command-hook. 2010-11-11 Carsten Dominik @@ -10577,7 +10577,7 @@ a list of symbols specifying which of the special keywords #+DATE, #+AUTHOR, #+EMAIL and #+TITLE should be hidden by font lock. (org-fontify-meta-lines-and-blocks): Changes to font-lock code - implementing new faces and hiding behaviour. + implementing new faces and hiding behavior. * org-faces.el (org-document-title): New face for #+TITLE lines. (org-document-info): New face for #+DATE, #+AUTHOR, #+EMAIL lines. @@ -16482,14 +16482,14 @@ 2008-11-23 Carsten Dominik * org-export-latex.el (org-export-latex-subcontent): - Interprete target aliases as additonal labels. + Interprete target aliases as additional labels. * org-exp.el (org-export-target-aliases): New variable. (org-export-preprocess-string) (org-export-handle-invisible-targets): Fill the alias alist. (org-export-as-html): Remove the   from the anchor, and also assign an id. - (org-html-level-start): Insert the target aliases as additonal + (org-html-level-start): Insert the target aliases as additional anchors. * org.el (org-edit-fixed-width-region): Fix bug when starting a new diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el index 5cebe50efd1..9f40c5bd9d5 100644 --- a/lisp/org/org-beamer.el +++ b/lisp/org/org-beamer.el @@ -451,7 +451,7 @@ The effect is that these values will be accessible during export." ((stringp org-beamer-frame-level-now) (setq org-beamer-frame-level-now (string-to-number org-beamer-frame-level-now)))) - ;; Find the header additons, most likely theme commands + ;; Find the header additions, most likely theme commands (setq org-beamer-header-extra (or (and (org-region-active-p) (save-excursion diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el index 48eced9ea08..352d414a4b6 100644 --- a/lisp/org/org-ctags.el +++ b/lisp/org/org-ctags.el @@ -64,19 +64,19 @@ ;; with the same name as the link; then, if unsuccessful, ask the user if ;; he/she wants to rebuild the 'TAGS' database and try again; then ask if ;; the user wishes to append 'tag' as a new toplevel heading at the end of -;; the buffer; and finally, defer to org's default behaviour which is to +;; the buffer; and finally, defer to org's default behavior which is to ;; search the entire text of the current buffer for 'tag'. ;; -;; This behaviour can be modified by changing the value of +;; This behavior can be modified by changing the value of ;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my -;; .emacs, which describes the same behaviour as the above paragraph with +;; .emacs, which describes the same behavior as the above paragraph with ;; one difference: ;; ;; (setq org-ctags-open-link-functions ;; '(org-ctags-find-tag ;; org-ctags-ask-rebuild-tags-file-then-find-tag ;; org-ctags-ask-append-topic -;; org-ctags-fail-silently)) ; <-- prevents org default behaviour +;; org-ctags-fail-silently)) ; <-- prevents org default behavior ;; ;; ;; Usage diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el index 223d2573fdb..0d47132d2f8 100644 --- a/lisp/org/org-footnote.el +++ b/lisp/org/org-footnote.el @@ -574,7 +574,7 @@ normalized footnotes towards the end of the pre-processing buffer. Some exporters like docbook, odt, etc. expect that footnote definitions be available before any references to them. Such exporters can let bind `org-footnote-insert-pos-for-preprocessor' to -symbol 'point-min to achieve the desired behaviour. +symbol 'point-min to achieve the desired behavior. Additional note on `org-footnote-insert-pos-for-preprocessor': 1. This variable has not effect when FOR-PREPROCESSOR is nil. diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el index ddb3cf7b63a..0c924cd9f07 100644 --- a/lisp/org/org-publish.el +++ b/lisp/org/org-publish.el @@ -191,7 +191,7 @@ sitemap of files or summary page for a given project. display folders first or last, respectively. Any other value will mix files and folders. :sitemap-sort-files The site map is normally sorted alphabetically. - You can change this behaviour setting this to + You can change this behavior setting this to `chronologically', `anti-chronologically' or nil. :sitemap-ignore-case Should sorting be case-sensitive? Default nil. @@ -1114,7 +1114,7 @@ so that the file including them will be republished as well." (let ((ctime (org-publish-cache-ctime-of-src filename))) (or (< pstamp ctime) (when included-files-ctime - (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) + (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) included-files-ctime)))))))))) (defun org-publish-cache-set-file-property (filename property value &optional project-name) diff --git a/lisp/org/org.el b/lisp/org/org.el index 10531b07325..a22cf4d6efc 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -11217,7 +11217,7 @@ changes. Such blocking occurs when: (forward-line 1) (re-search-forward org-not-done-heading-regexp pos t)) (throw 'dont-block nil)) ; block, there is an older sibling not done. - ;; Search further up the hierarchy, to see if an anchestor is blocked + ;; Search further up the hierarchy, to see if an ancestor is blocked (while t (goto-char parent-pos) (if (not (looking-at org-not-done-heading-regexp)) diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index 86e6b4abb6c..1ea8df36cd6 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el @@ -151,7 +151,7 @@ "Local keymap for the 5x5 game.") (5x5-defvar-local 5x5-solver-output nil - "List that is is the output of artihmetic solver. + "List that is is the output of an arithmetic solver. This list L is such that @@ -162,8 +162,8 @@ M is the move count when the solve output was stored. S_1 ... S_N are all the solutions ordered from least to greatest number of strokes. S_1 is the solution to be displayed. -Each solution S_1, ..., S_N is a a list (STROKE-COUNT GRID) where -STROKE-COUNT is to number of strokes to achieve the solution and +Each solution S_1, ..., S_N is a list (STROKE-COUNT GRID) where +STROKE-COUNT is the number of strokes to achieve the solution and GRID is the grid of positions to click.") diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 4a57a1eef67..4cf00cd3cfd 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -1747,7 +1747,7 @@ Information is extracted from the ali file." (unless declaration-found - ;; Since we alread know the number of the file, search for a direct + ;; Since we already know the number of the file, search for a direct ;; reference to it (goto-char (point-min)) (set 'declaration-found t) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index ea0a8f2d3b3..fd32e5e956c 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -988,7 +988,7 @@ comment at the start of cc-engine.el for more info." ;; Just gone back over an ordinary symbol of some sort? (t (c-crosses-statement-barrier-p (point) maybe-after-boundary-pos)))) - + (when boundary-pos (setq pptok ptok ptok tok @@ -1065,7 +1065,7 @@ comment at the start of cc-engine.el for more info." pos tok) ; always non-nil ) ; end of (catch loop ....) ) ; end of sexp-at-a-time (while ....) - + ;; If the stack isn't empty there might be errors to report. (while stack (if (and (vectorp saved-pos) (eq (length saved-pos) 3)) @@ -1795,7 +1795,7 @@ comment at the start of cc-engine.el for more info." rung-is-marked simple-ws-beg cmt-skip-pos) ;; Skip simple horizontal ws and do a quick check on the preceding - ;; character to see if it's anying that can't end syntactic ws, so we can + ;; character to see if it's anything that can't end syntactic ws, so we can ;; bail out early in the majority of cases when there just are a few ws ;; chars. Newlines are complicated in the backward direction, so we can't ;; skip over them. @@ -4051,7 +4051,7 @@ comment at the start of cc-engine.el for more info." ;; a relevant match. (goto-char pos) nil)))))) - + (> (point) (progn ;; Skip syntactic ws afterwards so that we don't stop at the @@ -6277,7 +6277,7 @@ comment at the start of cc-engine.el for more info." ;; car ^ ^ point ;; Foo::Foo (int b) : Base (b) {} ;; car ^ ^ point - ;; + ;; ;; The cdr of the return value is non-nil when a ;; `c-typedef-decl-kwds' specifier is found in the declaration. ;; Specifically it is a dotted pair (A . B) where B is t when a @@ -6285,7 +6285,7 @@ comment at the start of cc-engine.el for more info." ;; other `c-typedef-decl-kwds' (e.g. class, struct, enum) ;; specifier is present. I.e., (some of) the declared ;; identifier(s) are types. - ;; + ;; ;; If a cast is parsed: ;; ;; The point is left at the first token after the closing paren of @@ -8461,7 +8461,7 @@ comment at the start of cc-engine.el for more info." nil) (t nil)))) (eolp)) - + (goto-char pos) (progn (c-backward-syntactic-ws) (eq (point) pos)) @@ -8922,7 +8922,7 @@ comment at the start of cc-engine.el for more info." ;; FIXME: Should use c-add-stmt-syntax, but it's not yet ;; template aware. (c-add-syntax 'template-args-cont (point) placeholder)) - + ;; CASE D: continued statement. (t (c-beginning-of-statement-1 containing-sexp) diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index c7e78cb282a..02256ead392 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -963,7 +963,7 @@ this is `c-lineup-ObjC-method-call', which would align it like: [foo blahBlahBlah: fred thisIsTooDamnLong: barney -This behaviour can be overridden by customizing the indentation of +This behavior can be overridden by customizing the indentation of `objc-method-call-cont' in the \"objc\" style." :type 'integer :group 'c) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index a79d1a2c064..0556741b65b 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -902,7 +902,7 @@ the settings present before the switch. 9) When doing indentation of control constructs, may correct line-breaks/spacing between elements of the construct. -10) Uses a linear-time algorith for indentation of regions (on Emaxen with +10) Uses a linear-time algorithm for indentation of regions (on Emaxen with capable syntax engines). 11) Syntax-highlight, indentation, sexp-recognition inside regular expressions. diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index cb0b02ff350..009400504b2 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -29,7 +29,7 @@ ;; form. For editing Fortran 90 free format source, use `f90-mode' ;; (f90.el). It is meant to support the GNU Fortran language ;; implemented by g77 (its extensions to Fortran77 and -;; interpretations, e.g. of blackslash in strings). +;; interpretations, e.g. of backslash in strings). ;;; History: diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index c88727c721c..53807b8de30 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -2217,7 +2217,7 @@ Return position where LINE begins." (defun gdb-mapcar* (function &rest seqs) "Apply FUNCTION to each element of SEQS, and make a list of the results. If there are several SEQS, FUNCTION is called with that many -arugments, and mapping stops as sson as the shortest list runs +arguments, and mapping stops as sson as the shortest list runs out." (let ((shortest (apply #'min (mapcar #'length seqs)))) (mapcar (lambda (i) @@ -3428,7 +3428,7 @@ breakpoints buffer." (error "Not recognized as break/watchpoint line"))))) -;; Frames buffer. This displays a perpetually correct bactrack trace. +;; Frames buffer. This displays a perpetually correct backtrack trace. ;; (def-gdb-trigger-and-handler gdb-invalidate-frames (gdb-current-context-command "-stack-list-frames") diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 543539421fe..b54b2dc5f47 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -2102,7 +2102,7 @@ extension EXTN. Normally EXTN is given as the regular expression massaged-args))) ;; Search for an association with P, a fully qualified class name, in -;; gud-jdb-class-source-alist. The asssociation gives the fully +;; gud-jdb-class-source-alist. The association gives the fully ;; qualified file name of the source file which produced the class. (defun gud-jdb-find-source-file (p) (cdr (assoc p gud-jdb-class-source-alist))) diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index e15f765ea58..958c1bfb0cc 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -700,7 +700,7 @@ If the list was changed, sort the list and remove duplicates first." (defun meta-beginning-of-defun (&optional arg) - "Move backward to beginnning of a defun in Metafont or MetaPost code. + "Move backward to beginning of a defun in Metafont or MetaPost code. With numeric argument, do it that many times. Negative arg -N means move forward to Nth following beginning of defun. Returns t unless search stops due to beginning or end of buffer." diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 00315856ad5..93d27042dc8 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -151,7 +151,7 @@ ;; (`prolog-electric-dot-full-predicate-template', defaults to t ;; since it seems quicker to me to just type those commata). A ;; trivial adaptation of a patch by Markus Triska. -;; o Improved the behaviour of electric if-then-else to only skip +;; o Improved the behavior of electric if-then-else to only skip ;; forward if the parenthesis/semicolon is preceded by ;; whitespace. Once more a trivial adaptation of a patch by ;; Markus Triska. diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 97a1c4605c2..3166abb21a7 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -672,7 +672,7 @@ highlighted properly when you open them." :safe 'symbolp) (defvaralias 'sql-dialect 'sql-product) -;; misc customization of sql.el behaviour +;; misc customization of sql.el behavior (defcustom sql-electric-stuff nil "Treat some input as electric. @@ -3600,12 +3600,12 @@ The list is maintained in SQL interactive buffers.") (setq has-schema (and (>= (length (car names)) schema-len) (string= schema-dot - (downcase (substring (car names) + (downcase (substring (car names) 0 schema-len)))) names (cdr names))) (unless has-schema (sql-build-completions schema))))) - + ;; Try to find the completion (cond ((not predicate) @@ -3951,7 +3951,7 @@ is specified in the connection settings." ;; interactive session (eval `(let ((sql-connection ,connection) (,param-var ',rem-params)) - (sql-product-interactive sql-product + (sql-product-interactive sql-product new-name))))) (message "SQL Connection <%s> does not exist" connection) @@ -3981,16 +3981,16 @@ optionally is saved to the user's init file." (if connection (message "This session was started by a connection; it's already been saved.") - + (let ((login (sql-get-product-feature product :sqli-login)) (alist sql-connection-alist) connect) - + ;; Remove the existing connection if the user says so (when (and (assoc name alist) (yes-or-no-p (format "Replace connection definition <%s>? " name))) (setq alist (assq-delete-all name alist))) - + ;; Add the new connection if it doesn't exist (if (assoc name alist) (message "Connection <%s> already exists" name) @@ -4747,8 +4747,8 @@ Try to set `comint-output-filter-functions' like this: (sql-redirect sqlbuf "\\t off") (when (not (string= a "aligned")) (sql-redirect sqlbuf "\\a")) - - ;; Return the list of table names (public schema name can be omitted) + + ;; Return the list of table names (public schema name can be omitted) (mapcar (lambda (tbl) (if (string= (car tbl) "public") (cadr tbl) diff --git a/lisp/simple.el b/lisp/simple.el index 90d22c817b0..82d82bc7240 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2657,7 +2657,7 @@ value passed." Per default, this variable is always set to `t', meaning that a call of `process-file' could potentially change any file on a remote host. When set to `nil', a file handler could optimize -its behaviour with respect to remote file attributes caching. +its behavior with respect to remote file attributes caching. This variable should never be changed by `setq'. Instead of, it shall be set only by let-binding.") diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index cfa406c2b48..ff528fcc9df 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -142,7 +142,7 @@ This information is useful, but it takes screen space away from file names." ;; The Tar data is made up of bytes and better manipulated as bytes ;; and can be very large, so insert/delete can be costly. The summary we -;; want to display may contain non-ascci chars, of course, so we'd like it +;; want to display may contain non-ascii chars, of course, so we'd like it ;; to be multibyte. We used to keep both in the same buffer and switch ;; from/to uni/multibyte. But this had several downsides: ;; - set-buffer-multibyte has an O(N^2) worst case that tends to be triggered diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index be14e90e000..20d9c18c43e 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -2263,7 +2263,7 @@ Returns a DIRECTION, a number 0--7, coded as follows: ;; Things for drawing lines in all directions. -;; The line drawing engine is the eight-point alrogithm. +;; The line drawing engine is the eight-point algorithm. ;; ;; A line is here a list of (x y saved-char new-char)s. ;; diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 4d6b5e5fb83..1a0f7ec5836 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -711,7 +711,7 @@ of master file." context) (when (and (not appendix) (>= (string-to-char (match-string 2)) ?A)) - ;; Just entered the appendex. Get out. + ;; Just entered the appendix. Get out. (throw 'exit nil)) ;; Change the section number. diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index 37983d17931..dbed09c9ccb 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -33,7 +33,7 @@ (defvar reftex-toc-mode-map (let ((map (make-sparse-keymap))) - + (define-key map (if (featurep 'xemacs) [(button2)] [(mouse-2)]) 'reftex-toc-mouse-goto-line-and-hide) (define-key map [follow-link] 'mouse-face) @@ -660,7 +660,7 @@ point." (setq msg (catch 'exit (if (reftex-region-active-p) - ;; A region is dangerous, check if we have a brandnew scan, + ;; A region is dangerous, check if we have a brand new scan, ;; to make sure we are not missing any section statements. (if (not (reftex-toc-check-docstruct)) (reftex-toc-load-all-files-for-promotion) ;; exits diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index cef8a3d1548..3ac0aa0f65d 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -1568,7 +1568,7 @@ Valid actions are: readable, restore, read, kill, write." ;;; Finding files (defun reftex-locate-file (file type master-dir &optional die) - "Find FILE of type TYPE in MASTER-DIR or on the path associcted with TYPE. + "Find FILE of type TYPE in MASTER-DIR or on the path associated with TYPE. If the file does not have any of the valid extensions for TYPE, try first the default extension and only then the naked file name. When DIE is non-nil, throw an error if file not found." @@ -2254,7 +2254,7 @@ IGNORE-WORDS List of words which should be removed from the string." (defvar font-lock-defaults-computed) (defun reftex-fontify-select-label-buffer (parent-buffer) ;; Fontify the `*RefTeX Select*' buffer. Buffer is temporarily renamed to - ;; start with none-SPC char, beacuse Font-Lock otherwise refuses operation. + ;; start with none-SPC char, because Font-Lock otherwise refuses operation. (run-hook-with-args 'reftex-pre-refontification-functions parent-buffer 'reftex-ref) (let* ((oldname (buffer-name)) diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el index 1923ab692d8..07a4fae9c30 100644 --- a/lisp/textmodes/remember.el +++ b/lisp/textmodes/remember.el @@ -113,7 +113,7 @@ ;; - Allowing particular views of the initially amorphous data pool ;; (ala the Xanadu concept). ;; -;; - Storage of the data in a manner most appopriate to that data, +;; - Storage of the data in a manner most appropriate to that data, ;; such as keeping address-book type information in BBDB, etc. ;; ;; * Using "remember" diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 0ce71c25ad7..d66b297bd2b 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -2475,7 +2475,7 @@ first of a paragraph." ;;------------------------------------------------------------------------------ ;; FIXME: these next functions should become part of a larger effort to redo the -;; bullets in bulletted lists. The enumerate would just be one of the possible +;; bullets in bulleted lists. The enumerate would just be one of the possible ;; outputs. ;; ;; FIXME: TODO we need to do the enumeration removal as well. diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index 5a7fa0bf950..9bf75fa7f55 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -1127,7 +1127,7 @@ It assumes that it is called from within the control buffer." ;; Revise the mode line to display which difference we have selected ;; Also resets modelines of buffers A/B, since they may be clobbered by -;; anothe invocations of Ediff. +;; other invocations of Ediff. (defun ediff-refresh-mode-lines () (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge) diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 8051009a983..39c583b8a0d 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -1399,7 +1399,7 @@ The `:insn' key is a keyword to distinguish it as a vc-rcs.el extension." ;; `incg' or `buffer-substring-no-properties'. (This is ;; for speed; strictly speaking, it is sufficient to use ;; only the former since it behaves identically to the - ;; latter in the absense of "@@".) + ;; latter in the absence of "@@".) sub) (flet ((incg (beg end) (let ((b beg) (e end) @-holes) (while (and asc (< (car asc) e)) diff --git a/lisp/whitespace.el b/lisp/whitespace.el index f50386b1827..dde85478f7e 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -2573,7 +2573,7 @@ Also refontify when necessary." (setq whitespace-display-table-was-local t whitespace-display-table (copy-sequence buffer-display-table)) - ;; asure `buffer-display-table' is unique + ;; Assure `buffer-display-table' is unique ;; when two or more windows are visible. (setq buffer-display-table (copy-sequence buffer-display-table))) diff --git a/lisp/windmove.el b/lisp/windmove.el index 2aef37dd4c8..1deaa44c7dd 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -245,7 +245,7 @@ placement bugs in old versions of Emacs." ;; Actually, the whole subject of the minibuffer edge of the frame is ;; rather messy. It turns out that with a sufficiently large delta, ;; we can fly off the bottom edge of the frame and miss the minibuffer -;; altogther. This, I think, is never right: if there's a minibuffer +;; altogether. This, I think, is never right: if there's a minibuffer ;; and you're not in it, and you move down, the minibuffer should be ;; in your way. ;; diff --git a/lisp/xml.el b/lisp/xml.el index 52bb0de7ea0..68aa5f4db6f 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -540,7 +540,7 @@ Leave point at the first non-blank character after the tag." (replace-regexp-in-string "\\s-\\{2,\\}" " " string) (let ((expansion (xml-substitute-special string))) (unless (stringp expansion) - ; We say this is the constraint. It is acctually that + ; We say this is the constraint. It is actually that neither ; external entities nor "<" can be in an attribute value. (error "XML: (Not Well-Formed) Entities in attributes cannot expand into elements")) (push (cons name expansion) attlist))) diff --git a/src/alloc.c b/src/alloc.c index 985e4b71426..1d274e2111e 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -882,7 +882,7 @@ safe_alloca_unwind (Lisp_Object arg) /* Like malloc but used for allocating Lisp data. NBYTES is the number of bytes to allocate, TYPE describes the intended use of the - allcated memory block (for strings, for conses, ...). */ + allocated memory block (for strings, for conses, ...). */ #ifndef USE_LSB_TAG static void *lisp_malloc_loser; diff --git a/src/bytecode.c b/src/bytecode.c index 91d360bec1b..3af0abd63cf 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -271,7 +271,7 @@ struct byte_stack /* A list of currently active byte-code execution value stacks. Fbyte_code adds an entry to the head of this list before it starts processing byte-code, and it removed the entry again when it is - done. Signaling an error truncates the list analoguous to + done. Signaling an error truncates the list analogous to gcprolist. */ struct byte_stack *byte_stack_list; diff --git a/src/coding.h b/src/coding.h index fdf9b762e75..2621928adc3 100644 --- a/src/coding.h +++ b/src/coding.h @@ -518,7 +518,7 @@ struct coding_system #define CODING_REQUIRE_DETECTION_MASK 0x1000 #define CODING_RESET_AT_BOL_MASK 0x2000 -/* Return 1 if the coding context CODING requires annotaion +/* Return 1 if the coding context CODING requires annotation handling. */ #define CODING_REQUIRE_ANNOTATION(coding) \ ((coding)->common_flags & CODING_ANNOTATION_MASK) diff --git a/src/emacs.c b/src/emacs.c index 12be7bc0808..529fa35a5bd 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1402,7 +1402,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem #endif /* argmatch must not be used after here, - except when bulding temacs + except when building temacs because the -d argument has not been skipped in skip_args. */ #ifdef MSDOS diff --git a/src/font.c b/src/font.c index ead8225471e..3fc5fc944b4 100644 --- a/src/font.c +++ b/src/font.c @@ -5144,7 +5144,7 @@ the corresponding glyph code. If ENCODING is a char-table, looking up the table by a character gives the corresponding glyph code. REPERTORY specifies a repertory of characters supported by the font. -If REPERTORY is a charset, all characters beloging to the charset are +If REPERTORY is a charset, all characters belonging to the charset are supported. If REPERTORY is a char-table, all characters who have a non-nil value in the table are supported. If REPERTORY is nil, Emacs gets the repertory information by an opened font and ENCODING. */); diff --git a/src/image.c b/src/image.c index 1869b83ac2a..8b64bdf20b0 100644 --- a/src/image.c +++ b/src/image.c @@ -8781,7 +8781,7 @@ syms_of_image (void) operation on GNU/Linux of calling dump-emacs after loading some images. */ image_types = NULL; - /* Must be defined now becase we're going to update it below, while + /* Must be defined now because we're going to update it below, while defining the supported image types. */ DEFVAR_LISP ("image-types", Vimage_types, doc: /* List of potentially supported image types. diff --git a/src/indent.c b/src/indent.c index a70b7971b96..07a54c0c1b7 100644 --- a/src/indent.c +++ b/src/indent.c @@ -1675,7 +1675,7 @@ compute_motion (EMACS_INT from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_ val_compute_motion.prevhpos = contin_hpos; else val_compute_motion.prevhpos = prev_hpos; - /* We alalways handle all of them here; none of them remain to do. */ + /* We always handle all of them here; none of them remain to do. */ val_compute_motion.ovstring_chars_done = 0; /* Nonzero if have just continued a line */ diff --git a/src/keyboard.c b/src/keyboard.c index fb989d3ea95..87dd2b0e251 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1060,7 +1060,7 @@ cmd_error_internal (Lisp_Object data, const char *context) struct frame *sf = SELECTED_FRAME (); /* The immediate context is not interesting for Quits, - since they are asyncronous. */ + since they are asynchronous. */ if (EQ (XCAR (data), Qquit)) Vsignaling_function = Qnil; diff --git a/src/nsterm.m b/src/nsterm.m index 3d3723fc28c..7d26cba6d73 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3035,7 +3035,7 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r) /* Currently on NS img->mask is always 0. Since get_window_cursor_type specifies a hollow box cursor when on a non-masked image we never reach this clause. But we put it - in in antipication of better support for image masks on + in in anticipation of better support for image masks on NS. */ tdCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f); } diff --git a/src/sound.c b/src/sound.c index 362c04b7d40..39007574afc 100644 --- a/src/sound.c +++ b/src/sound.c @@ -226,7 +226,7 @@ struct sound_device /* Close device SD. */ void (* close) (struct sound_device *sd); - /* Configure SD accoring to device-dependent parameters. */ + /* Configure SD according to device-dependent parameters. */ void (* configure) (struct sound_device *device); /* Choose a device-dependent format for outputting sound S. */ diff --git a/src/w32fns.c b/src/w32fns.c index ffbcff86694..b4166cbf691 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -2088,7 +2088,7 @@ w32_key_to_modifier (int key) key_mapping = Qnil; } - /* NB. This code runs in the input thread, asychronously to the lisp + /* NB. This code runs in the input thread, asynchronously to the lisp thread, so we must be careful to ensure access to lisp data is thread-safe. The following code is safe because the modifier variable values are updated atomically from lisp and symbols are diff --git a/src/w32font.c b/src/w32font.c index 365f8b78a5e..2088af2fbe7 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -1492,7 +1492,7 @@ check_face_name (LOGFONT *font, char *full_name) /* Callback function for EnumFontFamiliesEx. - * Checks if a font matches everything we are trying to check agaist, + * Checks if a font matches everything we are trying to check against, * and if so, adds it to a list. Both the data we are checking against * and the list to which the fonts are added are passed in via the * lparam argument, in the form of a font_callback_data struct. */ diff --git a/src/w32menu.c b/src/w32menu.c index c31a8c1fd96..39d101e7bd5 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -1443,7 +1443,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) out_string = (char *) local_alloc (strlen (wv->name) + 1); strcpy (out_string, wv->name); #ifdef MENU_DEBUG - DebPrint ("Menu: allocing %ld for owner-draw", out_string); + DebPrint ("Menu: allocating %ld for owner-draw", out_string); #endif fuFlags = MF_OWNERDRAW | MF_DISABLED; } diff --git a/src/w32term.c b/src/w32term.c index e2a06446976..e9fa16ba325 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -5691,7 +5691,7 @@ x_make_frame_visible (struct frame *f) f->output_data.w32->asked_for_visible = 1; /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL - causes unexpected behaviour when unminimizing frames that were + causes unexpected behavior when unminimizing frames that were previously maximised. But only SW_SHOWNORMAL works properly for frames that were truely hidden (using make-frame-invisible), so we need it to avoid Bug#5482. It seems that async_iconified diff --git a/test/indent/octave.m b/test/indent/octave.m index 768f3d85e01..5ce52ad7a19 100644 --- a/test/indent/octave.m +++ b/test/indent/octave.m @@ -3,7 +3,7 @@ function res = tcomp (fn) %% res = tcomp (fn) %% imports components and rearranges them. - + if nargin ~= 1 print_usage() end @@ -36,7 +36,7 @@ function res = tcomp (fn) endfunction ## Copyright (C) 2005, 2006, 2007, 2008, 2009 S�ren Hauberg -## +## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it @@ -73,16 +73,16 @@ endfunction ## ## @table @code ## @item -nodeps -## The package manager will disable the dependency checking. That way it -## is possible to install a package even if it depends on another package +## The package manager will disable the dependency checking. That way it +## is possible to install a package even if it depends on another package ## that's not installed on the system. @strong{Use this option with care.} ## ## @item -noauto -## The package manager will not automatically load the installed package +## The package manager will not automatically load the installed package ## when starting Octave, even if the package requests that it is. ## ## @item -auto -## The package manager will automatically load the installed package when +## The package manager will automatically load the installed package when ## starting Octave, even if the package requests that it isn't. ## ## @item -local @@ -93,7 +93,7 @@ endfunction ## system privileges ## ## @item -verbose -## The package manager will print the output of all of the commands that are +## The package manager will print the output of all of the commands that are ## performed. ## @end table ## @@ -205,7 +205,7 @@ endfunction ## pkg global_list ## @end example ## @item rebuild -## Rebuilds the package database from the installed directories. This can +## Rebuilds the package database from the installed directories. This can ## be used in cases where for some reason the package database is corrupted. ## It can also take the @code{-auto} and @code{-noauto} options to allow the ## autoloading state of a package to be changed. For example @@ -227,7 +227,7 @@ endfunction ## @noindent ## where @code{builddir} is the name of a directory where the temporary ## installation will be produced and the binary packages will be found. -## The options @code{-verbose} and @code{-nodeps} are respected, while +## The options @code{-verbose} and @code{-nodeps} are respected, while ## the other options are ignored. ## @end table ## @end deftypefn @@ -259,7 +259,7 @@ function [local_packages, global_packages] = pkg (varargin) available_actions = {"list", "install", "uninstall", "load", ... "unload", "prefix", "local_list", ... - "global_list", "rebuild", "build","describe"}; + "global_list", "rebuild", "build","describe"}; ## Handle input if (length (varargin) == 0 || ! iscellstr (varargin)) print_usage (); @@ -321,14 +321,14 @@ function [local_packages, global_packages] = pkg (varargin) if (length (files) == 0) error ("you must specify at least one filename when calling 'pkg install'"); endif - install (files, deps, auto, prefix, archprefix, verbose, local_list, + install (files, deps, auto, prefix, archprefix, verbose, local_list, global_list, global_install); case "uninstall" if (length (files) == 0) error ("you must specify at least one package when calling 'pkg uninstall'"); endif - uninstall (files, deps, verbose, local_list, + uninstall (files, deps, verbose, local_list, global_list, global_install); case "load" @@ -406,7 +406,7 @@ function [local_packages, global_packages] = pkg (varargin) case "rebuild" if (global_install) - global_packages = rebuild (prefix, archprefix, global_list, files, + global_packages = rebuild (prefix, archprefix, global_list, files, auto, verbose); global_packages = save_order (global_packages); save (global_list, "global_packages"); @@ -414,7 +414,7 @@ function [local_packages, global_packages] = pkg (varargin) local_packages = global_packages; endif else - local_packages = rebuild (prefix, archprefix, local_list, files, auto, + local_packages = rebuild (prefix, archprefix, local_list, files, auto, verbose); local_packages = save_order (local_packages); save (local_list, "local_packages"); @@ -450,7 +450,7 @@ function [local_packages, global_packages] = pkg (varargin) otherwise error ("you can request at most two outputs when calling 'pkg describe'"); endswitch - + otherwise error ("you must specify a valid action for 'pkg'. See 'help pkg' for details"); endswitch @@ -529,7 +529,7 @@ function descriptions = rebuild (prefix, archprefix, list, files, auto, verbose) endfor if (! isempty (dup)) descriptions (dup) = []; - endif + endif endif endfunction @@ -555,7 +555,7 @@ function build (files, handle_deps, autoload, verbose) endif files(1) = []; buildlist = fullfile (builddir, "octave_packages"); - install (files, handle_deps, autoload, installdir, installdir, verbose, + install (files, handle_deps, autoload, installdir, installdir, verbose, buildlist, "", false); unwind_protect repackage (builddir, buildlist); @@ -570,7 +570,7 @@ function build (files, handle_deps, autoload, verbose) end_unwind_protect endfunction -function install (files, handle_deps, autoload, prefix, archprefix, verbose, +function install (files, handle_deps, autoload, prefix, archprefix, verbose, local_list, global_list, global_install) ## Check that the directory in prefix exist. If it doesn't: create it! @@ -583,10 +583,10 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, endif ## Get the list of installed packages. - [local_packages, global_packages] = installed_packages (local_list, + [local_packages, global_packages] = installed_packages (local_list, global_list); - installed_pkgs_lst = {local_packages{:}, global_packages{:}}; + installed_pkgs_lst = {local_packages{:}, global_packages{:}}; if (global_install) packages = global_packages; @@ -599,7 +599,7 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, try ## Warn about non existent files. for i = 1:length (files) - if (isempty (glob(files{i}))) + if (isempty (glob(files{i}))) warning ("file %s does not exist", files{i}); endif endfor @@ -652,32 +652,32 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, packdir = fullfile (pwd(), dirlist{3}); endif packdirs{end+1} = packdir; - + ## Make sure the package contains necessary files. verify_directory (packdir); - + ## Read the DESCRIPTION file. filename = fullfile (packdir, "DESCRIPTION"); desc = get_description (filename); - + ## Verify that package name corresponds with filename. - [dummy, nm] = fileparts (tgz); + [dummy, nm] = fileparts (tgz); if ((length (nm) >= length (desc.name)) && ! strcmp (desc.name, nm(1:length(desc.name)))) - error ("package name '%s' doesn't correspond to its filename '%s'", + error ("package name '%s' doesn't correspond to its filename '%s'", desc.name, nm); endif - + ## Set default installation directory. desc.dir = fullfile (prefix, cstrcat (desc.name, "-", desc.version)); - - ## Set default architectire dependent installation directory. + + ## Set default architecture dependent installation directory. desc.archprefix = fullfile (archprefix, cstrcat (desc.name, "-", desc.version)); - + ## Save desc. descriptions{end+1} = desc; - + ## Are any of the new packages already installed? ## If so we'll remove the old version. for j = 1:length (packages) @@ -705,14 +705,14 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, if (global_install) ## Global installation is not allowed to have dependencies on locally ## installed packages. - idx1 = complement (packages_to_uninstall, + idx1 = complement (packages_to_uninstall, 1:length(global_packages)); pseudo_installed_packages = {global_packages{idx1}, ... descriptions{idx2}}; else - idx1 = complement (packages_to_uninstall, + idx1 = complement (packages_to_uninstall, 1:length(local_packages)); - pseudo_installed_packages = {local_packages{idx1}, ... + pseudo_installed_packages = {local_packages{idx1}, ... global_packages{:}, ... descriptions{idx2}}; endif @@ -755,10 +755,10 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, try for i = packages_to_uninstall if (global_install) - uninstall ({global_packages{i}.name}, false, verbose, local_list, + uninstall ({global_packages{i}.name}, false, verbose, local_list, global_list, global_install); else - uninstall ({local_packages{i}.name}, false, verbose, local_list, + uninstall ({local_packages{i}.name}, false, verbose, local_list, global_list, global_install); endif endfor @@ -809,7 +809,7 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, ## requested that it is, then mark the package as autoloaded. for i = length (descriptions):-1:1 if (autoload > 0 || (autoload == 0 && isautoload (descriptions(i)))) - fclose (fopen (fullfile (descriptions{i}.dir, "packinfo", + fclose (fopen (fullfile (descriptions{i}.dir, "packinfo", ".autoload"), "wt")); descriptions{i}.autoload = 1; endif @@ -872,10 +872,10 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, endif endfunction -function uninstall (pkgnames, handle_deps, verbose, local_list, +function uninstall (pkgnames, handle_deps, verbose, local_list, global_list, global_install) ## Get the list of installed packages. - [local_packages, global_packages] = installed_packages(local_list, + [local_packages, global_packages] = installed_packages(local_list, global_list); if (global_install) installed_pkgs_lst = {local_packages{:}, global_packages{:}}; @@ -996,13 +996,13 @@ function uninstall (pkgnames, handle_deps, verbose, local_list, endfunction -function [pkg_desc_list, flag] = describe (pkgnames, verbose, +function [pkg_desc_list, flag] = describe (pkgnames, verbose, local_list, global_list) ## Get the list of installed packages. installed_pkgs_lst = installed_packages(local_list, global_list); num_packages = length (installed_pkgs_lst); - + describe_all = false; if (any (strcmp ("all", pkgnames))) @@ -1043,7 +1043,7 @@ function [pkg_desc_list, flag] = describe (pkgnames, verbose, non_inst_str = sprintf (" %s ", pkgnames{non_inst}); error ("some packages are not installed: %s", non_inst_str); else - pkg_desc_list{non_inst} = struct ("name", {}, "description", + pkg_desc_list{non_inst} = struct ("name", {}, "description", {}, "provides", {}); endif endif @@ -1052,7 +1052,7 @@ function [pkg_desc_list, flag] = describe (pkgnames, verbose, for i = 1:num_pkgnames print_package_description (pkg_desc_list{i}.name, pkg_desc_list{i}.version, - pkg_desc_list{i}.provides, + pkg_desc_list{i}.provides, pkg_desc_list{i}.description, flag{i}, verbose); endfor @@ -1069,12 +1069,12 @@ function [pkg_idx_struct] = parse_pkg_idx (packdir) if (! exist (index_file, "file")) error ("could not find any INDEX file in directory %s, try 'pkg rebuild all' to generate missing INDEX files", packdir); - endif + endif + - [fid, msg] = fopen (index_file, "r"); if (fid == -1) - error ("the INDEX file %s could not be read: %s", + error ("the INDEX file %s could not be read: %s", index_file, msg); endif @@ -1089,7 +1089,7 @@ function [pkg_idx_struct] = parse_pkg_idx (packdir) while (! feof (fid) || line != -1) if (! any (! isspace (line)) || line(1) == "#" || any (line == "=")) - ## Comments, blank lines or comments about unimplemented + ## Comments, blank lines or comments about unimplemented ## functions: do nothing ## FIXME: probably comments and pointers to external functions ## could be treated better when printing to screen? @@ -1114,7 +1114,7 @@ function [pkg_idx_struct] = parse_pkg_idx (packdir) fclose (fid); endfunction -function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, +function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, pkg_desc, status, verbose) printf ("---\nPackage name:\n\t%s\n", pkg_name); @@ -1122,7 +1122,7 @@ function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, printf ("Short description:\n\t%s\n", pkg_desc); printf ("Status:\n\t%s\n", status); if (verbose) - printf ("---\nProvides:\n"); + printf ("---\nProvides:\n"); for i = 1:length(pkg_idx_struct) if (! isempty (pkg_idx_struct{i}.functions)) printf ("%s\n", pkg_idx_struct{i}.category); @@ -1177,26 +1177,26 @@ function repackage (builddir, buildlist) unlink (fullfile (pack.name, "inst", "PKG_DEL")); endif if (exist (fullfile (archdir, "PKG_ADD"), "file")) - movefile (fullfile (archdir, "PKG_ADD"), + movefile (fullfile (archdir, "PKG_ADD"), fullfile (pack.name, "PKG_ADD")); endif if (exist (fullfile (archdir, "PKG_DEL"), "file")) - movefile (fullfile (archdir, "PKG_DEL"), - fullfile (pack.name, "PKG_DEL")); + movefile (fullfile (archdir, "PKG_DEL"), + fullfile (pack.name, "PKG_DEL")); endif else if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file")) - movefile (fullfile (pack.name, "inst", "PKG_ADD"), + movefile (fullfile (pack.name, "inst", "PKG_ADD"), fullfile (pack.name, "PKG_ADD")); - endif + endif if (exist (fullfile (pack.name, "inst", "PKG_DEL"), "file")) - movefile (fullfile (pack.name, "inst", "PKG_DEL"), - fullfile (pack.name, "PKG_DEL")); - endif - endif + movefile (fullfile (pack.name, "inst", "PKG_DEL"), + fullfile (pack.name, "PKG_DEL")); + endif + endif tfile = cstrcat (pack.name, "-", pack.version, ".tar"); tar (tfile, pack.name); - try + try gzip (tfile); unlink (tfile); catch @@ -1231,7 +1231,7 @@ function prepare_installation (desc, packdir) wd = pwd (); try cd (packdir); - pre_install (desc); + pre_install (desc); cd (wd); catch cd (wd); @@ -1245,13 +1245,13 @@ function prepare_installation (desc, packdir) [status, msg] = mkdir (inst_dir); if (status != 1) rm_rf (desc.dir); - error ("the 'inst' directory did not exist and could not be created: %s", + error ("the 'inst' directory did not exist and could not be created: %s", msg); endif endif endfunction -function configure_make (desc, packdir, verbose) +function configure_make (desc, packdir, verbose) ## Perform ./configure, make, make install in "src". if (exist (fullfile (packdir, "src"), "dir")) src = fullfile (packdir, "src"); @@ -1362,7 +1362,7 @@ function configure_make (desc, packdir, verbose) printf (" %s", archdependent{:}); printf (" %s\n", archdir); endif - if (! exist (archdir, "dir")) + if (! exist (archdir, "dir")) mkdir (archdir); endif [status, output] = copyfile (archdependent, archdir); @@ -1398,8 +1398,8 @@ endfunction function create_pkgadddel (desc, packdir, nm, global_install) instpkg = fullfile (desc.dir, nm); instfid = fopen (instpkg, "wt"); - ## If it is exists, most of the PKG_* file should go into the - ## architecture dependent directory so that the autoload/mfilename + ## If it is exists, most of the PKG_* file should go into the + ## architecture dependent directory so that the autoload/mfilename ## commands work as expected. The only part that doesn't is the ## part in the main directory. archdir = fullfile (getarchprefix (desc), cstrcat (desc.name, "-", @@ -1465,7 +1465,7 @@ function copy_files (desc, packdir, global_install) if (! exist (desc.dir, "dir")) [status, output] = mkdir (desc.dir); if (status != 1) - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", desc.dir, output); endif endif @@ -1493,32 +1493,32 @@ function copy_files (desc, packdir, global_install) [status, output] = mkdir (octm3); if (status != 1) rm_rf (desc.dir); - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", octm3, output); endif endif [status, output] = mkdir (octm2); if (status != 1) rm_rf (desc.dir); - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", octm2, output); endif endif [status, output] = mkdir (octm1); if (status != 1) rm_rf (desc.dir); - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", octm1, output); endif endif [status, output] = mkdir (octfiledir); if (status != 1) rm_rf (desc.dir); - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", octfiledir, output); endif endif - [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), + [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), octfiledir); rm_rf (fullfile (desc.dir, getarch ())); @@ -1753,7 +1753,7 @@ function deps_cell = fix_depends (depends) version = fix_version (parts{2}); ## If no version is specified for the dependency - ## we say that the version should be greater than + ## we say that the version should be greater than ## or equal to "0.0.0". else package = tolower (strip (dep)); @@ -1813,7 +1813,7 @@ function write_index (desc, dir, index_file, global_install) if (err) error ("couldn't read directory %s: %s", tmpdir, msg); endif - files = [files; files2]; + files = [files; files2]; endif functions = {}; @@ -1910,7 +1910,7 @@ function [out1, out2] = installed_packages (local_list, global_list) endfor if (! isempty(dup)) installed_pkgs_lst(dup) = []; - endif + endif ## Now check if the package is loaded. tmppath = strrep (path(), "\\", "/"); @@ -1957,9 +1957,9 @@ function [out1, out2] = installed_packages (local_list, global_list) h1 = "Package Name"; h2 = "Version"; h3 = "Installation directory"; - max_name_length = length (h1); + max_name_length = length (h1); max_version_length = length (h2); - names = cell (num_packages, 1); + names = cell (num_packages, 1); for i = 1:num_packages max_name_length = max (max_name_length, length (installed_pkgs_lst{i}.name)); @@ -1996,7 +1996,7 @@ function [out1, out2] = installed_packages (local_list, global_list) first_char = length (cur_dir) - max_dir_length + 4; first_filesep = strfind (cur_dir(first_char:end), filesep()); if (! isempty (first_filesep)) - cur_dir = cstrcat ("...", + cur_dir = cstrcat ("...", cur_dir((first_char + first_filesep(1) - 1):end)); else cur_dir = cstrcat ("...", cur_dir(first_char:end)); @@ -2026,7 +2026,7 @@ function load_packages (files, handle_deps, local_list, global_list) if (length (files) == 1 && strcmp (files{1}, "all")) idx = [1:length(installed_pkgs_lst)]; ## Load auto. - elseif (length (files) == 1 && strcmp (files{1}, "auto")) + elseif (length (files) == 1 && strcmp (files{1}, "auto")) idx = []; for i = 1:length (installed_pkgs_lst) if (exist (fullfile (pdirs{i}, "packinfo", ".autoload"), "file")) @@ -2162,7 +2162,7 @@ endfunction function archprefix = getarchprefix (desc, global_install) if ((nargin == 2 && global_install) || (nargin < 2 && issuperuser ())) - archprefix = fullfile (octave_config_info ("libexecdir"), "octave", + archprefix = fullfile (octave_config_info ("libexecdir"), "octave", "packages", cstrcat(desc.name, "-", desc.version)); else archprefix = desc.dir; @@ -2207,7 +2207,7 @@ function newdesc = save_order (desc) newdesc = {}; for i = 1 : length(desc) deps = desc{i}.depends; - if (isempty (deps) || (length (deps) == 1 && + if (isempty (deps) || (length (deps) == 1 && strcmp(deps{1}.package, "octave"))) newdesc {end + 1} = desc{i}; else @@ -2220,7 +2220,7 @@ function newdesc = save_order (desc) endif endfor endfor - if (! isempty (tmpdesc)) + if (! isempty (tmpdesc)) newdesc = {newdesc{:}, save_order(tmpdesc){:}, desc{i}}; else newdesc{end+1} = desc{i}; @@ -2278,7 +2278,7 @@ function idx = load_package_dirs (lidx, idx, handle_deps, installed_pkgs_lst) else if (handle_deps) deps = installed_pkgs_lst{i}.depends; - if ((length (deps) > 1) || (length (deps) == 1 && + if ((length (deps) > 1) || (length (deps) == 1 && ! strcmp(deps{1}.package, "octave"))) tmplidx = []; for k = 1 : length (deps) @@ -2289,7 +2289,7 @@ function idx = load_package_dirs (lidx, idx, handle_deps, installed_pkgs_lst) endif endfor endfor - idx = load_package_dirs (tmplidx, idx, handle_deps, + idx = load_package_dirs (tmplidx, idx, handle_deps, installed_pkgs_lst); endif endif -- 2.11.4.GIT