From 735135f9bc3c01b91ffef7c418dd9281bc347ab7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 4 Oct 2012 22:57:24 -0700 Subject: [PATCH] Spelling fixes. --- admin/grammars/srecode-template.wy | 2 +- doc/emacs/display.texi | 2 +- doc/lispref/commands.texi | 2 +- doc/lispref/errors.texi | 4 ++-- doc/misc/ede.texi | 14 ++++++------- doc/misc/eieio.texi | 14 ++++++------- doc/misc/org.texi | 16 +++++++------- etc/ORG-NEWS | 12 +++++------ lib/stdlib.in.h | 2 +- lisp/ChangeLog | 3 ++- lisp/ChangeLog.10 | 2 +- lisp/cedet/ede.el | 4 ++-- lisp/cedet/ede/auto.el | 4 ++-- lisp/cedet/ede/autoconf-edit.el | 2 +- lisp/cedet/inversion.el | 2 +- lisp/cedet/semantic/bovine/c.el | 4 ++-- lisp/cedet/semantic/complete.el | 3 +-- lisp/cedet/semantic/db-global.el | 2 +- lisp/cedet/semantic/db-typecache.el | 2 +- lisp/cedet/semantic/decorate/include.el | 2 +- lisp/cedet/semantic/fw.el | 4 ++-- lisp/cedet/semantic/lex-spp.el | 2 +- lisp/cedet/semantic/symref/filter.el | 2 +- lisp/cedet/semantic/tag-ls.el | 10 ++++----- lisp/cedet/semantic/tag.el | 4 ++-- lisp/emacs-lisp/eieio-base.el | 6 +++--- lisp/emacs-lisp/timer.el | 2 +- lisp/ido.el | 2 +- lisp/org/ChangeLog | 12 +++-------- lisp/org/org-agenda.el | 28 ++++++++++++------------- lisp/org/org-element.el | 2 +- lisp/org/org-faces.el | 2 +- lisp/org/org-remember.el | 2 +- lisp/proced.el | 2 +- lisp/profiler.el | 2 +- lisp/progmodes/python.el | 2 +- lisp/progmodes/verilog-mode.el | 4 ++-- lisp/subr.el | 2 +- lisp/textmodes/reftex.el | 2 +- lisp/window.el | 4 ++-- src/lread.c | 2 +- src/unexmacosx.c | 2 +- 42 files changed, 96 insertions(+), 102 deletions(-) diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy index 95ac8a0730..f84a414b46 100644 --- a/admin/grammars/srecode-template.wy +++ b/admin/grammars/srecode-template.wy @@ -212,7 +212,7 @@ section-dictionary ; dictionary-entry-list - : ;; emtpy + : ;; empty () | dictionary-entry-list dictionary-entry (append $1 $2) diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 2313d117a9..90bfcf147c 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1065,7 +1065,7 @@ present. Type @kbd{M-x delete-trailing-whitespace} to delete all trailing whitespace. This command deletes all extra spaces at the end of each line in the buffer, and all empty lines at the end of the buffer; to -ignore the latter, change the varaible @code{delete-trailing-lines} to +ignore the latter, change the variable @code{delete-trailing-lines} to @code{nil}. If the region is active, the command instead deletes extra spaces at the end of each line in the region. diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 93dba23701..9ffa2b7485 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -1952,7 +1952,7 @@ position such events have. @defun posnp object This function returns non-@code{nil} if @var{object} is a mouse -oposition list, in either of the formats documented in @ref{Click +position list, in either of the formats documented in @ref{Click Events}); and @code{nil} otherwise. @end defun diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi index b7b26c8708..b28ed6e84c 100644 --- a/doc/lispref/errors.texi +++ b/doc/lispref/errors.texi @@ -148,7 +148,7 @@ The message is @samp{No catch for tag}. @xref{Catch and Throw}. @ignore @c Not actually used for anything? Probably definition should be removed. @item protected-field -The message is @samp{Attempt to modify a protected fiel. +The message is @samp{Attempt to modify a protected file}. @end ignore @item scan-error @@ -205,7 +205,7 @@ of @code{domain-error}. The message is @code{Arithmetic range error}. @item singularity-error -The mssage is @samp{Arithmetic singularity error}. This is a +The message is @samp{Arithmetic singularity error}. This is a subcategory of @code{domain-error}. @item underflow-error diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index b0e149b09b..046cdc9941 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -302,7 +302,7 @@ that file to your target. . a myprogram RET @end example -Note that these promps often have completion, so you can just press +Note that these prompts often have completion, so you can just press @kbd{TAB} to complete the name @file{myprogram}. If you had many files to add to the same target, you could mark them @@ -785,7 +785,7 @@ also supports several debugging tools via @file{android.el}. An arduino project of type @samp{ede-arduino-project} will read your @file{~/.arduino/preferences.txt} file, and identify your sketches. You will still need the Arduino IDE to set up your preferences and -locate your arduino. After quiting the IDE, Emacs will be able to +locate your arduino. After quitting the IDE, Emacs will be able to find your sketches, compile them, and upload them to your arduino. If you have the @file{arduino} command on your path, @ede{} will be @@ -1169,14 +1169,14 @@ Some example project types are: @table @code @item project-am -Autmake project which reads existing Automake files. +Automake project which reads existing Automake files. @item ede-proj-project This project type will create @file{Makefiles}, or @file{Makefile.am} files to compile your project. @item ede-linux This project type will detect linux source trees. @item ede-emacs -This proejct will detect an Emacs source tree. +This project will detect an Emacs source tree. @end table There are several other project types as well. @@ -1291,7 +1291,7 @@ it finds the top of the project. It does this by calling @code{ede-toplevel-project}. If this hasn't already been discovered, the directories as scanned upward one at a time until a directory with no project is found. The last found project becomes the project -root. If the ofund instance of @code{ede-project-autoload} has a +root. If the found instance of @code{ede-project-autoload} has a valid @code{proj-root} slot value, then that function is called instead of scanning the project by hand. Some project types have a short-cut for determining the root of a project, so this comes in handy. @@ -3331,7 +3331,7 @@ Bonus: Return a cons cell: (COMPILED . UPTODATE). @end deffn @deffn Method ede-proj-flush-autoconf :AFTER this -Flush the configure file (current buffer) to accomodate @var{THIS}. +Flush the configure file (current buffer) to accommodate @var{THIS}. @end deffn @deffn Method ede-buffer-mine :AFTER this buffer @@ -3920,7 +3920,7 @@ Return the default macro to 'edit' for this object type. @end deffn @deffn Method project-compile-target-command :AFTER this -Default target t- use when compling a texinfo file. +Default target to use when compiling a texinfo file. @end deffn @deffn Method ede-documentation :AFTER this diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index 9f3625e180..6b3a87f19f 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi @@ -595,7 +595,7 @@ This is the default. @item :depth-first Search for methods in the class hierarchy in a depth first order. @item :c3 -Searches for methods in in a learnarized way that most closely matches +Searches for methods in in a linearized way that most closely matches what CLOS does when a monotonic class structure is defined. @end table @@ -1010,7 +1010,7 @@ This is the default. @item :depth-first Search for methods in the class hierarchy in a depth first order. @item :c3 -Searches for methods in in a learnarized way that most closely matches +Searches for methods in in a linearized way that most closely matches what CLOS does when CLOS when a monotonic class structure is defined. This is derived from the Dylan language documents by @@ -1408,8 +1408,8 @@ provided. Read a persistent object from @var{filename}, and return it. Signal an error if the object in @var{FILENAME} is not a constructor for @var{CLASS}. Optional @var{allow-subclass} says that it is ok for -@code{eieio-peristent-read} to load in subclasses of class instead of -being pendantic." +@code{eieio-persistent-read} to load in subclasses of class instead of +being pedantic. @end defun @node eieio-named @@ -1564,9 +1564,9 @@ texinfo format by using the tools in the file @file{eieio-doc.el} @deffn Command eieiodoc-class class indexstring &optional skiplist -This will start at the current point, and created an indented menu of +This will start at the current point, and create an indented menu of all the child classes of, and including @var{class}, but skipping any -classes that might be in @var{skiplist} It will then create nodes for +classes that might be in @var{skiplist}. It will then create nodes for all these classes, subsection headings, and indexes. Each class will be indexed using the texinfo labeled index @@ -1585,7 +1585,7 @@ where @var{indexstring} is replaced with the two letter code. Next, an inheritance tree will be created listing all parents of that section's class. -Then,all the slots will be expanded in tables, and described +Then, all the slots will be expanded in tables, and described using the documentation strings from the code. Default values will also be displayed. Only those slots with @code{:initarg} specified will be expanded, others will be hidden. If a slot is inherited from a parent, diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 227af8faf1..89c9901846 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -947,7 +947,7 @@ description on Worg}. Installing Info files is system dependent, because of differences in the @file{install-info} program. The Info documentation is installed together with the rest of Org mode. If you don't install Org mode, it is possible to -install the Info documentation seperately (you need to have +install the Info documentation separately (you need to have install-info@footnote{The output from install-info (if any) is system dependent. In particular Debian and its derivatives use two different versions of install-info and you may see the message: @@ -2671,13 +2671,13 @@ durations computations @ref{Durations and time values}. @cindex Lisp forms, as table formulas It is also possible to write a formula in Emacs Lisp. This can be useful -for string manipulation and control structures, if Calc's functionality is -not enough. +for string manipulation and control structures, if Calc's functionality is +not enough. If a formula starts with a single-quote followed by an opening parenthesis, then it is evaluated as a Lisp form. The evaluation should return either a string or a number. Just as with @file{calc} formulas, you can specify modes -and a printf format after a semicolon. +and a printf format after a semicolon. With Emacs Lisp forms, you need to be conscious about the way field references are interpolated into the form. By default, a reference will be @@ -6114,7 +6114,7 @@ is only necessary if you edit the timestamps directly. If you change them with @kbd{S-@key{cursor}} keys, the update is automatic. @orgcmd{C-S-@key{up/down},org-clock-timestamps-up/down} On @code{CLOCK} log lines, increase/decrease both timestamps so that the -clock duration keeps the same. +clock duration keeps the same. @orgcmd{S-M-@key{up/down},org-timestamp-up/down} On @code{CLOCK} log lines, increase/decrease the timestamp at point and the one of the previous (or the next clock) timestamp by the same duration. @@ -16556,7 +16556,7 @@ rely on outline paths, in the hope that these will be unique enough.}. Finally, Org writes the file @file{index.org}, containing links to all other files. @i{MobileOrg} first reads this file from the server, and then downloads all agendas and Org files listed in it. To speed up the download, -MobileOrg will only read files whose checksums@footnote{Checksums are stored +MobileOrg will only read files whose checksums@footnote{Checksums are stored automatically in the file @file{checksums.dat}} have changed. @node Pulling from MobileOrg, , Pushing to MobileOrg, MobileOrg @@ -16704,7 +16704,7 @@ on @file{org-element.el} and @file{org-export.el} has been outstanding, and opened the doors for many new ideas and features. @item Jambunathan K -Jambunathan contributed the ODT exporter, definitly a killer feature of +Jambunathan contributed the ODT exporter, definitely a killer feature of Org mode. He also contributed the new HTML exporter, which is another core feature of Org. Here too, I knew I could rely on him to fix bugs in these areas and to patiently explain the users what was the problems and solutions. @@ -16712,7 +16712,7 @@ areas and to patiently explain the users what was the problems and solutions. @item Achim Gratz Achim rewrote the building process of Org, turning some @emph{ad hoc} tools into a flexible and conceptually clean process. He patiently coped with the -many hicups that such a change can create for users. +many hiccups that such a change can create for users. @item Nick Dokos The Org mode mailing list would not be such a nice place without Nick, who diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 35aab7a0ee..c685194836 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -65,12 +65,12 @@ See http://orgmode.org/elpa/ *** Org Element - =org-element.el= is a toolbox for parsing and analysing "elements" + =org-element.el= is a toolbox for parsing and analyzing "elements" in an Org-mode buffer. This has been written by Nicolas Goaziou and has been tested for quite some time. It is now part of Org's core and many core functions rely on this package. - Two functions might be particularily handy for users: + Two functions might be particularly handy for users: =org-element-at-point= and =org-element-context=. See the docstrings for more details. @@ -539,7 +539,7 @@ supported. **** =:results org= now put results in a =#+BEGIN_SRC org= block =:results org= used to put results in a =#+BEGIN_ORG= block but it now puts -results in a =#+BEGIN_SRC org= block, wich comma-escaped lines. +results in a =#+BEGIN_SRC org= block, with comma-escaped lines. =#+BEGIN_ORG= blocks are obsolete. @@ -552,7 +552,7 @@ It used to exports the results of the code. **** New menu entry for [[doc::org-refile][org-refile]] **** Allow capturing to encrypted entries -If you capture to an encrypted entry, it will be decrpyted before +If you capture to an encrypted entry, it will be decrypted before inserting the template then re-encrypted after finalizing the capture. **** Inactive timestamps are now handled in tables @@ -932,7 +932,7 @@ that Calc formulas can operate on them. **** org-gnus.el now allows link creation from messages - You can now create links from messages. This is particularily + You can now create links from messages. This is particularly useful when the user wants to stored messages that he sends, for later check. Thanks to Ulf Stegemann for the patch. @@ -1115,7 +1115,7 @@ that Calc formulas can operate on them. *** Completion -**** In-buffer completion is now done using John Wiegleys pcomplete.el +**** In-buffer completion is now done using John Wiegley's pcomplete.el Thanks to John Wiegley for much of this code. diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index 8311a2893c..65558402bf 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -458,7 +458,7 @@ _GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - " /* Return the pathname of the pseudo-terminal slave associated with the master FD is open on, or NULL on errors. */ # if @REPLACE_PTSNAME@ -# if !(defined __cplusplus && defined GNULIB_NAMESPCE) +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef ptsname # define ptsname rpl_ptsname # endif diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f6138eaa15..eaef867e9e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -8347,7 +8347,8 @@ 2012-03-18 Leo Liu - * net/rcirc.el (rcirc-cmd-quit): Allow quiting all servers with prefix. + * net/rcirc.el (rcirc-cmd-quit): Allow quitting all servers with + prefix. 2012-03-17 Eli Zaretskii diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index d94d72d0f3..c9085827f7 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -5492,7 +5492,7 @@ 2003-02-14 Dave Love - * international/code-pages.el: Undo `Trailing whitepace deleted.' + * international/code-pages.el: Undo `Trailing whitespace deleted.' damage. (cp1125, mik): Nullify mime-charset. diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index ce3536d53e..22fe362d5d 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el @@ -1358,13 +1358,13 @@ Return the first non-nil value returned by PROC." (defmethod ede-system-include-path ((this ede-project)) "Get the system include path used by project THIS." nil) - + (defmethod ede-system-include-path ((this ede-target)) "Get the system include path used by project THIS." nil) (defmethod ede-source-paths ((this ede-project) mode) - "Get the base to all source trees in the current projet for MODE. + "Get the base to all source trees in the current project for MODE. For example, /src for sources of c/c++, Java, etc, and /doc for doc sources." nil) diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el index f6446db910..152f8130ad 100644 --- a/lisp/cedet/ede/auto.el +++ b/lisp/cedet/ede/auto.el @@ -68,7 +68,7 @@ into memory.") ;; Add new types of dirmatches here. - ;; Error for wierd stuff + ;; Error for weird stuff (t (error "Unknown dirmatch type."))))) @@ -285,7 +285,7 @@ the current buffer." ;; If this file DOES NOT match dirmatch, we set the callfcn ;; to nil, meaning don't load the ede support file for this ;; type of project. If it does match, we will load the file - ;; and use a more accurate programatic match from there. + ;; and use a more accurate programmatic match from there. (unless (ede-project-dirmatch-p file dirmatch) (setq callfcn nil)))) ;; Call into the project support file for a match. diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el index 8144b135ac..ebfb4154d8 100644 --- a/lisp/cedet/ede/autoconf-edit.el +++ b/lisp/cedet/ede/autoconf-edit.el @@ -165,7 +165,7 @@ items such as CHECK_HEADERS." (setq param (substring param (match-end 0)))) (when (string-match "\\s-*\\]?\\s-*\\'" param) (setq param (substring param 0 (match-beginning 0)))) - ;; Look for occurances of backslash newline + ;; Look for occurrences of backslash newline (while (string-match "\\s-*\\\\\\s-*\n\\s-*" param) (setq param (replace-match " " t t param))) param) diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el index 6a13a12e8e..6b0f007916 100644 --- a/lisp/cedet/inversion.el +++ b/lisp/cedet/inversion.el @@ -348,7 +348,7 @@ Optional argument RESERVED is saved for later use." ;;;###autoload (defun inversion-require-emacs (emacs-ver xemacs-ver sxemacs-ver) - "Declare that you need either EMACS-VER, XEMACS-VER or SXEMACE-ver. + "Declare that you need either EMACS-VER, XEMACS-VER or SXEMACS-ver. Only checks one based on which kind of Emacs is being run." (let ((err (inversion-test 'emacs (cond ((featurep 'sxemacs) diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 871bcdd617..02ad6e05d1 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -390,7 +390,7 @@ Pulls out the symbol list, and call `semantic-c-convert-spp-value-to-hideif-valu ;; can then interpret. (let ((stream (semantic-lex-spp-symbol-stream spp-symbol))) (cond - ;; Empyt string means defined, so t. + ;; Empty string means defined, so t. ((null stream) t) ;; A list means a parsed macro stream. ((listp stream) @@ -515,7 +515,7 @@ code to parse." ;; should be skipped. (semantic-c-skip-conditional-section) (setq semantic-lex-end-point (point)) - + ;; @TODO -somewhere around here, we also need to skip ;; other sections of the conditional. diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index f666491d66..61760dd3fe 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -1555,7 +1555,7 @@ number of completions initially. Pressing TAB will show the extended set. Quiet: Only show completions when we have narrowed all -posibilities down to a maximum of +possibilities down to a maximum of `semantic-displayor-tooltip-initial-max-tags' tags. Pressing TAB multiple times will also show completions. @@ -2239,4 +2239,3 @@ will perform the completion." ;; End: ;;; semantic/complete.el ends here - diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el index 0d144483cb..a7bb130810 100644 --- a/lisp/cedet/semantic/db-global.el +++ b/lisp/cedet/semantic/db-global.el @@ -48,7 +48,7 @@ in a GNU Global supported hierarchy. Two sanity checks are performed to assure (a) that GNU global program exists and (b) that the GNU global program version is compatibility with the database version. If optional NOERROR is nil, then an error may be signalled on version -mismatch. If NOERROR is not nil, then no error will be signlled. Instead +mismatch. If NOERROR is not nil, then no error will be signaled. Instead return value will indicate success or failure with non-nil or nil respective values." (interactive diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index 94999a2797..0da98a6d35 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el @@ -584,7 +584,7 @@ If there isn't one, create it. (dolist (P path) (condition-case nil (oset P pointmax nil) - ;; Pointmax may not exist for all tables disovered in the + ;; Pointmax may not exist for all tables discovered in the ;; path. (error nil)) (semantic-reset (semanticdb-get-typecache P))))) diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index ede5c89016..0c2c5e3ce3 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -589,7 +589,7 @@ This means that Semantic cannot find a file associated with this tag on disk, but a database table of tags has been associated with it. This means that the include will still be used to find tags for -searches, but you connot visit this include.\n\n") +searches, but you cannot visit this include.\n\n") (princ "This Header is now represented by the following database table:\n\n ") (princ (object-print table)) ))) diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el index c14ffb7716..5a12047eb7 100644 --- a/lisp/cedet/semantic/fw.el +++ b/lisp/cedet/semantic/fw.el @@ -85,7 +85,7 @@ c))) event)) (defun semantic-popup-menu (menu) - "Blockinig version of `popup-menu'" + "Blocking version of `popup-menu'" (popup-menu menu) ;; Wait... (while (popup-up-p) (dispatch-event (next-event)))) @@ -139,7 +139,7 @@ 'run-mode-hooks 'run-hooks)) - ;; Fancy compat useage now handled in cedet-compat + ;; Fancy compat usage now handled in cedet-compat (defalias 'semantic-subst-char-in-string 'subst-char-in-string) ) diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index 5fe900452a..406f290056 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -646,7 +646,7 @@ be merged recursively." ;; #define FOO(a) foo##a##bar (semantic-lex-spp-symbol-merge (cadr tok))) (t - (message "Invalid merge macro ecountered; \ + (message "Invalid merge macro encountered; \ will return empty string instead.") ""))) txt diff --git a/lisp/cedet/semantic/symref/filter.el b/lisp/cedet/semantic/symref/filter.el index c294fd1727..c6aa48bfbc 100644 --- a/lisp/cedet/semantic/symref/filter.el +++ b/lisp/cedet/semantic/symref/filter.el @@ -101,7 +101,7 @@ tag that contains point, and return that." (semantic-tag-start tag) (semantic-tag-end tag)) (when (called-interactively-p 'interactive) - (message "Found %d occurances of %s in %.2f seconds" + (message "Found %d occurrences of %s in %.2f seconds" Lcount (semantic-tag-name target) (semantic-elapsed-time start (current-time)))) Lcount))) diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el index d6d2c203aa..094ea55428 100644 --- a/lisp/cedet/semantic/tag-ls.el +++ b/lisp/cedet/semantic/tag-ls.el @@ -66,7 +66,7 @@ have values, they must still match." (define-overloadable-function semantic--tag-similar-types-p (tag1 tag2) "Compare the types of TAG1 and TAG2. -This functions can be overriden, for example to compare a fully +This function can be overridden, for example to compare a fully qualified with an unqualified type." (cond ((and (null (semantic-tag-type tag1)) @@ -80,7 +80,7 @@ qualified with an unqualified type." (defun semantic--tag-similar-types-p-default (tag1 tag2) "Compare the types of TAG1 and TAG2. -This functions can be overriden, for example to compare a fully +This function can be overridden, for example to compare a fully qualified with an unqualified type." (semantic-tag-of-type-p tag1 (semantic-tag-type tag2))) @@ -97,7 +97,7 @@ Modes that override this function can call `semantic--tag-attribute-similar-p-de to do the default equality tests if ATTR is not special for that mode.") (defun semantic--tag-attribute-similar-p-default (attr value1 value2 ignorable-attributes) - "For ATTR, VALUE1, VALUE2 and IGNORABLE-ATTRIBUTES, test for similarness." + "For ATTR, VALUE1, VALUE2 and IGNORABLE-ATTRIBUTES, test for similarity." (cond ;; Tag sublists require special testing. ((and (listp value1) (semantic-tag-p (car value1)) @@ -131,7 +131,7 @@ Similar tags that have sub-tags such as arg lists or type members, are similar w/out checking the sub-list of tags. Optional argument IGNORABLE-ATTRIBUTES are attributes to ignore while comparing similarity. By default, `semantic-tag-similar-ignorable-attributes' is referenced for -attributes, and IGNOREABLE-ATTRIBUTES will augment this list. +attributes, and IGNORABLE-ATTRIBUTES will augment this list. Note that even though :name is not an attribute, it can be used to to indicate lax comparison of names via `semantic--tag-similar-names-p'") @@ -207,7 +207,7 @@ Return the name of the first tag of class `package' in STREAM." (define-overloadable-function semantic-tag-full-name (tag &optional stream-or-buffer) "Return the fully qualified name of TAG in the package hierarchy. -STREAM-OR-BUFFER can be anything convertable by `semantic-something-to-stream', +STREAM-OR-BUFFER can be anything convertible by `semantic-something-to-stream', but must be a toplevel semantic tag stream that contains TAG. A Package Hierarchy is defined in UML by the way classes and methods are organized on disk. Some languages use this concept such that a diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el index 08fe467b36..38166871ce 100644 --- a/lisp/cedet/semantic/tag.el +++ b/lisp/cedet/semantic/tag.el @@ -554,7 +554,7 @@ You can identify a faux tag with `semantic-tag-faux-p'" "Set TAG name to NAME." (setcar tag name)) -;;; TAG Proxys +;;; TAG Proxies ;; ;; A new kind of tag is a TAG PROXY. These are tags that have some ;; minimal number of features set, such as name and class, but have a @@ -570,7 +570,7 @@ two arguments, DATA and TAG. TAG is a proxy tag that needs to be resolved, and DATA is the DATA passed into this function. DATA is data to help resolve the proxy. DATA can be an EIEIO object, such that FUNCTION is a method. -FUNCTION should return a list of tags, preferrably one tag." +FUNCTION should return a list of tags, preferably one tag." (let ((sym (make-symbol ":tag-proxy"))) (put sym 'proxy-function function) (put sym 'proxy-data data) diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el index 6677e2c3ab..69fe762887 100644 --- a/lisp/emacs-lisp/eieio-base.el +++ b/lisp/emacs-lisp/eieio-base.el @@ -228,8 +228,8 @@ a file. Optional argument NAME specifies a default file name." "Read a persistent object from FILENAME, and return it. Signal an error if the object in FILENAME is not a constructor for CLASS. Optional ALLOW-SUBCLASS says that it is ok for -`eieio-peristent-read' to load in subclasses of class instead of -being pendantic." +`eieio-persistent-read' to load in subclasses of class instead of +being pedantic." (unless class (message "Unsafe call to `eieio-persistent-read'.")) (when (and class (not (class-p class))) @@ -301,7 +301,7 @@ identified, and needing more object creation." "Validate that in CLASS, the SLOT with PROPOSED-VALUE is good, then fix. A limited number of functions, such as quote, list, and valid object constructor functions are considered valid. -Secondarilly, any text properties will be stripped from strings." +Second, any text properties will be stripped from strings." (cond ((consp proposed-value) ;; Lists with something in them need special treatment. (let ((slot-idx (eieio-slot-name-index class nil slot)) diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 494d8a87e0..08b8ced986 100644 --- a/lisp/emacs-lisp/timer.el +++ b/lisp/emacs-lisp/timer.el @@ -204,7 +204,7 @@ timers). If nil, allocate a new cell." "Insert TIMER into `timer-idle-list'. This arranges to activate TIMER whenever Emacs is next idle. If optional argument DONT-WAIT is non-nil, set TIMER to activate -immediately \(see beloe\), or at the right time, if Emacs is +immediately \(see below\), or at the right time, if Emacs is already idle. REUSE-CELL, if non-nil, is a cons cell to reuse when inserting diff --git a/lisp/ido.el b/lisp/ido.el index 94818fe57b..ffa2604d4f 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -496,7 +496,7 @@ as first char even if `ido-enable-prefix' is nil." ;; See http://debbugs.gnu.org/2042 for more info. (defcustom ido-buffer-disable-smart-matches t "Non-nil means not to re-order matches for buffer switching. -By default, ido aranges matches in the following order: +By default, ido arranges matches in the following order: full-matches > suffix matches > prefix matches > remaining matches diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 066ebf3e6e..ef40c9316c 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -2079,13 +2079,7 @@ * org-agenda.el (org-agenda-list): Ensures that the list returned by `org-agenda-add-time-grid-maybe' is appended to ̀rtnall' before - checking if the latter is emtpy. - -2012-09-30 Christophe Junke (tiny change) - - * org-agenda.el (org-agenda-list): Ensure that the list returned - by `org-agenda-add-time-grid-maybe' is appended to `rtnall' before - checking if the latter is emtpy. + checking if the latter is empty. 2012-09-30 Christophe Rhodes (tiny change) @@ -2691,7 +2685,7 @@ * org-element.el (org-element-paragraph-parser): Fix parsing of paragraph at the beginning of an item. - * org.el (org-mode): Set back comment-start-skip so comment-dwin + * org.el (org-mode): Set back comment-start-skip so comment-dwim can tell a keyword from a comment. * org.el (org-set-autofill-regexps): Install new comment line @@ -2959,7 +2953,7 @@ * org-capture.el (org-capture-fill-template): Expand % escape sequences into text entered for 'th %^{PROMPT} escape. - + * org-capture.el (org-capture-fill-template): Fixed regexp for % expandos to match any positive integer. (org-capture-templates): Updated docstring accordingly. diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 97241b6ac6..32fecde2af 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -823,7 +823,7 @@ because you will take care of it on the day when scheduled." :group 'org-agenda-daily/weekly :version "24.1" :type '(choice - (const :tag "Alwas show prewarning" nil) + (const :tag "Always show prewarning" nil) (const :tag "Remove prewarning if entry is scheduled" t) (integer :tag "Restart prewarning N days before deadline"))) @@ -2837,7 +2837,7 @@ L Timeline for current buffer # List stuck projects (!=configure) (widen) (let ((inhibit-read-only t)) (add-text-properties (point-min) (point-max) - `(org-serie t org-serie-redo-cmd ,redo))) + `(org-series t org-series-redo-cmd ,redo))) (setq org-agenda-redo-command redo) (goto-char (point-min))) (org-agenda-fit-window-to-buffer) @@ -4019,7 +4019,7 @@ given in `org-agenda-start-on-weekday'." `(org-agenda-type agenda org-last-args (,arg ,start-day ,span) org-redo-cmd ,org-agenda-redo-command - org-serie-cmd ,org-cmd)) + org-series-cmd ,org-cmd)) (if (eq org-agenda-show-log-scoped 'clockcheck) (org-agenda-show-clocking-issues)) (org-agenda-finalize) @@ -4324,7 +4324,7 @@ in `org-agenda-text-search-extra-files'." `(org-agenda-type search org-last-args (,todo-only ,string ,edit-at) org-redo-cmd ,org-agenda-redo-command - org-serie-cmd ,org-cmd)) + org-series-cmd ,org-cmd)) (org-agenda-finalize) (setq buffer-read-only t)))) @@ -4414,7 +4414,7 @@ for a keyword. A numeric prefix directly selects the Nth keyword in `(org-agenda-type todo org-last-args ,arg org-redo-cmd ,org-agenda-redo-command - org-serie-cmd ,org-cmd)) + org-series-cmd ,org-cmd)) (org-agenda-finalize) (setq buffer-read-only t)))) @@ -4499,7 +4499,7 @@ The prefix arg TODO-ONLY limits the search to TODO entries." `(org-agenda-type tags org-last-args (,todo-only ,match) org-redo-cmd ,org-agenda-redo-command - org-serie-cmd ,org-cmd)) + org-series-cmd ,org-cmd)) (org-agenda-finalize) (setq buffer-read-only t)))) @@ -6583,7 +6583,7 @@ Org-mode buffers visited directly by the user will not be touched." (org-agenda-Quit)) (defun org-agenda-kill-all-agenda-buffers () - "Kill all buffers in `org-agena-mode'. + "Kill all buffers in `org-agenda-mode'. This is used when toggling sticky agendas. You can also explicitly invoke it with `C-c a C-k'." (interactive) @@ -6623,20 +6623,20 @@ in the agenda." (lprops (get 'org-agenda-redo-command 'org-lprops)) (redo-cmd (get-text-property p 'org-redo-cmd)) (last-args (get-text-property p 'org-last-args)) - (org-agenda-overriding-cmd (get-text-property p 'org-serie-cmd)) + (org-agenda-overriding-cmd (get-text-property p 'org-series-cmd)) (org-agenda-overriding-cmd-arguments (unless (eq all t) (cond ((listp last-args) (cons (or cpa (car last-args)) (cdr last-args))) ((stringp last-args) last-args)))) - (serie-redo-cmd (get-text-property p 'org-serie-redo-cmd))) + (series-redo-cmd (get-text-property p 'org-series-redo-cmd))) (put 'org-agenda-tag-filter :preset-filter nil) (put 'org-agenda-category-filter :preset-filter nil) (and cols (org-columns-quit)) (message "Rebuilding agenda buffer...") - (if serie-redo-cmd - (eval serie-redo-cmd) + (if series-redo-cmd + (eval series-redo-cmd) (org-let lprops '(eval redo-cmd))) (setq org-agenda-undo-list nil org-agenda-pending-undo-list nil) @@ -7035,7 +7035,7 @@ Negative selection means regexp must not match for selection of an entry." (or (and cnt (text-property-any (point-min) (point-max) 'org-day-cnt cnt)) (text-property-any (point-min) (point-max) 'org-today t) (text-property-any (point-min) (point-max) 'org-agenda-type 'agenda) - (and (get-text-property (min (1- (point-max)) (point)) 'org-serie) + (and (get-text-property (min (1- (point-max)) (point)) 'org-series) (org-agenda-goto-block-beginning)) (point-min)))) @@ -7090,7 +7090,7 @@ With prefix ARG, go forward that many times the current span." ;; `cmd' may have been set by `org-agenda-run-series' which ;; uses `org-agenda-overriding-cmd' to decide whether ;; overriding is allowed for `cmd' - (get-text-property (min (1- (point-max)) (point)) 'org-serie-cmd)) + (get-text-property (min (1- (point-max)) (point)) 'org-series-cmd)) (org-agenda-overriding-arguments (list (car args) sd span))) (org-agenda-redo) @@ -7183,7 +7183,7 @@ SPAN may be `day', `week', `month', `year'." org-starting-day)) (sd (org-agenda-compute-starting-span sd span n)) (org-agenda-overriding-cmd - (get-text-property (min (1- (point-max)) (point)) 'org-serie-cmd)) + (get-text-property (min (1- (point-max)) (point)) 'org-series-cmd)) (org-agenda-overriding-arguments (list (car args) sd span))) (org-agenda-redo) diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el index 3d67ae7892..8b44d4936f 100644 --- a/lisp/org/org-element.el +++ b/lisp/org/org-element.el @@ -3924,7 +3924,7 @@ Return Org syntax as a string." (and (eq type 'paragraph) (equal data (car (org-element-contents parent))) (memq (org-element-type parent) - '(footnote-definiton item)))))) + '(footnote-definition item)))))) ""))) (funcall (intern (format "org-element-%s-interpreter" type)) data diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el index cfa4c1c30a..51aead1b8b 100644 --- a/lisp/org/org-faces.el +++ b/lisp/org/org-faces.el @@ -293,7 +293,7 @@ column view defines special faces for each outline level. See the file (((class color) (min-colors 8) (background dark)) (:foreground "red" :inverse-video t)) (t (:inverse-video t)))) "Face for highlighting the calendar day when using `org-read-date'. -Using a bold face here might cause discrepencies while displaying the +Using a bold face here might cause discrepancies while displaying the calendar." :group 'org-faces) diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el index 7a1eb7762d..dd49374929 100644 --- a/lisp/org/org-remember.el +++ b/lisp/org/org-remember.el @@ -64,7 +64,7 @@ and `org-remember-default-headline'. To force prompting anyway, use \\[universal-argument] \\[org-remember-finalize] to file the note. When this variable is nil, \\[org-remember-finalize] gives you the prompts, and -\\[universal-argument] \\[org-remember-finalize] triggers the fasttrack." +\\[universal-argument] \\[org-remember-finalize] triggers the fast track." :group 'org-remember :type 'boolean) diff --git a/lisp/proced.el b/lisp/proced.el index be6cae2ef0..ec41ce65ef 100644 --- a/lisp/proced.el +++ b/lisp/proced.el @@ -1784,7 +1784,7 @@ supported but discouraged. It will be removed in a future version of Emacs." process-alist)))) (unless (and signal process-alist) - ;; Discouraged usge (supported for backward compatibility): + ;; Discouraged usage (supported for backward compatibility): ;; The new calling sequence separates more cleanly between the parts ;; of the code required for interactive and noninteractive calls so that ;; the command can be used more flexibly in noninteractive ways, too. diff --git a/lisp/profiler.el b/lisp/profiler.el index efa23e7aec..5e60595783 100644 --- a/lisp/profiler.el +++ b/lisp/profiler.el @@ -495,7 +495,7 @@ return it." t)))))) (defun profiler-report-collapse-entry () - "Collpase entry at point." + "Collapse entry at point." (interactive) (save-excursion (beginning-of-line) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index b917d3f642..d5aa73f5ef 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -502,7 +502,7 @@ The type returned can be `comment', `string' or `paren'." (and ;; Match even number of backslashes. (or (not (any ?\\ ?\' ?\")) point - ;; Quotes might be preceeded by a escaped quote. + ;; Quotes might be preceded by a escaped quote. (and (or (not (any ?\\)) point) ?\\ (* ?\\ ?\\) (any ?\' ?\"))) (* ?\\ ?\\) diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 86ffdf535a..8c4167b672 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -5148,7 +5148,7 @@ This sets up the appropriate Verilog mode environment, removes whitespace with \\[verilog-delete-trailing-whitespace] on all command-line files, and saves the buffers." (unless noninteractive - (error "Use verilog-batch-delete-trailing-whitepace only with --batch")) ;; Otherwise we'd mess up buffer modes + (error "Use verilog-batch-delete-trailing-whitespace only with --batch")) ;; Otherwise we'd mess up buffer modes (verilog-batch-execute-func `verilog-delete-trailing-whitespace)) (defun verilog-batch-diff-auto () @@ -12161,7 +12161,7 @@ Limitations: Interface names must be resolvable to filenames. See `verilog-auto-inst'. As with other autos, any inputs/outputs declared in the module -will suppress the AUTO from redeclarating an inputs/outputs by +will suppress the AUTO from redeclaring an input/output by the same name. An example: diff --git a/lisp/subr.el b/lisp/subr.el index 8dfe78d8c7..b0ffb0db74 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3170,7 +3170,7 @@ in which case `save-window-excursion' cannot help." (set-window-hscroll window 0) ;; Don't try this with NOFORCE non-nil! (set-window-start window (point-min) t) - ;; This hould not be necessary. + ;; This should not be necessary. (set-window-point window (point-min)) ;; Run `temp-buffer-show-hook', with the chosen window selected. (with-selected-window window diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index 7052dcf473..bdee0fcf1d 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -2466,7 +2466,7 @@ information about your RefTeX version and configuration." "Remember to cover the basics, that is, what you expected to happen and what in fact did happen. -Check if the bug is reproducable with an up-to-date version of +Check if the bug is reproducible with an up-to-date version of RefTeX available from http://www.gnu.org/software/auctex/. If the bug is triggered by a specific \(La\)TeX file, you should try diff --git a/lisp/window.el b/lisp/window.el index 811b1781b4..41af7f9f44 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -701,7 +701,7 @@ SIDE. Return the new window, nil if its creation window failed." (set-window-parameter new 'delete-window 'delete-side-window) ;; Auto-adjust height/width of new window unless a size has been ;; explicitly requested. - (unless (if left-or-right + (unless (if left-or-right (cdr (assq 'window-width alist)) (cdr (assq 'window-height alist))) (setq alist @@ -5615,7 +5615,7 @@ the selected one." buffer window 'reuse alist display-buffer-mark-dedicated))))) (defun display-buffer-at-bottom (buffer alist) - "Try displaying BUFFER in a window at the botom of the selected frame. + "Try displaying BUFFER in a window at the bottom of the selected frame. This either splits the window at the bottom of the frame or the frame's root window, or reuses an existing window at the bottom of the selected frame." diff --git a/src/lread.c b/src/lread.c index 581332502e..a2b6d1f26d 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1700,7 +1700,7 @@ readevalloop (Lisp_Object readcharfun, if (NILP (Ffboundp (macroexpand)) /* Don't macroexpand in .elc files, since it should have been done already. We actually don't know whether we're in a .elc file or not, - so we use circumstancial evidence: .el files normally go through + so we use circumstantial evidence: .el files normally go through Vload_source_file_function -> load-with-code-conversion -> eval-buffer. */ || EQ (readcharfun, Qget_file_char) diff --git a/src/unexmacosx.c b/src/unexmacosx.c index d38b91e955..d304e85d49 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -119,7 +119,7 @@ along with GNU Emacs. If not, see . */ /* LC_DATA_IN_CODE is not defined in mach-o/loader.h on OS X 10.7. But it is used if we build with "Command Line Tools for Xcode 4.5 - (OS X Lion) - Septemper 2012". */ + (OS X Lion) - September 2012". */ #ifndef LC_DATA_IN_CODE #define LC_DATA_IN_CODE 0x29 /* table of non-instructions in __text */ #endif -- 2.20.1