From bbd240ceeefcf4181aa9205f4e743b32b5c68e1f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 14 Dec 2011 23:24:10 -0800 Subject: [PATCH] Spelling fixes. --- configure.in | 2 +- doc/misc/ede.texi | 4 ++-- doc/misc/semantic.texi | 2 +- etc/NEWS.22 | 2 +- lisp/arc-mode.el | 4 ++-- lisp/cedet/semantic/scope.el | 2 +- lisp/dframe.el | 2 +- lisp/emacs-lisp/pcase.el | 10 +++++----- lisp/filesets.el | 2 +- lisp/international/ccl.el | 2 +- lisp/international/quail.el | 4 ++-- lisp/international/titdic-cnv.el | 4 ++-- lisp/org/org-protocol.el | 4 ++-- lisp/printing.el | 10 +++++----- lisp/progmodes/cperl-mode.el | 14 +++++++------- lisp/progmodes/gdb-mi.el | 2 +- lisp/progmodes/idlwave.el | 2 +- src/ChangeLog.11 | 2 +- src/ChangeLog.8 | 2 +- src/charset.c | 2 +- src/charset.h | 4 ++-- src/font.h | 2 +- src/w16select.c | 9 ++++----- src/w32font.c | 2 +- 24 files changed, 47 insertions(+), 48 deletions(-) diff --git a/configure.in b/configure.in index 53c219c0923..b4bb8eb708c 100644 --- a/configure.in +++ b/configure.in @@ -1683,7 +1683,7 @@ if test "$doug_lea_malloc" = "yes" ; then ## Use mmap directly for allocating larger buffers. ## FIXME this comes from src/s/{gnu,gnu-linux}.h: ## #ifdef DOUG_LEA_MALLOC; #undef REL_ALLOC; #endif - ## Does the AC_FUNC_MMAP test below make this check unecessary? + ## Does the AC_FUNC_MMAP test below make this check unnecessary? case "$opsys" in gnu*) REL_ALLOC=no ;; esac diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index cc566086f44..d488fb5b515 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -705,11 +705,11 @@ A brief description of the project or target. This is currently used by the @samp{ede-speedbar} interface. @item ede-want-file-p Return non-nil if a target will accept a given file. -It is generally unecessary to override this. See the section on source +It is generally unnecessary to override this. See the section on source code. @item ede-buffer-mine Return non-nil if a buffer belongs to this target. Used during -association when a file is loaded. It is generally unecessary to +association when a file is loaded. It is generally unnecessary to override this unless you keep auxiliary files. @end table diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index dcfff1fcb96..8c56d2dc9f8 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -380,7 +380,7 @@ with the search results format. @item semanticdb-ref.el Tracks crossreferences. Cross references are needed when buffer is -reparsed, and must alert other tables that any dependant caches may +reparsed, and must alert other tables that any dependent caches may need to be flushed. References are in the form of include files. @end table diff --git a/etc/NEWS.22 b/etc/NEWS.22 index 87d77cf52fc..70c7b0e018b 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 @@ -4273,7 +4273,7 @@ of suffixes. The function also accepts a predicate argument to further filter candidate files. One advantage of using this function is that the list of suffixes in -`exec-suffixes' is OS-dependant, so this function will find +`exec-suffixes' is OS-dependent, so this function will find executables without polluting Lisp code with OS dependencies. *** The new function `file-remote-p' tests a file name and returns diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 48b4c5be164..816291166fa 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -860,13 +860,13 @@ using `make-temp-file', and the generated name is returned." dir))) (if (or alien (file-exists-p fullname)) (progn - ;; Maked sure all the leading directories in + ;; Make sure all the leading directories in ;; archive-local-name exist under archive-tmpdir, so that ;; the directory structure recorded in the archive is ;; reconstructed in the temporary directory. (make-directory (file-name-directory tmpfile) t) (make-temp-file tmpfile)) - ;; Maked sure all the leading directories in `fullname' exist + ;; Make sure all the leading directories in `fullname' exist ;; under archive-tmpdir. This is necessary for nested archives ;; (`archive-extract' sets `archive-remote' to t in case ;; an archive occurs inside another archive). diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el index ea4903c70ea..937936032d2 100644 --- a/lisp/cedet/semantic/scope.el +++ b/lisp/cedet/semantic/scope.el @@ -725,7 +725,7 @@ The class returned from the scope calculation is variable (oset scopecache localargs localargs) (oset scopecache localvar localvar) ))) - ;; Make sure we become dependant on the typecache. + ;; Make sure we become dependent on the typecache. (semanticdb-typecache-add-dependant scopecache) ;; Handy debug output. (when (called-interactively-p 'any) diff --git a/lisp/dframe.el b/lisp/dframe.el index b4f44e1a308..728f08d135d 100644 --- a/lisp/dframe.el +++ b/lisp/dframe.el @@ -221,7 +221,7 @@ Local to those buffers, as a function called that created it.") (define-key map [mouse-2] 'dframe-click) ;; This is the power click for new frames, or refreshing a cache (define-key map [S-mouse-2] 'dframe-power-click) - ;; This adds a small unecessary visual effect + ;; This adds a small unnecessary visual effect ;;(define-key map [down-mouse-2] 'dframe-quick-mouse) (define-key map [down-mouse-3] 'dframe-popup-kludge) diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el index e6c4ccbbc50..6931ce75cb5 100644 --- a/lisp/emacs-lisp/pcase.el +++ b/lisp/emacs-lisp/pcase.el @@ -363,12 +363,12 @@ MATCH is the pattern that needs to be matched, of the form: (dolist (branch rest) (let* ((match (car branch)) (code&vars (cdr branch)) - (splitted + (split (pcase--split-match sym splitter match))) - (unless (eq (car splitted) :pcase--fail) - (push (cons (car splitted) code&vars) then-rest)) - (unless (eq (cdr splitted) :pcase--fail) - (push (cons (cdr splitted) code&vars) else-rest)))) + (unless (eq (car split) :pcase--fail) + (push (cons (car split) code&vars) then-rest)) + (unless (eq (cdr split) :pcase--fail) + (push (cons (cdr split) code&vars) else-rest)))) (cons (nreverse then-rest) (nreverse else-rest)))) (defun pcase--split-consp (syma symd pat) diff --git a/lisp/filesets.el b/lisp/filesets.el index 680a107adfe..0f6c6e8dd78 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -453,7 +453,7 @@ will not be rewrapped if their length exceeds this value." :group 'filesets) (defcustom filesets-max-entry-length 50 - "Truncate names of splitted submenus to this length." + "Truncate names of split submenus to this length." :set (function filesets-set-default) :type 'integer :group 'filesets) diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el index 457fe84c0b1..d16a272c9dc 100644 --- a/lisp/international/ccl.el +++ b/lisp/international/ccl.el @@ -1469,7 +1469,7 @@ OPERATOR := | de-sjis ;; If ARG_0 and ARG_1 are the first and second code point of - ;; JISX0208 character CHAR, and SJIS is the correponding + ;; JISX0208 character CHAR, and SJIS is the corresponding ;; Shift-JIS code, ;; (REG = ARG_0 en-sjis ARG_1) means: ;; ((REG = HIGH) diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 3a70b1ec2a5..3e0f543492a 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -2832,7 +2832,7 @@ STATE-n are symbols to denote state. STATE-0 is the initial state. TRANSITION-n-m are transition rules from STATE-n, and have the form \(RULES . STATE-x) or RULES, where STATE-x is one of STATE-n above, RULES is a symbol whose value is an alist of keys \(string) vs the -correponding characters or strings. The format of the symbol value of +corresponding characters or strings. The format of the symbol value of RULES is the same as arguments to `quail-define-rules'. If TRANSITION-n-m has the form (RULES . STATE-x), it means that @@ -2846,7 +2846,7 @@ The generated map can be set for the current Quail package by the function `quail-install-map' (which see)." (let ((state-alist (mapcar (lambda (x) (list (car x))) table)) tail elt) - ;; STATE-ALIST is an alist of states vs the correponding sub Quail + ;; STATE-ALIST is an alist of states vs the corresponding sub Quail ;; map. It is now initialized to ((STATE-0) (STATE-1) ...). ;; Set key sequence mapping rules in cdr part of each element. (while table diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index 82349761bdb..304dc01abe4 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -103,7 +103,7 @@ For example: \\ -For double-width GB2312 characters correponding to ASCII, use the +For double-width GB2312 characters corresponding to ASCII, use the input method `chinese-qj'.") ("chinese-ecdict" "$(05CKH(B" @@ -191,7 +191,7 @@ For instance, to input $ADc(B, you type \"n i 3 3\", the first \"n i\" is a Pinyin, the next \"3\" specifies tone, and the last \"3\" selects the third character from the candidate list. -For double-width GB2312 characters correponding to ASCII, use the +For double-width GB2312 characters corresponding to ASCII, use the input method `chinese-qj'.") ("chinese-zozy" "$(0I\0D(B" diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el index ca7bfe2a4d0..bbb93b07fc9 100644 --- a/lisp/org/org-protocol.el +++ b/lisp/org/org-protocol.el @@ -546,8 +546,8 @@ as filename." (when (string-match proto fname) (let* ((func (plist-get (cdr prolist) :function)) (greedy (plist-get (cdr prolist) :greedy)) - (splitted (split-string fname proto)) - (result (if greedy restoffiles (cadr splitted)))) + (split (split-string fname proto)) + (result (if greedy restoffiles (cadr split)))) (when (plist-get (cdr prolist) :kill-client) (message "Greedy org-protocol handler. Killing client.") (server-edit)) diff --git a/lisp/printing.el b/lisp/printing.el index dab57d16dca..a604b9f1027 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -4710,12 +4710,12 @@ Interactively, you have the following situations: M-x pr-ps-fast-fire RET The command prompts the user for a N-UP value and printing will - immediatelly be done using the current active printer. + immediately be done using the current active printer. C-u M-x pr-ps-fast-fire RET C-u 0 M-x pr-ps-fast-fire RET The command prompts the user for a N-UP value and also for a current - PostScript printer, then printing will immediatelly be done using the new + PostScript printer, then printing will immediately be done using the new current active printer. C-u 1 M-x pr-ps-fast-fire RET @@ -4736,7 +4736,7 @@ zero and the argument SELECT is treated as follows: If it's nil, send the image to the printer. If it's a list or an integer lesser or equal to zero, the command prompts - the user for a current PostScript printer, then printing will immediatelly + the user for a current PostScript printer, then printing will immediately be done using the new current active printer. If it's an integer equal to 1, the command prompts the user for a file name @@ -4749,7 +4749,7 @@ zero and the argument SELECT is treated as follows: instead of sending it to the printer. If it's a symbol which it's defined in `pr-ps-printer-alist', it's the new - active printer and printing will immediatelly be done using the new active + active printer and printing will immediately be done using the new active printer. Otherwise, send the image to the printer. @@ -4800,7 +4800,7 @@ Noninteractively, the argument SELECT-PRINTER is treated as follows: If it's nil, the printing is sent to the current active text printer. If it's a symbol which it's defined in `pr-txt-printer-alist', it's the new - active printer and printing will immediatelly be done using the new active + active printer and printing will immediately be done using the new active printer. If it's non-nil, the command prompts the user for a new active text printer. diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 13fa310106c..86284eaa30a 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -958,7 +958,7 @@ B) Speed of editing operations. `cperl-array-face' Array names `cperl-hash-face' Hash names `font-lock-comment-face' Comments, PODs and whatever is considered - syntaxically to be not code + syntactically to be not code `font-lock-constant-face' HERE-doc delimiters, labels, delimiters of 2-arg operators s/y/tr/ or of RExen, `font-lock-warning-face' Special-cased m// and s//foo/, @@ -970,7 +970,7 @@ B) Speed of editing operations. `cperl-nonoverridable-face' Non-overridable keywords, modifiers of RExen `font-lock-string-face' Strings, qw() constructs, RExen, POD sections, literal parts and the terminator of formats - and whatever is syntaxically considered + and whatever is syntactically considered as string literals `font-lock-type-face' Overridable keywords `font-lock-variable-name-face' Variable declarations, indirect array and @@ -1537,8 +1537,8 @@ default.) You can always quote (with \\[quoted-insert]) the left since most the time you mean \"less\". CPerl mode tries to guess whether you want to type pair <>, and inserts is if it appropriate. You can set `cperl-electric-parens-string' to the string that -contains the parenths from the above list you want to be electrical. -Electricity of parenths is controlled by `cperl-electric-parens'. +contains the parens from the above list you want to be electrical. +Electricity of parens is controlled by `cperl-electric-parens'. You may also set `cperl-electric-parens-mark' to have electric parens look for active mark and \"embrace\" a region if possible.' @@ -3517,7 +3517,7 @@ Works before syntax recognition is done." (defvar font-lock-warning-face) (defun cperl-find-sub-attrs (&optional st-l b-fname e-fname pos) - "Syntaxically mark (and fontify) attributes of a subroutine. + "Syntactically mark (and fontify) attributes of a subroutine. Should be called with the point before leading colon of an attribute." ;; Works *before* syntax recognition is done (or st-l (setq st-l (list nil))) ; Avoid overwriting '() @@ -4994,7 +4994,7 @@ conditional/loop constructs." (setq top (point)) ;; Plan A: if line has an unfinished paren-group, go to end-of-group (while (= -1 (nth 0 (parse-partial-sexp (point) tmp-end -1))) - (setq top (point))) ; Get the outermost parenths in line + (setq top (point))) ; Get the outermost parens in line (goto-char top) (while (< (point) tmp-end) (parse-partial-sexp (point) tmp-end nil t) ; To start-sexp or eol @@ -5906,7 +5906,7 @@ indentation and initial hashes. Behaves usually outside of comment." 3 font-lock-variable-name-face))) '("\\= 0 go forwards, ARG < 0 go backwards. -Returns non-nil if successfull." +Returns non-nil if successful." (interactive "p") (let (status) (if (< arg 0) diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index f9fd442da3f..289ef168088 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -30657,7 +30657,7 @@ (display_buffer): Do not set split_height_threshold to twice the value of window_min_height to avoid changing the value of a customizable variable. Rather explicitly check whether the - height of the window that shall be splitted is at least as large + height of the window that shall be split is at least as large as split_height_threshold. (Fwindow_full_width_p): New defun. (syms_of_window): Defsubr it. diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index e2572e8ac88..6973717a7d7 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -11485,7 +11485,7 @@ Substitute homedir by `~' also in default_filename. * xdisp.c (try_window_id): Fix computation of tab_offset when - backing up over a character that is splitted across lines. + backing up over a character that is split across lines. 1999-05-08 Kenichi HANDA diff --git a/src/charset.c b/src/charset.c index 3c15f1bee54..49fc7288069 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1660,7 +1660,7 @@ maybe_unify_char (int c, Lisp_Object val) } -/* Return a character correponding to the code-point CODE of +/* Return a character corresponding to the code-point CODE of CHARSET. */ int diff --git a/src/charset.h b/src/charset.h index fc35d6bb991..5ca83130b77 100644 --- a/src/charset.h +++ b/src/charset.h @@ -238,7 +238,7 @@ struct charset int unified_p; }; -/* Hash table of charset symbols vs. the correponding attribute +/* Hash table of charset symbols vs. the corresponding attribute vectors. */ extern Lisp_Object Vcharset_hash_table; @@ -389,7 +389,7 @@ extern Lisp_Object Vchar_charset_set; #endif -/* Return a character correponding to the code-point CODE of CHARSET. +/* Return a character corresponding to the code-point CODE of CHARSET. Try some optimization before calling decode_char. */ #define DECODE_CHAR(charset, code) \ diff --git a/src/font.h b/src/font.h index 8ca7c9c19c4..b6c1acf4a30 100644 --- a/src/font.h +++ b/src/font.h @@ -621,7 +621,7 @@ struct font_driver /* Optional. Get coordinates of the INDEXth anchor point of the glyph whose code is CODE. Store the coordinates in *X and *Y. Return 0 if - the operations was successfull. Otherwise return -1. */ + the operations was successful. Otherwise return -1. */ int (*anchor_point) (struct font *font, unsigned code, int index, int *x, int *y); diff --git a/src/w16select.c b/src/w16select.c index cae7a6f82dd..7ba62fde0e5 100644 --- a/src/w16select.c +++ b/src/w16select.c @@ -114,7 +114,7 @@ identify_winoldap_version (void) return regs.x.ax; } -/* Open the clipboard, return non-zero if successfull. */ +/* Open the clipboard, return non-zero if successful. */ unsigned open_clipboard (void) { @@ -137,7 +137,7 @@ open_clipboard (void) return regs.x.ax; } -/* Empty clipboard, return non-zero if successfull. */ +/* Empty clipboard, return non-zero if successful. */ unsigned empty_clipboard (void) { @@ -207,7 +207,7 @@ free_xfer_buf (void) } } -/* Copy data into the clipboard, return zero if successfull. */ +/* Copy data into the clipboard, return zero if successful. */ unsigned set_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw) { @@ -405,7 +405,7 @@ get_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw) return (unsigned) (dp - (unsigned char *)Data - 1); } -/* Close clipboard, return non-zero if successfull. */ +/* Close clipboard, return non-zero if successful. */ unsigned close_clipboard (void) { @@ -730,4 +730,3 @@ After the communication, this variable is set to nil. */); } #endif /* MSDOS */ - diff --git a/src/w32font.c b/src/w32font.c index 5cc37c0e74f..e8a223de0a4 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -786,7 +786,7 @@ w32font_free_outline (struct font *font, void *outline); Optional. Get coordinates of the INDEXth anchor point of the glyph whose code is CODE. Store the coordinates in *X and *Y. Return 0 if - the operations was successfull. Otherwise return -1. + the operations was successful. Otherwise return -1. static int w32font_anchor_point (struct font *font, unsigned code, int index, int *x, int *y); -- 2.39.2