From: Paul Eggert Date: Thu, 16 Jan 2014 06:24:06 +0000 (-0800) Subject: Spelling fixes. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~367 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c91c771dbe242cd942c00a0a57c18c1482e59fa0;p=emacs.git Spelling fixes. --- diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy index a772c212360..4605e3c4f70 100644 --- a/admin/grammars/grammar.wy +++ b/admin/grammars/grammar.wy @@ -94,7 +94,7 @@ %token LBRACE "{" %token RBRACE "}" -;; Punctuations +;; Punctuation %type %token COLON ":" %token SEMI ";" diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy index a01d64ec093..91dbff2330d 100644 --- a/admin/grammars/js.wy +++ b/admin/grammars/js.wy @@ -65,7 +65,7 @@ (start end &optional nonterminal depth returnonerror)) } -;; JAVE I prefere ecmascript-mode +;; JAVE I preferred ecmascript-mode. %languagemode ecmascript-mode javascript-mode ;; The default goal @@ -276,8 +276,8 @@ Statement : Block | BreakStatement | ReturnStatement | WithStatement - ; - + ; + FunctionDeclaration : FUNCTION VARIABLE FormalParameterListBlock Block (FUNCTION-TAG $2 nil $3) ; @@ -353,7 +353,7 @@ IterationExpression : WHILE OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS Statem ContinueStatement : CONTINUE SEMICOLON ; -;;JAVE break needs labels +;;JAVE break needs labels BreakStatement : BREAK SEMICOLON ;; | BREAK identifier SEMICOLON ; diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi index 033e031b648..a0fcd9e2e94 100644 --- a/doc/misc/srecode.texi +++ b/doc/misc/srecode.texi @@ -822,7 +822,7 @@ from the name, like this: @node Contexts @section Context -Each template belongs to a context. When promting for a template by +Each template belongs to a context. When prompting for a template by name, such as with @kbd{C-c / /}, the name is prefixed by the current context. If there is no context, it defaults to @code{declaration}. diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi index c8a56ea3414..3ee080f50e0 100644 --- a/doc/misc/wisent.texi +++ b/doc/misc/wisent.texi @@ -131,7 +131,7 @@ June 1985, Report No. UCB/CSD 85/251. @item For generating the lookahead sets, Wisent uses the well-known -technique of F. DeRemer and A. Pennello described in: +technique of F. DeRemer and T. Pennello described in: @quotation @cite{Efficient Computation of LALR(1) Look-Ahead Sets}@* October 1982, ACM TOPLAS Vol 4 No 4, 615--49, diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF index 850c1c942bf..66a974b948c 100644 --- a/etc/ETAGS.EBNF +++ b/etc/ETAGS.EBNF @@ -11,7 +11,7 @@ This file contains two sections: ====================== 1) EBNF tag file description ===================== Productions created from current behavior to aid extensions -Francesco Potorti` 2002 +Francesco Potortì 2002 ---------------- FF ::= #x0c /* tag section starter */ diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS index 29a2c80dd42..f4308cedfbc 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS @@ -3205,7 +3205,7 @@ current folder. *** New function `mh-version' displays version information about MH and mh-e. Please use the output in bug reports. -*** `mh-quit' now burys the folder buffer and show buffer. +*** `mh-quit' now buries the folder buffer and show buffer. ** New hooks and customization variables in mh-e 4.0 diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 5f80ccdd60b..3941a63ff2b 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -5009,7 +5009,7 @@ 1999-06-23 Dave Love * etags.c (erlang_attribute): Fix undefined variable usage (after - Potorti). + Potortì). 1999-05-02 Andrew Innes diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index 66ac43a48d2..767b4dd46ab 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -10103,7 +10103,7 @@ 1990-02-07 David Lawrence (tale@galapas) - * inf-lisp.el: inferior-lisp-program can be a list of the programme + * inf-lisp.el: inferior-lisp-program can be a list of the program name and its arguments. 1990-02-06 Ed Reingold (reingold@emr.cs.uiuc.edu) @@ -10453,7 +10453,7 @@ Moved bindings off of C-c LETTER. Cleaned up references to cmu* files. Made comint-send-input do unconditional end-of-line before processing. - cominit-exec will signal an error if no programme name. + cominit-exec will signal an error if no program name. Removed full-copy-sparse-keymap and comint-log-user. 1989-12-04 Joseph Arceneaux (jla@spiff) diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4 index 9ac9699da88..434a06c1c1b 100644 --- a/lisp/ChangeLog.4 +++ b/lisp/ChangeLog.4 @@ -8269,7 +8269,7 @@ 1993-06-15 Shane Hartman (shane@nugget.spr.com) - * gud.el (xdb): New debugger supported (xdb under HPUX-PARISC). + * gud.el (xdb): New debugger supported (xdb under HPUX-PA-RISC). (gud-xdb-debugger-startup): New function. (gud-xdb-file-name, gud-xdb-accumulation): New functions. (gud-xdb-marker-filter, gud-xdb-paths, gud-xdb-find-file): New. diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 0f03aa75c80..37ddf87cfbf 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -78,7 +78,7 @@ ;; interaction among members. ;; Headers come in three flavors called level 0, 1 and 2 headers. ;; Level 2 header is free of DOS specific restrictions and most -;; prevalently used. Also level 1 and 2 headers consist of base +;; commonly used. Also level 1 and 2 headers consist of base ;; and extension headers. For more details see ;; http://homepage1.nifty.com/dangan/en/Content/Program/Java/jLHA/Notes/Notes.html ;; http://www.osirusoft.com/joejared/lzhformat.html diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el index 94bee4ac339..b53984293b3 100644 --- a/lisp/cedet/ede/proj-comp.el +++ b/lisp/cedet/ede/proj-comp.el @@ -218,7 +218,7 @@ This will prevent rules from creating duplicate variables or rules." (def-edebug-spec ede-pmake-insert-variable-shared (form def-body)) )) -;;; Querys +;;; Queries (defun ede-proj-find-compiler (compilers sourcetype) "Return a compiler from the list COMPILERS that will compile SOURCETYPE." (while (and compilers diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el index 725eab41d20..c8b7e894552 100644 --- a/lisp/emulation/edt-mapper.el +++ b/lisp/emulation/edt-mapper.el @@ -297,26 +297,26 @@ Here's a picture of the standard LK-201 keypad for reference: - _______________________ _______________________________ - | HELP | DO | | F17 | F18 | F19 | F20 | - | | | | | | | | - |_______|_______________| |_______|_______|_______|_______| - _______________________ _______________________________ - | FIND |INSERT |REMOVE | | PF1 | PF2 | PF3 | PF4 | - | | | | | | | | | - |_______|_______|_______| |_______|_______|_______|_______| - |SELECT |PREVIOU| NEXT | | KP7 | KP8 | KP9 | KP- | - | | | | | | | | | - |_______|_______|_______| |_______|_______|_______|_______| - | UP | | KP4 | KP5 | KP6 | KP, | - | | | | | | | - _______|_______|_______ |_______|_______|_______|_______| - | LEFT | DOWN | RIGHT | | KP1 | KP2 | KP3 | | - | | | | | | | | | - |_______|_______|_______| |_______|_______|_______| KPE | - | KP0 | KPP | | - | | | | - |_______________|_______|_______| + ________________________ _______________________________ + | HELP | DO | | F17 | F18 | F19 | F20 | + | | | | | | | | + |_______|________________| |_______|_______|_______|_______| + ________________________ _______________________________ + | FIND |INSERT |REMOVE | | PF1 | PF2 | PF3 | PF4 | + | | | | | | | | | + |_______|________|_______| |_______|_______|_______|_______| + |SELECT |PREVIOUS|NEXT | | KP7 | KP8 | KP9 | KP- | + | | | | | | | | | + |_______|________|_______| |_______|_______|_______|_______| + | UP | | KP4 | KP5 | KP6 | KP, | + | | | | | | | + _______|________|_______ |_______|_______|_______|_______| + | LEFT | DOWN | RIGHT | | KP1 | KP2 | KP3 | | + | | | | | | | | | + |_______|________|_______| |_______|_______|_______| KPE | + | KP0 | KPP | | + | | | | + |_______________|_______|_______| REMEMBER: JUST PRESS RETURN TO SKIP MAPPING A KEY. @@ -329,20 +329,20 @@ PRESS THE KEY SPECIFIED IN THE MINIBUFFER BELOW. - _______________________ _______________________________ - | HELP | DO | | F17 | F18 | F19 | F20 | - |_______|_______________| |_______|_______|_______|_______| - _______________________ _______________________________ - | FIND |INSERT |REMOVE | | PF1 | PF2 | PF3 | PF4 | - |_______|_______|_______| |_______|_______|_______|_______| - |SELECT |PREVIOU| NEXT | | KP7 | KP8 | KP9 | KP- | - |_______|_______|_______| |_______|_______|_______|_______| - | UP | | KP4 | KP5 | KP6 | KP, | - _______|_______|_______ |_______|_______|_______|_______| - | LEFT | DOWN | RIGHT | | KP1 | KP2 | KP3 | | - |_______|_______|_______| |_______|_______|_______| KPE | - | KP0 | KPP | | - |_______________|_______|_______| + ________________________ _______________________________ + | HELP | DO | | F17 | F18 | F19 | F20 | + |_______|________________| |_______|_______|_______|_______| + ________________________ _______________________________ + | FIND |INSERT |REMOVE | | PF1 | PF2 | PF3 | PF4 | + |_______|________|_______| |_______|_______|_______|_______| + |SELECT |PREVIOUS| NEXT | | KP7 | KP8 | KP9 | KP- | + |_______|________|_______| |_______|_______|_______|_______| + | UP | | KP4 | KP5 | KP6 | KP, | + _______|________|_______ |_______|_______|_______|_______| + | LEFT | DOWN | RIGHT | | KP1 | KP2 | KP3 | | + |_______|________|_______| |_______|_______|_______| KPE | + | KP0 | KPP | | + |_______________|_______|_______| REMEMBER: JUST PRESS RETURN TO SKIP MAPPING A KEY."))) @@ -353,7 +353,7 @@ (defun edt-map-key (ident descrip) (interactive) (if (featurep 'xemacs) - (progn + (progn (setq edt-key-seq (read-key-sequence (format "Press %s%s: " ident descrip))) (setq edt-key (concat "[" (format "%s" (event-key (aref edt-key-seq 0))) "]")) (cond ((not (equal edt-key edt-return)) diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 9fef6155705..f110597fe5c 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -2110,7 +2110,7 @@ FILE is the specific file we are rendering." ;; functionality easier to implement. ;; ( tar file functionality not merged here because it requires a ;; hacked copy of etags capable of tagging stdin: if Francesco -;; Potorti accepts a patch, or otherwise implements stdin tagging, +;; Potortì accepts a patch, or otherwise implements stdin tagging, ;; then I will provide a `htmlfontify-tar-file' defun ) (defun hfy-parse-tags-buffer (srcdir buffer) "Parse a BUFFER containing etags formatted output, loading the diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index 7ae4426ccc5..41ee466aaeb 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el @@ -1110,7 +1110,7 @@ :map "MIK") (define-charset 'ptcp154 - "`Paratype' codepage (Asian Cyrillic)" + "ParaType codepage (Asian Cyrillic)" :short-name "PT154" :ascii-compatible-p t :code-space [0 255] diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el index 8610c34993a..3e64d7e9ebb 100644 --- a/lisp/language/cyrillic.el +++ b/lisp/language/cyrillic.el @@ -215,7 +215,7 @@ Support for Russian using koi8-r and the russian-computer input method.") :charset-list '(mik)) (define-coding-system 'pt154 - "Parattype Asian Cyrillic codepage" + "ParaType Asian Cyrillic codepage" :coding-type 'charset :mnemonic ?D :charset-list '(pt154)) diff --git a/lisp/leim/quail/ipa-praat.el b/lisp/leim/quail/ipa-praat.el index c5156ad892b..53229724ae3 100644 --- a/lisp/leim/quail/ipa-praat.el +++ b/lisp/leim/quail/ipa-praat.el @@ -23,7 +23,7 @@ ;;; Commentary: ;; This is a new input method for IPA characters and diacritics, which follows -;; the conventions of Praat, a GPLed program for phonetical analysis. +;; the conventions of Praat, a GPLed program for phonetic analysis. ;; ;; This input method is much more complete than the current ipa.el. @@ -34,7 +34,7 @@ (quail-define-package "ipa-praat" "IPA" "IPAP" t "International Phonetic Alphabet input method. -This follows the input method of the phonetical analysis program +This follows the input method of the phonetic analysis program Praat (http://www.fon.hum.uva.nl/praat/). diff --git a/lisp/leim/quail/ipa.el b/lisp/leim/quail/ipa.el index fd283be7670..322f34ad33e 100644 --- a/lisp/leim/quail/ipa.el +++ b/lisp/leim/quail/ipa.el @@ -440,7 +440,7 @@ displays them, incorrectly, as separate from the modified glyphs.") (">\\" "Ê¡") ;; Epiglottal plosive U+02A1 ("^" "↑") ;; Upstep U+2191 ("!" "↓") ;; Downstep U+2193 - ("!\\" "ǃ") ;; Postalveolal click U+01C3 + ("!\\" "ǃ") ;; Postalveolar click U+01C3 ("\\" "ǀ") ;; Dental click U+01C0 ("\\|\\" "ǁ") ;; Lateral alveolar click U+01C1 ("=\\" "ǂ") ;; Palatal click U+01C2 diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el index 39571633922..3670f365137 100644 --- a/lisp/org/org-entities.el +++ b/lisp/org/org-entities.el @@ -330,7 +330,7 @@ packages to be loaded, add these packages to `org-latex-packages-alist'." ("infin" "\\propto" t "∞" "[infinity]" "[infinity]" "∞") ("infty" "\\infty" t "∞" "[infinity]" "[infinity]" "∞") ("prop" "\\propto" t "∝" "[proportional to]" "[proportional to]" "∝") - ("proptp" "\\propto" t "∝" "[proportional to]" "[proportional to]" "∝") + ("propto" "\\propto" t "∝" "[proportional to]" "[proportional to]" "∝") ("not" "\\textlnot{}" nil "¬" "[angled dash]" "¬" "¬") ("neg" "\\neg{}" t "¬" "[angled dash]" "¬" "¬") ("land" "\\land" t "∧" "[logical and]" "[logical and]" "∧") diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el index 62dd56e3ba6..5bb3ca94afc 100644 --- a/lisp/play/gametree.el +++ b/lisp/play/gametree.el @@ -399,23 +399,23 @@ depth AT-DEPTH or smaller is found." (error (goto-char (point-max)) (if (not (bolp)) (insert "\n")))) - (let ((starting-plys + (let ((starting-plies (if (> (gametree-current-branch-depth) parent-depth) (gametree-current-branch-ply) (save-excursion (forward-line -1) (gametree-current-branch-ply))))) (goto-char (1- (point))) (insert "\n") - (insert (format (if (= 0 (mod starting-plys 2)) + (insert (format (if (= 0 (mod starting-plies 2)) gametree-full-ply-format gametree-half-ply-format) - (/ starting-plys 2)))))) + (/ starting-plies 2)))))) (defun gametree-break-line-here (&optional at-move) "Split the variation node at the point position. This command works whether the current variation node is a leaf, or is already branching at its end. The new node is created at a level that -reflects the number of game plys between the beginning of the current +reflects the number of game plies between the beginning of the current variation and the breaking point. With a numerical argument AT-MOVE, split the variation before @@ -436,7 +436,7 @@ only work of Black's moves are explicitly numbered, for instance (goto-char (match-beginning 0)))) (gametree-transpose-following-leaves) (let* ((pt (point-marker)) - (plys (gametree-current-branch-ply)) + (plies (gametree-current-branch-ply)) (depth (gametree-current-branch-depth)) (old-depth depth)) (if (= depth 0) @@ -451,7 +451,7 @@ only work of Black's moves are explicitly numbered, for instance (if (zerop old-branch-ply) (1+ (gametree-current-branch-depth)) (+ (gametree-current-branch-depth) - (- plys old-branch-ply)))))) + (- plies old-branch-ply)))))) (save-excursion (beginning-of-line 1) (funcall gametree-make-heading-function depth) @@ -471,7 +471,7 @@ only work of Black's moves are explicitly numbered, for instance (insert "\n") (if (not (= 0 old-depth)) (funcall gametree-make-heading-function - (+ depth (- (gametree-current-branch-ply) plys)))) + (+ depth (- (gametree-current-branch-ply) plies)))) (gametree-prettify-heading)))) (defun gametree-merge-line () diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el index b682e0c5291..51e0a0f4e4d 100644 --- a/lisp/play/handwrite.el +++ b/lisp/play/handwrite.el @@ -244,7 +244,7 @@ Variables: `handwrite-linespace' (default 12) (insert "showpage exec Hwsave restore\n\n") (insert "%%Pages " (number-to-string ipage) " 0\n") (insert "%%EOF\n") - ;;To avoid cumbersome code we simply ignore pagefeeds + ;;To avoid cumbersome code we simply ignore formfeeds (goto-char textp) (while (search-forward "\f" nil t) (replace-match "" nil t) ) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 16d5da5f12c..efa8be1c80c 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -3697,7 +3697,7 @@ comment at the start of cc-engine.el for more info." (while (let ((pos (or (and (looking-at c-nonsymbol-token-regexp) (match-end 0)) ;; `c-nonsymbol-token-regexp' should always match - ;; since we've skipped backward over punctuator + ;; since we've skipped backward over punctuation ;; or paren syntax, but consume one char in case ;; it doesn't so that we don't leave point before ;; some earlier incorrect token. @@ -3721,7 +3721,7 @@ comment at the start of cc-engine.el for more info." (if (looking-at c-nonsymbol-token-regexp) (goto-char (match-end 0)) ;; `c-nonsymbol-token-regexp' should always match since - ;; we've skipped backward over punctuator or paren + ;; we've skipped backward over punctuation or paren ;; syntax, but move forward in case it doesn't so that ;; we don't leave point earlier than we started with. (forward-char)) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 3dda0c9e3a9..c4f2b9ffe51 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -3124,7 +3124,7 @@ and closing parentheses and brackets." (+ (if (or (memq (elt i 2) (append "}])" nil)) ; char-after (eq 'continuation ; do not stagger continuations (elt (cperl-sniff-for-indent parse-data) 0))) - 0 ; Closing parenth or continuation of a continuation + 0 ; Closing parenthesis or continuation of a continuation cperl-continued-statement-offset) (if (or (elt i 3) ; is-block (not (elt i 4)) ; is-brace @@ -5145,7 +5145,7 @@ Returns some position at the last line." (if (eq (following-char) ?\( ) (progn (forward-sexp 1) - (setq pp (point))) ; past parenth-group + (setq pp (point))) ; past parenthesis-group ;; after `else' or nothing (if ml ; after `else' (skip-chars-backward " \t\n") diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index f1a8be24013..6c8160e0aea 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1368,7 +1368,7 @@ and source-file directory for your debugger." ) ;; ====================================================================== -;; xdb (HP PARISC debugger) functions +;; xdb (HP PA-RISC debugger) functions ;; History of argument lists passed to xdb. (defvar gud-xdb-history nil) diff --git a/lisp/ps-print.el b/lisp/ps-print.el index c58a4264478..6251a6caa87 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -6121,7 +6121,7 @@ to the equivalent Latin-1 characters.") (goto-char from) ;; ...break the region up into chunks separated by tabs, linefeeds, - ;; pagefeeds, control characters, and plot each chunk. + ;; formfeeds, control characters, and plot each chunk. (while (< from to) ;; skip lines between cut markers (and ps-begin-cut-regexp ps-end-cut-regexp diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index 0674a3fdc84..f3433f63684 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c @@ -319,7 +319,7 @@ try_dequote_cmdline (char* cmdline) /* Dequoting can only subtract characters, so the length of the original command line is a bound on the amount of scratch space we need. This length, in turn, is bounded by the 32k - CreateProces limit. */ + CreateProcess limit. */ char * old_pos = cmdline; char * new_cmdline = alloca (strlen(cmdline)); char * new_pos = new_cmdline; @@ -843,4 +843,3 @@ main (int argc, char ** argv) return 0; } - diff --git a/src/syswait.h b/src/syswait.h index 815678bbfd0..db197b82fb7 100644 --- a/src/syswait.h +++ b/src/syswait.h @@ -25,7 +25,7 @@ along with GNU Emacs. If not, see . */ #include -#ifdef HAVE_SYS_WAIT_H /* We have sys/wait.h with POSIXoid definitions. */ +#ifdef HAVE_SYS_WAIT_H /* We have sys/wait.h with POSIXish definitions. */ #include #endif /* !HAVE_SYS_WAIT_H */