diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-24 23:14:48 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-24 23:14:48 -0800 |
| commit | e4920bc99dfcee02c3bb83b46a761b0893f76626 (patch) | |
| tree | a6165f7a6c45f0b4924bad97b21ab179d3e7707e | |
| parent | fa4fdb5ca559f8aae4137f8d3b974c14c760360d (diff) | |
| download | emacs-e4920bc99dfcee02c3bb83b46a761b0893f76626.tar.gz | |
Spelling fixes.
56 files changed, 110 insertions, 114 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index aa815c552b4..94cf71162df 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -897,11 +897,11 @@ * FOR-RELEASE (NEW FEATURES): Completed work on this item: Rework how fringe bitmaps are defined and used. - Currently, bitmap usage and bitmap appearence are "mixed-up" in a + Currently, bitmap usage and bitmap appearance are "mixed-up" in a one-level representation. It would be cleaner to split the representation into a two-level model where first level maps bitmap usage to a bitmap name, and second level maps bitmap name to - a bitmap appearence. + a bitmap appearance. 2006-01-27 Chong Yidong <cyd@stupidchicken.com> diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 7d1a1186c0a..23d0d5a8f34 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -2040,7 +2040,7 @@ the first argument. This function takes three arguments. Its first argument is the string of characters, the second and third arguments are numbers that indicate the beginning and end of the substring. The numbers are a count of the number of characters (including spaces and -punctuations) from the beginning of the string. +punctuation) from the beginning of the string. @need 800 For example, if you evaluate the following: diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 3a081dddc61..f320b386445 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -3762,7 +3762,7 @@ Additionally, if two fields are separated by another field with the special value @code{boundary}, then any point within this special field is also considered to be ``on the boundary.'' -Commands like @kbd{C-a} with no argumemt, that normally move backward +Commands like @kbd{C-a} with no argument, that normally move backward to a specific kind of location and stay there once there, probably should specify @code{nil} for @var{escape-from-edge}. Other motion commands that check fields should probably pass @code{t}. @@ -4322,5 +4322,3 @@ If you do want modification hooks to be run in a particular piece of code that is itself run from a modification hook, then rebind locally @code{inhibit-modification-hooks} to @code{nil}. @end defvar - - diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 02befc69d4a..57e7dd5871a 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -7982,7 +7982,7 @@ 2003-02-01 Michael Albinus <Michael.Albinus@alcatel.de> * tramp.texi (Frequently Asked Questions): Explain a workaround if - another package loads accidently Ange-FTP. + another package loads accidentally Ange-FTP. 2003-01-24 Michael Albinus <Michael.Albinus@alcatel.de> diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index ecf4c7e47b2..289c08eb00e 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -419,7 +419,7 @@ inserting something. When this is @code{nil}, inserting is only done with @kbd{M-x auto-insert}. When this is @code{function}, you are queried whenever @code{auto-insert} is called as a function, such as when Emacs visits an empty file and you have set the above-mentioned hook. Otherwise -you are alway queried. +you are always queried. @vindex auto-insert-prompt When querying, the variable @code{auto-insert-prompt}'s value is used as a @@ -510,7 +510,7 @@ inserting or updating the magic number. When this is @code{nil} updating is only done with @kbd{M-x executable-set-magic}. When this is @code{function} you are queried whenever @code{executable-set-magic} is called as a function, such as when Emacs puts a buffer in Shell script -mode. Otherwise you are alway queried. +mode. Otherwise you are always queried. @findex executable-self-display @kbd{M-x executable-self-display} adds a magic number to the buffer, which diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 38f46a3dd7b..3aa923cc346 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -21279,7 +21279,7 @@ name (or part of a name) to match. @node The swish++ Engine @subsubsection The swish++ Engine -FIXEM: Say something more here. +FIXME: Say something more here. Documentation for swish++ may be found at the swish++ sourceforge page: @uref{http://swishplusplus.sourceforge.net} @@ -21302,7 +21302,7 @@ to get a group name. By default this is @code{$HOME/Mail}. @node The swish-e Engine @subsubsection The swish-e Engine -FIXEM: Say something more here. +FIXME: Say something more here. Documentation for swish-e may be found at the swish-e homepage @uref{http://swish-e.org} diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 4d828f69bbd..d9062a32572 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -904,7 +904,7 @@ happen---Message will encode non-@acronym{ASCII} domain names in @code{From}, Until @acronym{IDNA} becomes more well known, Message queries you whether @acronym{IDNA} encoding of the domain name really should occur. Some users might not be aware that domain names can contain -non-@acronym{ASCII} now, so this gives them a safety net if they accidently +non-@acronym{ASCII} now, so this gives them a safety net if they accidentally typed a non-@acronym{ASCII} domain name. @vindex message-use-idna diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 34a4ba4f8f3..181e00f8e02 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -7219,7 +7219,7 @@ will be made in the agenda: #+CATEGORY: Holiday %%(org-calendar-holiday) ; special function for holiday names #+CATEGORY: Ann -%%(org-anniversary 1956 5 14)@footnote{@code{org-anniversary} is just like @code{diary-anniversary}, but the argument order is allways according to ISO and therefore independent of the value of @code{calendar-date-style}.} Arthur Dent is %d years old +%%(org-anniversary 1956 5 14)@footnote{@code{org-anniversary} is just like @code{diary-anniversary}, but the argument order is always according to ISO and therefore independent of the value of @code{calendar-date-style}.} Arthur Dent is %d years old %%(org-anniversary 1869 10 2) Mahatma Gandhi would be %d years old @end example @@ -7797,8 +7797,8 @@ Interactively select another agenda view and append it to the current view. @item o Delete other windows. @c -@orgcmdkskc{v d,d,org-aganda-day-view} -@xorgcmdkskc{v w,w,org-aganda-day-view} +@orgcmdkskc{v d,d,org-agenda-day-view} +@xorgcmdkskc{v w,w,org-agenda-day-view} @xorgcmd{v m,org-agenda-month-view} @xorgcmd{v y,org-agenda-month-year} @xorgcmd{v SPC,org-agenda-reset-view} diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index 55b60937fb6..dcfff1fcb96 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -613,7 +613,7 @@ Emacs Lisp. It is an LALR parser suitable for complex languages. @c LocalWords: multitable NAvigaTOR noindent nomedian nonterm noselect @c LocalWords: nosnarf obarray OLE OO outputfile paren parsetable POINT's @c LocalWords: popup positionalonly positiononly positionormarker pre -@c LocalWords: printf printindex Programmatically pt punctuations quotemode +@c LocalWords: printf printindex Programmatically pt quotemode @c LocalWords: ref regex regexp Regexps reparse resetfile samp sb @c LocalWords: scopestart SEmantic semanticdb setfilename setq @c LocalWords: settitle setupfunction sexp sp SPC speedbar speedbar's diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi index d9739b93925..8300e6511a6 100644 --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@ -446,7 +446,7 @@ list. execute when starting SES mode for a buffer). The variable @code{safe-functions} is a list of possibly-unsafe -functions to be treated as safe when analysing formulas and printers. +functions to be treated as safe when analyzing formulas and printers. @xref{Virus protection}. Before customizing @code{safe-functions}, think about how much you trust the person who's suggesting this change. The value @code{t} turns off all anti-virus protection. A diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index e6b0f4fa235..f7f340074a2 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -3573,7 +3573,7 @@ The verbosity levels are When @code{tramp-verbose} is greater than or equal to 4, the messages are also written into a @value{tramp} debug buffer. This debug buffer -is useful for analysing problems; sending a @value{tramp} bug report +is useful for analyzing problems; sending a @value{tramp} bug report should be done with @code{tramp-verbose} set to a verbosity level of at least 6 (@pxref{Bug Reports}). diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS index 4ab75dcfc45..f02b795a6b9 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS @@ -1584,7 +1584,7 @@ message (closes SF #701756). MH-E now supports several spam filters including Bogofilter, SpamProbe, and SpamAssassin. Spam that is mistakenly considered to be good mail can be reclassified as spam with "J b (mh-junk-blacklist)". -Conversely, good mail that is accidently considered to be spam can be +Conversely, good mail that is accidentally considered to be spam can be reclassified with "J w (mh-junk-whitelist)" (closes SF #669518). If a message is blacklisted, and `mh-junk-mail-folder' is a string, diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el index 210aeea7e62..7e108a71a60 100644 --- a/leim/quail/ethiopic.el +++ b/leim/quail/ethiopic.el @@ -53,7 +53,7 @@ C-F9 or `M-x ethio-toggle-space' punctuation followed by zero or more ASCII spaces'. S-F5 or `M-x ethio-toggle-punctuation' - Toggles ASCII punctuations and Ethiopic punctuations for keyboard input. + Toggles ASCII punctuation and Ethiopic punctuation for keyboard input. The current mode is indicated by `.' (ASCII) or `$(3$i(B' (Ethiopic). S-SPC or `M-x ethio-insert-ethio-space' diff --git a/leim/quail/tibetan.el b/leim/quail/tibetan.el index c5c7061663e..ba47155524f 100644 --- a/leim/quail/tibetan.el +++ b/leim/quail/tibetan.el @@ -28,7 +28,7 @@ ;; Created: Feb. 17. 1997 ;; History: -;; 1997.03.13 Support for inputting special signs and punctuations added. +;; 1997.03.13 Support for inputting special signs and punctuation added. ;; (Only Ext. Wylie input) ;;; Commentary: @@ -56,7 +56,7 @@ (if (string-match "^-[dy]" quail-current-key) (setq quail-current-key (substring quail-current-key 1))) (let ((str (tibetan-transcription-to-tibetan quail-current-key))) - ;; If quail-current-key is for punctuations, it can't be + ;; If quail-current-key is for punctuation, it can't be ;; transcribed by tibetan-transcription-to-tibetan, thus STR ;; contains ASCII string now. In that case, use the current ;; characters set in quail-current-str. @@ -80,7 +80,7 @@ '(("-d" . "$(7"2(B") ("-y" . "$(7"B(B"))) -;; Punctuations are not transcribed. +;; Punctuation characters are not transcribed. (defconst tibetan-wylie-punctuation-alist '(("." . " ") diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index cb1d1af577b..bf6f21cd422 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -5904,7 +5904,7 @@ (mis-)use tramp-current-user as indication, assuming it is set in `tramp-completion-handle-file-name-all-completions'. (tramp-send-region): Handle the case `tramp-chunksize' is equal 0. - I did it accidently. Infinite loop ... + I did it accidentally. Infinite loop ... (tramp-get-device): `tramp-make-tramp-file-name' must not be called with NIL path. It fails in case of multi-method. (tramp-file-name-for-operation): Apply `expand-file-name' for diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 1660009aba7..7df2b4b7488 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -10695,7 +10695,7 @@ * net/tramp-smb.el (tramp-smb-wait-for-output): Wait always for the prompt. If it returns earlier (when detecting an error - message), the rest of the output will merge accidently with the + message), the rest of the output will merge accidentally with the output of the next command. Reported by M Jared Finder <jared@hpalace.com>. @@ -16181,7 +16181,7 @@ 2005-12-08 Alan Mackenzie <bug-cc-mode@gnu.org> - * progmodes/cc-awk.el: Move regexps for analysing AWK code to near the + * progmodes/cc-awk.el: Move regexps for analyzing AWK code to near the start of the file. ^L now separate sections of the file. (c-awk-non-eol-esc-pair-re, c-awk-blank-or-comment-line-re) (c-awk-one-line-possibly-open-string-re) diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index 57a9a7b026a..cb39ca5997f 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -9536,7 +9536,7 @@ it@top level. * texnfo-upd.el (texinfo-incorporate-descriptions): Don't - accidently find a string in the description that is confused for + accidentally find a string in the description that is confused for a menu item. 1990-06-01 Robert J. Chassell (bob@wheat-chex) @@ -12454,4 +12454,3 @@ See ChangeLog.2 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index 7aca1b521a2..77ea9fd9d5d 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -530,7 +530,7 @@ composition-function-table. (tibetan-composable-pattern): New variable. (tibetan-subjoined-transcription-alist): Change key "R" to "+R". - (tibetan-precomposition-rule-alist): Move punctuations to + (tibetan-precomposition-rule-alist): Move punctuation to tibetan-punctuation-transcription-alist and tibetan-obsolete-glyphs. (tibetan-punctuation-transcription-alist): New variable. diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el index 6179d304464..f17dfd85fdf 100644 --- a/lisp/cedet/ede/files.el +++ b/lisp/cedet/ede/files.el @@ -249,7 +249,7 @@ Do this whenever a new project is created, as opposed to loaded." "Return a project description object if DIR has a project. Optional argument FORCE means to ignore a hash-hit of 'nomatch. This depends on an up to date `ede-project-class-files' variable. -Any directory that contains the file .ede-ignore will allways +Any directory that contains the file .ede-ignore will always return nil." (when (not (file-exists-p (expand-file-name ".ede-ignore" dir))) (let* ((dirtest (expand-file-name dir)) diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el index ec514194e33..4e233f56a12 100644 --- a/lisp/cedet/ede/proj-shared.el +++ b/lisp/cedet/ede/proj-shared.el @@ -61,7 +61,7 @@ Use ldlibs to add addition libraries.") ; "$(CC_SHARED) -shared $(CFLAGS) $(LDFLAGS) -L. -o $@ $^") ; ) ; :commands '("$(C_SHARED_LINK) %s") - ;; @TODO - addative modification of autoconf. + ;; @TODO - additive modification of autoconf. :autoconf '("AC_PROG_LIBTOOL") ) "Compiler for C sourcecode.") @@ -108,7 +108,7 @@ Use ldlibs to add addition libraries.") :variables '(("CXX_SHARED" . "g++") ("CXX_SHARED_COMPILE" . "$(CXX_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)")) - ;; @TODO - addative modification of autoconf. + ;; @TODO - additive modification of autoconf. :autoconf '("AC_PROG_LIBTOOL") ) "Compiler for C sourcecode.") diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index 1d1184e534f..98b1ab55c32 100644 --- a/lisp/cedet/semantic/grammar.el +++ b/lisp/cedet/semantic/grammar.el @@ -104,10 +104,10 @@ It ignores whitespaces, newlines and comments." ;; regexp match semicolons inside strings! semantic-lex-ignore-comments ;; Must detect prefixed list before punctuation because prefix chars - ;; are also punctuations! + ;; are also punctuation! semantic-grammar-wy--<qlist>-sexp-analyzer - ;; Must detect punctuations after comments because the semicolon can - ;; be a punctuation or a comment start! + ;; Must detect punctuation after comments because the semicolon can + ;; be punctuation or a comment start! semantic-grammar-wy--<punctuation>-string-analyzer semantic-grammar-wy--<block>-block-analyzer semantic-grammar-wy--<sexp>-sexp-analyzer) diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index fca367ecb8c..ba43ba657a1 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -165,7 +165,7 @@ ;; ;; %type <punctuation> syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string ;; -;; ;; Some punctuations based on the type defines above +;; ;; Some punctuation based on the type defines above ;; ;; %token <punctuation> NOT "!" ;; %token <punctuation> NOTEQ "!=" @@ -1313,7 +1313,7 @@ and number formats." (define-lex-analyzer semantic-lex-punctuation-type "Detect and create a punctuation type token. -Recognized punctuations are defined in the current table of lexical +Recognized punctuation is defined in the current table of lexical types, as the value of the `punctuation' token type." (and (looking-at "\\(\\s.\\|\\s$\\|\\s'\\)+") (let* ((key (match-string 0)) diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el index 5399d4d5649..b4618d1c18f 100644 --- a/lisp/cedet/semantic/senator.el +++ b/lisp/cedet/semantic/senator.el @@ -179,8 +179,8 @@ source." (goto-char (semantic-tag-start tag)) (when (re-search-forward (concat ;; The tag name is expected to be - ;; between word delimiters, whitespaces, - ;; or punctuations. + ;; between word delimiters, whitespace, + ;; or punctuation. "\\(\\<\\|\\s-+\\|\\s.\\)" (regexp-quote name) "\\(\\>\\|\\s-+\\|\\s.\\)") diff --git a/lisp/color.el b/lisp/color.el index 487e280dd59..96b79a4ace2 100644 --- a/lisp/color.el +++ b/lisp/color.el @@ -128,8 +128,8 @@ inclusive." RED, GREEN, and BLUE should each be numbers between 0.0 and 1.0, inclusive. -Return a list (HUE, SATURATION, LUMINENCE), where HUE is in radians -and both SATURATION and LUMINENCE are between 0.0 and 1.0, +Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians +and both SATURATION and LUMINANCE are between 0.0 and 1.0, inclusive." (let* ((r red) (g green) diff --git a/lisp/follow.el b/lisp/follow.el index 72a091e8ce2..3badb381c57 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -98,7 +98,7 @@ ;; (global-set-key [f7] 'follow-delete-other-windows-and-split) -;; There exist two system variables that control the appearence of +;; There exist two system variables that control the appearance of ;; lines wider than the window containing them. The default is to ;; truncate long lines whenever a window isn't as wide as the frame. ;; diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index eed5f921c57..de5f5e0b7c4 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -2778,7 +2778,7 @@ 2011-01-28 Lars Ingebrigtsen <larsi@gnus.org> * gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active - data if the group is unactivated. + data if the group is deactivated. 2011-01-28 Julien Danjou <julien@danjou.info> diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el index f913ddb5378..3ee72bc5fc6 100644 --- a/lisp/gnus/gmm-utils.el +++ b/lisp/gnus/gmm-utils.el @@ -217,7 +217,7 @@ This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility." 'static-color 'pseudo-color))))) 'gnome 'retro) - "Prefered tool bar style." + "Preferred tool bar style." :type '(choice (const :tag "GNOME style" gnome) (const :tag "Retro look" retro)) :group 'gmm) diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 9d358969062..02c37f22774 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -1354,9 +1354,9 @@ if it is a string, only list groups matching REGEXP." (predicate t) ; We list all groups? (t (or - (if (eq unread t) ; Unactivated? + (if (eq unread t) ; Deactivated? gnus-group-list-inactive-groups - ; We list unactivated + ; We list inactive (and (numberp unread) (> unread 0))) ; We list groups with unread articles (and gnus-list-groups-with-ticked-articles diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el index 17af1a38333..87ca27adcf4 100644 --- a/lisp/gnus/gnus-topic.el +++ b/lisp/gnus/gnus-topic.el @@ -582,7 +582,7 @@ articles in the topic and its subtopics." (or gnus-topic-display-empty-topics ;We want empty topics (not (zerop unread)) ;Non-empty tick ;Ticked articles - (/= point-max (point-max)))) ;Unactivated groups + (/= point-max (point-max)))) ;Inactive groups (gnus-extent-start-open (point)) (gnus-topic-insert-topic-line (car type) visiblep diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 36c56e0921b..44e2af5b904 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -360,7 +360,7 @@ to: (\"text/html\" \"text/richtext\") Adding \"image/.*\" might also be useful. Spammers use it as the -prefered part of multipart/alternative messages. See also +preferred part of multipart/alternative messages. See also `gnus-buttonized-mime-types', to which adding \"multipart/alternative\" enables you to choose manually one of two types those mails include." :type '(repeat regexp) ;; See `mm-preferred-alternative-precedence'. diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el index feed078034c..f1cb1f69e56 100644 --- a/lisp/gnus/rfc2047.el +++ b/lisp/gnus/rfc2047.el @@ -586,7 +586,7 @@ should not change this value.") ((>= column rfc2047-encode-max-chars) (when eword (cond ((string-match "\n[ \t]+\\'" eword) - ;; Reomove a superfluous empty line. + ;; Remove a superfluous empty line. (setq eword (substring eword 0 (match-beginning 0)))) ((string-match "(+\\'" eword) ;; Break the line before the open parenthesis. @@ -639,7 +639,7 @@ should not change this value.") (setq crest " " eword (concat eword next))) (when (string-match "\n[ \t]+\\'" eword) - ;; Reomove a superfluous empty line. + ;; Remove a superfluous empty line. (setq eword (substring eword 0 (match-beginning 0)))) (rfc2047-encode-1 (length crest) (substring string index) cs encoder start " " tail diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el index 58dbebf4c5a..af9fd42c127 100644 --- a/lisp/gnus/starttls.el +++ b/lisp/gnus/starttls.el @@ -35,7 +35,7 @@ ;; and the second one is Simon Josefsson's starttls.el which uses ;; "gnutls-cli" from GnuTLS. ;; -;; If "starttls" is available, it is prefered by the code over +;; If "starttls" is available, it is preferred by the code over ;; "gnutls-cli", for backwards compatibility. Use ;; `starttls-use-gnutls' to toggle between implementations if you have ;; both tools installed. It is recommended to use GnuTLS, though, as diff --git a/lisp/help.el b/lisp/help.el index 506889c210e..36d49aae9b3 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -969,7 +969,7 @@ This is effective only when Temp Buffer Resize mode is enabled. The value is the maximum height (in lines) which `resize-temp-buffer-window' will give to a window displaying a temporary buffer. It can also be a function to be called to -choose the height for such a buffer. It gets one argumemt, the +choose the height for such a buffer. It gets one argument, the buffer, and should return a positive integer. At the time the function is called, the window to be resized is selected." :type '(choice integer function) diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 58a08f4506f..d078d98a480 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -703,13 +703,13 @@ If the value is nil, on decoding, don't treat the first two-byte as BOM, and on encoding, don't produce BOM bytes. If the value is t, on decoding, skip the first two-byte as BOM, and on -encoding, produce BOM bytes accoding to the value of `:endian'. +encoding, produce BOM bytes according to the value of `:endian'. If the value is cons, on decoding, check the first two-byte. If they are 0xFE 0xFF, use the car part coding system of the value. If they are 0xFF 0xFE, use the cdr part coding system of the value. Otherwise, treat them as bytes for a normal character. On encoding, -produce BOM bytes accoding to the value of `:endian'. +produce BOM bytes according to the value of `:endian'. This attribute has a meaning only when `:coding-type' is `utf-16' or `utf-8'. diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index 0ba0b9085b9..6614ac8b416 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -128,11 +128,11 @@ SPC, 1, 2, 3, or 4 specifing a tone (SPC:$(0?v(N(B, 1:$(0M=Vy(B, 2:$(0Dm(N \\<quail-translation-docstring>") ("chinese-punct-b5" "$(0O:(BB" - "Input method for Chinese punctuations and symbols of Big5 + "Input method for Chinese punctuation and symbols of Big5 \(`chinese-big5-1' and `chinese-big5-2').") ("chinese-punct" "$A1j(BG" - "Input method for Chinese punctuations and symbols of GB2312 + "Input method for Chinese punctuation and symbols of GB2312 \(`chinese-gb2312').") ("chinese-py-b5" "$(03<(BB" @@ -801,36 +801,36 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"." (setq dic (sort dic (function (lambda (x y) (string< (car x ) (car y)))))) (dolist (elt dic) (insert (format "(%S\t%S)\n" (car elt) (cdr elt)))) - (let ((punctuations '((";" "$(0!'!2!"!#!.!/(B" "$(G!'!2!"!#!.!/(B") - (":" "$(0!(!+!3!%!$!&!0!1(B" "$(G!(!+!3!%!$!&!0!1(B") - ("'" "$(0!e!d(B" "$(G!e!d(B") - ("\"" "$(0!g!f!h!i!q(B" "$(G!g!f!h!i!q(B") - ("\\" "$(0"`"b#M(B" "$(G"`"b#M(B") - ("|" "$(0!6!8!:"^(B" "$(G!6!8!:"^(B") - ("/" "$(0"_"a#L(B" "$(G"_"a#L(B") - ("?" "$(0!)!4(B" "$(G!)!4(B") - ("<" "$(0!R"6"A!T"H(B" "$(G!R"6"A!T"H(B") - (">" "$(0!S"7"B!U(B" "$(G!S"7"B!U(B") - ("[" "$(0!F!J!b!H!L!V!Z!X!\(B" "$(G!F!J!b!H!L!V!Z!X!\(B") - ("]" "$(0!G!K!c!I!M!W![!Y!](B" "$(G!G!K!c!I!M!W![!Y!](B") - ("{" "$(0!B!`!D(B " "$(G!B!`!D(B ") - ("}" "$(0!C!a!E(B" "$(G!C!a!E(B") - ("`" "$(0!j!k(B" "$(G!j!k(B") - ("~" "$(0"D"+",!<!=(B" "$(G"D"+",!<!=(B") - ("!" "$(0!*!5(B" "$(G!*!5(B") - ("@" "$(0"i"n(B" "$(G"i"n(B") - ("#" "$(0!l"-(B" "$(G!l"-(B") - ("$" "$(0"c"l(B" "$(G"c"l(B") - ("%" "$(0"h"m(B" "$(G"h"m(B") - ("&" "$(0!m".(B" "$(G!m".(B") - ("*" "$(0!n"/!o!w!x(B" "$(G!n"/!o!w!x(B") - ("(" "$(0!>!^!@(B" "$(G!>!^!@(B") - (")" "$(0!?!_!A(B" "$(G!?!_!A(B") - ("-" "$(0!7!9"#"$"1"@(B" "$(G!7!9"#"$"1"@(B") - ("_" "$(0"%"&(B" "$(G"%"&(B") - ("=" "$(0"8"C(B" "$(G"8"C(B") - ("+" "$(0"0"?(B" "$(G"0"?(B")))) - (dolist (elt punctuations) + (let ((punctuation '((";" "$(0!'!2!"!#!.!/(B" "$(G!'!2!"!#!.!/(B") + (":" "$(0!(!+!3!%!$!&!0!1(B" "$(G!(!+!3!%!$!&!0!1(B") + ("'" "$(0!e!d(B" "$(G!e!d(B") + ("\"" "$(0!g!f!h!i!q(B" "$(G!g!f!h!i!q(B") + ("\\" "$(0"`"b#M(B" "$(G"`"b#M(B") + ("|" "$(0!6!8!:"^(B" "$(G!6!8!:"^(B") + ("/" "$(0"_"a#L(B" "$(G"_"a#L(B") + ("?" "$(0!)!4(B" "$(G!)!4(B") + ("<" "$(0!R"6"A!T"H(B" "$(G!R"6"A!T"H(B") + (">" "$(0!S"7"B!U(B" "$(G!S"7"B!U(B") + ("[" "$(0!F!J!b!H!L!V!Z!X!\(B" "$(G!F!J!b!H!L!V!Z!X!\(B") + ("]" "$(0!G!K!c!I!M!W![!Y!](B" "$(G!G!K!c!I!M!W![!Y!](B") + ("{" "$(0!B!`!D(B " "$(G!B!`!D(B ") + ("}" "$(0!C!a!E(B" "$(G!C!a!E(B") + ("`" "$(0!j!k(B" "$(G!j!k(B") + ("~" "$(0"D"+",!<!=(B" "$(G"D"+",!<!=(B") + ("!" "$(0!*!5(B" "$(G!*!5(B") + ("@" "$(0"i"n(B" "$(G"i"n(B") + ("#" "$(0!l"-(B" "$(G!l"-(B") + ("$" "$(0"c"l(B" "$(G"c"l(B") + ("%" "$(0"h"m(B" "$(G"h"m(B") + ("&" "$(0!m".(B" "$(G!m".(B") + ("*" "$(0!n"/!o!w!x(B" "$(G!n"/!o!w!x(B") + ("(" "$(0!>!^!@(B" "$(G!>!^!@(B") + (")" "$(0!?!_!A(B" "$(G!?!_!A(B") + ("-" "$(0!7!9"#"$"1"@(B" "$(G!7!9"#"$"1"@(B") + ("_" "$(0"%"&(B" "$(G"%"&(B") + ("=" "$(0"8"C(B" "$(G"8"C(B") + ("+" "$(0"0"?(B" "$(G"0"?(B")))) + (dolist (elt punctuation) (insert (format "(%S %S)\n" (concat "z" (car elt)) (if big5-p (nth 1 elt) (nth 2 elt)))))) (insert ")\n"))) @@ -1017,7 +1017,7 @@ To input words of more than three letters, you type 4 keys, initials of the first three letters and the last letter. For instance, \"bjdt\" inputs $A11>)5gJSL((B. -To input symbols and punctuations, type `/' followed by one of `a' to +To input symbols and punctuation, type `/' followed by one of `a' to `z', then select one of the candidates.")) (insert " '((\"\C-?\" . quail-delete-last-char) (\".\" . quail-next-translation) diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index 444f4d519da..1d93d981f8e 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el @@ -802,7 +802,7 @@ The 2nd and 3rd arguments BEGIN and END specify the region." (forward-char 1) (insert "}"))) - ;; Special Ethiopic punctuations. + ;; Special Ethiopic punctuation. (goto-char (point-min)) (while (re-search-forward "\\ce[»\\.\\?]\\|«\\ce" nil t) (cond diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el index 8458974e753..fd23bbb6d54 100644 --- a/lisp/language/tibet-util.el +++ b/lisp/language/tibet-util.el @@ -27,7 +27,7 @@ ;;; History: ;; 1997.03.13 Modification in treatment of text properties; -;; Support for some special signs and punctuations. +;; Support for some special signs and punctuation. ;; 1999.10.25 Modification for a new composition way by K.Handa. ;;; Commentary: diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el index c80b22c696d..1607868dea5 100644 --- a/lisp/language/tibetan.el +++ b/lisp/language/tibetan.el @@ -30,7 +30,7 @@ ;;; History: -;; 1997.03.13 Modification for special signs and punctuations. +;; 1997.03.13 Modification for special signs and punctuation. ;;; Commentary: @@ -44,7 +44,7 @@ ;;; ;;; 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F ;;;2120 // $(7!!(B $(7!"(B $(7!#(B $(7!$(B $(7!%(B $(7!&(B $(7!'(B $(7!((B $(7!)(B $(7!*(B $(7!+(B $(7!,(B $(7!-(B $(7!.(B $(7!/(B ; obsolete glyphs (2123-5) -;;;2130 $(7!0(B $(7!1(B $(7!2(B $(7!3(B $(7!4(B $(7!5(B $(7!6(B $(7!7(B $(7!8(B $(7!9(B $(7!:(B $(7!;(B $(7!<(B $(7!=(B $(7!>(B $(7!?(B ; Punctuations, +;;;2130 $(7!0(B $(7!1(B $(7!2(B $(7!3(B $(7!4(B $(7!5(B $(7!6(B $(7!7(B $(7!8(B $(7!9(B $(7!:(B $(7!;(B $(7!<(B $(7!=(B $(7!>(B $(7!?(B ; Punctuation, ;;;2140 $(7!@(B $(7!A(B $(7!B(B $(7!C(B $(7!D(B $(7!E(B $(7!F(B $(7!G(B $(7!H(B $(7!I(B $(7!J(B $(7!K(B $(7!L(B $(7!M(B $(7!N(B $(7!O(B ; Digits and ;;;2150 $(7!P(B $(7!Q(B $(7!R(B $(7!S(B $(7!T(B $(7!U(B $(7!V(B $(7!W(B $(7!X(B $(7!Y(B $(7!Z(B $(7 to the + provide a universal argument (\\[universal-argument]) to the TOPIC creation command, or when explictly rebulleting a TOPIC. The significance of the various distinctive bullets is purely by convention. See the documentation for the above bullet strings for diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 6bdd96c0fcc..02e531120be 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -2674,7 +2674,7 @@ Follow MH-E Developers Guide conventions. Use `' quotes for Help hyperlinks such as symbols, Info nodes, or URLs. Use \" quotes for - everything else. Otherwise, you can accidently get links to + everything else. Otherwise, you can accidentally get links to nonsense symbols. 2005-12-22 Bill Wohler <wohler@newt.com> @@ -3456,4 +3456,3 @@ ;; sentence-end-double-space: nil ;; add-log-time-zone-rule: t ;; End: - diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el index 87ff0b4060f..af8bc084b57 100644 --- a/lisp/net/eudc-export.el +++ b/lisp/net/eudc-export.el @@ -128,7 +128,7 @@ LOCATION is used as the address location for bbdb." zip city state) (setq addr-components (nreverse addr-components)) ;; If not containing the zip code the last line is supposed to contain a - ;; country name and the addres is supposed to be in european style + ;; country name and the address is supposed to be in european style (if (not (string-match "[0-9][0-9][0-9]" last1)) (progn (setq state last1) diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el index 7e0eaff1dce..1a48e8863f1 100644 --- a/lisp/net/secrets.el +++ b/lisp/net/secrets.el @@ -729,7 +729,7 @@ to their attributes." ;; Create the search buffer. (with-current-buffer (get-buffer-create "*Secrets*") (switch-to-buffer-other-window (current-buffer)) - ;; Inialize buffer with `secrets-mode'. + ;; Initialize buffer with `secrets-mode'. (secrets-mode) (secrets-show-collections)))) diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index fda88351253..df841bade79 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -996,7 +996,7 @@ ADDRESS can have the form \"xx:xx:xx:xx:xx:xx\" or \"[xx:xx:xx:xx:xx:xx]\"." (let ((signal-name (dbus-event-member-name last-input-event)) (elt mount-info)) ;; Jump over the first elements of the mount info. Since there - ;; were changes in the antries, we cannot access dedicated + ;; were changes in the entries, we cannot access dedicated ;; elements. (while (stringp (car elt)) (setq elt (cdr elt))) (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt))) @@ -1066,7 +1066,7 @@ ADDRESS can have the form \"xx:xx:xx:xx:xx:xx\" or \"[xx:xx:xx:xx:xx:xx]\"." tramp-gvfs-interface-mounttracker "listMounts")) nil) ;; Jump over the first elements of the mount info. Since there - ;; were changes in the antries, we cannot access dedicated + ;; were changes in the entries, we cannot access dedicated ;; elements. (while (stringp (car elt)) (setq elt (cdr elt))) (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt))) diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el index 907c99a7e86..ab817a43885 100644 --- a/lisp/net/xesam.el +++ b/lisp/net/xesam.el @@ -820,7 +820,7 @@ search, is returned." (with-current-buffer (generate-new-buffer (xesam-buffer-name service search)) (switch-to-buffer-other-window (current-buffer)) - ;; Inialize buffer with `xesam-mode'. `xesam-vendor' must be + ;; Initialize buffer with `xesam-mode'. `xesam-vendor' must be ;; set before calling `xesam-mode', because we want to give the ;; hook functions a chance to identify their search engine. (setq xesam-vendor (xesam-get-cached-property engine "vendor.id")) diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 94346a4944a..1c8a3e72956 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -17596,7 +17596,7 @@ 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-schedule, org-deadline): Protect scheduled and - deadline tasks against changes that accidently remove the + deadline tasks against changes that accidentally remove the repeater. Also show a message with the new date when done. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/printing.el b/lisp/printing.el index d6c67cc68a6..2dea24149a7 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -547,7 +547,7 @@ Please send all bug fixes and enhancements to ;; `pr-auto-region' Non-nil means region is automagically detected. ;; ;; `pr-auto-mode' Non-nil means major-mode specific printing is -;; prefered over normal printing. +;; preferred over normal printing. ;; ;; `pr-mode-alist' Specify an alist for a major-mode and printing ;; function. @@ -2426,7 +2426,7 @@ marked instead of all buffer." (defcustom pr-auto-mode t - "Non-nil means major-mode specific printing is prefered over normal printing. + "Non-nil means major-mode specific printing is preferred over normal printing. That is, if current major-mode is declared in `pr-mode-alist', the `*-buffer*' and `*-region*' commands will behave like `*-mode*' commands; otherwise, @@ -5458,7 +5458,7 @@ If menu binding was not done, calls `pr-menu-bind'." (defun pr-toggle-mode-menu (&optional no-menu) - "Toggle whether major-mode specific printing is prefered over normal printing." + "Toggle whether major-mode specific printing is preferred over normal printing." (interactive) (pr-toggle 'pr-auto-mode "Auto mode" 'printing 1 12 'toggle nil no-menu)) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 9352725384b..07359539256 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -7650,7 +7650,7 @@ $~ The name of the current report format. ... &= ... Bitwise and assignment. ... * ... Multiplication. ... ** ... Exponentiation. -*NAME Glob: all objects refered by NAME. *NAM1 = *NAM2 aliases NAM1 to NAM2. +*NAME Glob: all objects referred by NAME. *NAM1 = *NAM2 aliases NAM1 to NAM2. &NAME(arg0, ...) Subroutine call. Arguments go to @_. ... + ... Addition. +EXPR Makes EXPR into scalar context. ++ Auto-increment (magical on strings). ++EXPR EXPR++ diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 30df073df12..b1c6e367ef7 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -3811,7 +3811,7 @@ Ediff Control Panel to restore highlighting." ;; later, and nconc above will break it. Either this or use slow ;; append instead of nconc (selected-buffers (ediff-get-selected-buffers)) - (prefered-buffer (car all-buffers)) + (preferred-buffer (car all-buffers)) visible-dired-buffers (excl-buff-name-list (mapcar @@ -3841,7 +3841,7 @@ Ediff Control Panel to restore highlighting." (cond ((member (buffer-name x) excl-buff-name-list) nil) ((memq x selected-buffers) x) ((not (ediff-get-visible-buffer-window x)) nil) - ((eq x prefered-buffer) x) + ((eq x preferred-buffer) x) ;; if prev selected buffer is dired, look only at ;; dired. ((eq use-dired-major-mode 'yes) diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 20361d32450..1f54b8577c3 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -384,7 +384,7 @@ bit output with no translation." ;; ;; If Unicode Windows charset is not defined, use ansi fonts. ;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)) -;; Prefered names +;; Preferred names (w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950) (w32-add-charset-info "gb2312.1980-0" 'w32-charset-gb2312 936) (w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932) diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index ada5e0f78ef..6acc09c2164 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -1003,7 +1003,7 @@ (syms_of_xdisp): DEFVAR_LISP and initialize it. Update doc string to describe new value `grow-only', and use of C-l. (display_tool_bar_line): Only use default face for border below - toolbar if not grow-only (to get acceptable visual appearence). + toolbar if not grow-only (to get acceptable visual appearance). Explicitly set visible_height for empty toolbar lines. (redisplay_tool_bar): Handle `grow-only' setting. Check and clear minimize_tool_bar_window_p flag. diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index e21af17657f..6bc83055c7b 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -8018,7 +8018,7 @@ * xterm.c (x_scroll_run): Renamed from do_line_dance. - * xdisp.c (redisplay_window): For window-based redisplay, alway + * xdisp.c (redisplay_window): For window-based redisplay, always try try_window_id. * xterm.c (struct glyph_string): New member two_byte_p that is diff --git a/src/callint.c b/src/callint.c index 61ab4a3963e..80e24f6c8ee 100644 --- a/src/callint.c +++ b/src/callint.c @@ -78,7 +78,7 @@ c -- Character (no input method is used). C -- Command name: symbol with interactive function definition. d -- Value of point as number. Does not do I/O. D -- Directory name. -e -- Parametrized event (i.e., one that's a list) that invoked this command. +e -- Parameterized event (i.e., one that's a list) that invoked this command. If used more than once, the Nth `e' returns the Nth parameterized event. This skips events that are integers or symbols. f -- Existing file name. diff --git a/src/ccl.c b/src/ccl.c index 84d7a6a25ff..b7228a4d1cd 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -561,7 +561,7 @@ static Lisp_Object Vccl_program_table; If VALn is lambda, move to the next map set like reaching to the end of the current map set. - If VALn is a symbol, call the CCL program refered by it. + If VALn is a symbol, call the CCL program referred by it. Then, use reg[rrr] as a mapped value except for -1, -2 and -3. Such special values are regarded as nil, t, and lambda respectively. @@ -66,7 +66,7 @@ struct cm location */ unsigned int cm_autolf:1; /* \r performs a \r\n (rn) */ - /* Parametrized capabilities. This needs to be a struct since + /* Parameterized capabilities. This needs to be a struct since the costs are accessed through pointers. */ #if 0 diff --git a/src/fringe.c b/src/fringe.c index 61fd2f2b998..da896e07b76 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -35,7 +35,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ Logical bitmaps are used internally to denote things like 'end-of-buffer', 'left-truncation', 'overlay-arrow', etc. - Physical bitmaps specify the visual appearence of the bitmap, + Physical bitmaps specify the visual appearance of the bitmap, e.g. 'bottom-left-angle', 'left-arrow', 'left-triangle', etc. User defined bitmaps are physical bitmaps. diff --git a/src/process.c b/src/process.c index a02ba44ae71..892bd9820bf 100644 --- a/src/process.c +++ b/src/process.c @@ -3717,7 +3717,7 @@ DEFUN ("network-interface-info", Fnetwork_interface_info, Snetwork_interface_inf doc: /* Return information about network interface named IFNAME. The return value is a list (ADDR BCAST NETMASK HWADDR FLAGS), where ADDR is the layer 3 address, BCAST is the layer 3 broadcast address, -NETMASK is the layer 3 network mask, HWADDR is the layer 2 addres, and +NETMASK is the layer 3 network mask, HWADDR is the layer 2 address, and FLAGS is the current flags of the interface. */) (Lisp_Object ifname) { |