From: Juanma Barranquero Date: Wed, 16 Nov 2011 12:34:47 +0000 (+0100) Subject: Fix typos. X-Git-Tag: emacs-pretest-24.0.92~167 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58179ccebd1c2fd18fa422a7bb4d2cf78994e3c9;p=emacs.git Fix typos. --- diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 8c97261debd..004f0b5f30f 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by @@ -566,7 +566,7 @@ template-type (TYPE-TAG $2 "class" nil nil ) | STRUCT symbol (TYPE-TAG $2 "struct" nil nil ) - ;; TODO: Klaus Berndl: For the moment is is ok, that we parse the C++ + ;; TODO: Klaus Berndl: For the moment it is ok, that we parse the C++ ;; keyword typename as a class.... | TYPENAME symbol (TYPE-TAG $2 "class" nil nil) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 84bb7cf30df..85e4d80d01d 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2011-11-16 Juanma Barranquero + + * killing.texi (Rectangles): + * regs.texi (Rectangle Registers): + * search.texi (Isearch Yank): Fix typos. + 2011-11-06 Chong Yidong * windows.texi (Basic Window): Add xref to Cursor Display. diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 6237b00c2ee..1443ad019bb 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -733,7 +733,7 @@ insert rectangles, and commands to make blank rectangles. @findex delete-rectangle There are two ways to erase the text in a rectangle: @kbd{C-x r d} (@code{delete-rectangle}) to delete the text outright, or @kbd{C-x r -k} (@code{kill-rectangle}) to remove the text and and save it as the +k} (@code{kill-rectangle}) to remove the text and save it as the @dfn{last killed rectangle}. In both cases, erasing the region-rectangle is like erasing the specified text on each line of the rectangle; if there is any following text on the line, it moves diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi index 41a807375a9..7e5b07221a0 100644 --- a/doc/emacs/regs.texi +++ b/doc/emacs/regs.texi @@ -145,7 +145,7 @@ rectangle) (@code{insert-register}). The @kbd{C-x r i @var{r}} (@code{insert-register}) command, previously documented in @ref{Text Registers}, inserts a rectangle -rather than a a text string, if the register contains a rectangle. +rather than a text string, if the register contains a rectangle. @node Configuration Registers @section Saving Window Configurations in Registers diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 0b68373d47c..c6747042df5 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -309,7 +309,7 @@ search remains case-insensitive. @findex isearch-yank-char @kbd{C-M-w} (@code{isearch-del-char}) deletes the last character from the search string, and @kbd{C-M-y} (@code{isearch-yank-char}) -appends the character after point to the the search string. An +appends the character after point to the search string. An alternative method to add the character after point is to enter the minibuffer with @kbd{M-e} (@pxref{Repeat Isearch}) and type @kbd{C-f} at the end of the search string in the minibuffer. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 84333be4a5b..9f5e9fe7ce6 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -73,7 +73,7 @@ Release MH-E manual version 8.3. - * mh-e.texi: (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for + * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for release 8.3. (Preface): Updated support information. (From Bill Wohler): Reset text to original version. As a diff --git a/leim/ChangeLog b/leim/ChangeLog index ed6546554f0..75dde2bcd18 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,4 +1,4 @@ -2011-09-27 Jambunathan K +2011-09-27 Jambunathan K * quail/indian.el (quail-tamil-itrans-misc-table): Delete it. (quail-tamil-itrans-numerics-and-symbols-table) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c2669bdd445..e1afec18bd7 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -5134,7 +5134,7 @@ 1996-03-15 Anders Lindgren - * etags.c: Prolog language totaly rewritten. + * etags.c: Prolog language totally rewritten. (Prolog_functions): Rewritten from scratch. (skip_comment, prolog_getit): Removed. (prolog_skip_comment): New function, like old skip_comment. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df356fbbfc0..e17c25a17db 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2011-11-16 Juanma Barranquero + + * expand.el (expand-pos, expand-index, expand-point): + Remove redundant info from docstring. + (expand-add-abbrevs): Doc fix. + (expand-c-sample-expand-list, expand-sample-lisp-mode-expand-list) + (expand-sample-perl-mode-expand-list): Fix typos. + + * net/dbus.el (dbus-event-member-name): + * play/5x5.el (5x5-solve-rotate-left, 5x5-solver-output): + * term/pc-win.el (msdos-create-frame-with-faces): + * textmodes/texinfmt.el (texinfo-format-image): Fix typos. + 2011-11-16 Martin Rudalics * window.el (split-window, window-state-get-1) @@ -464,11 +477,10 @@ * progmodes/cc-defs.el: Update "virtual semicolon" comments. * progmodes/cc-engine.el (c-crosses-statement-barrier-p): - Recode to scan one line at at time rather than having \n and \r - explicitly in c-stmt-delim-chars - (for some modes, e.g. AWK). + Recode to scan one line at time rather than having \n and \r + explicitly in c-stmt-delim-chars (for some modes, e.g. AWK). (c-forward-label): Amend for virtual semicolons. - (c-at-macro-vsemi-p, c-macro-vsemi-status-unknown-p): New functions + (c-at-macro-vsemi-p, c-macro-vsemi-status-unknown-p): New functions. * progmodes/cc-fonts.el (c-font-lock-declarations): Take account of the new C macros. @@ -485,7 +497,7 @@ * progmodes/cc-vars.el (c-macro-with-semi-re): (c-macro-names-with-semicolon): New variables. - (c-make-macro-with-semi-re): New function + (c-make-macro-with-semi-re): New function. 2011-10-28 Stefan Monnier @@ -2558,13 +2570,13 @@ 2011-08-20 Alan Mackenzie - * Fontify CPP expressions correctly when starting in the middle of + Fontify CPP expressions correctly when starting in the middle of such a construct. Mainly for when jit-lock etc. starts a chunk here. - * progmodes/cc-fonts.el (c-font-lock-context): new buffer local + * progmodes/cc-fonts.el (c-font-lock-context): New buffer local variable. - (c-make-font-lock-search-form): new function, extracted from + (c-make-font-lock-search-form): New function, extracted from c-make-font-lock-search-function. (c-make-font-lock-search-function): Use the above function. (c-make-font-lock-context-search-function): New function. @@ -2895,7 +2907,7 @@ * progmodes/cc-fonts.el (c-font-lock-declarations): Jump over the QT keyword "more" to prevent "more slots: ...." being spuriously - parsed as a bitfield declaraion. + parsed as a bitfield declaration. * progmodes/cc-engine.el (c-beginning-of-statement-1): Refactor and enhance to handle bitfield declarations. @@ -5640,7 +5652,7 @@ * image-mode.el (image-toggle-display-image): Ensure that the image spec passed to the animate timer is the same object as in - the the buffer's display property (Bug#6981). + the buffer's display property (Bug#6981). (image-transform-properties): Doc fix. * image.el (image-animate-max-time): Default to nil. diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 36c3d68e96f..5320b5ee872 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -4332,7 +4332,7 @@ 2003-04-01 Stefan Monnier - * progmodes/asm-mode.el (asm-mode-syntax-table): Setup entries + * progmodes/asm-mode.el (asm-mode-syntax-table): Setup entries that do not depend on asm-comment-char. (asm-mode-map): Declare and init at the same time. (asm-code-level-empty-comment-pattern) @@ -9632,7 +9632,7 @@ named ucs-translation-table-for-decode vacant. If FOR-ENCODE is non-nil, make a proper char-table populates the translation table name utf-translation-table-for-encode. Call register-char-codings - for all mule-utf-* to to reset their status to the original. + for all mule-utf-* to reset their status to the original. (unify-8859-on-encoding-mode): Call ucs-unify-8859 and ucs-fragment-8859 with fixed arguments. Set the version to 21.3. (unify-8859-on-decoding-mode): Likewise. Remove dependency. @@ -10545,7 +10545,7 @@ 2002-09-22 Kai Großjohann - * dired.el (dired-insert-directory): Always add "--dired" to to + * dired.el (dired-insert-directory): Always add "--dired" to SWITCHES for remote files. * files.el (insert-directory): Comment saying that "--dired" might be in the SWITCHES. @@ -11617,7 +11617,7 @@ * emacs-lisp/bytecomp.el (byte-compile-warning-prefix): Decide here whether to print which form we're compiling. If we do that, still print file and line. Make file name - relative to default-directory. Print fewer newlines. + relative to default-directory. Print fewer newlines. (byte-compile-log-file): Print something even if no file. Print messages for entering and leaving directories, and set default-directory. @@ -12899,7 +12899,7 @@ * timer.el (timer-inc-time): Doc fix. * replace.el (keep-lines, flush-lines): Interactively report - read-only error before reading regexp argument. + read-only error before reading regexp argument. * dabbrev.el (dabbrev--search): Use inhibit-point-motion-hooks. @@ -21105,12 +21105,12 @@ so that the next undo after an error will not begin redoing. * simple.el (shell-command): Doc fix. - (shell-command-on-region): If there is output an an error, + (shell-command-on-region): If there is output and an error, add "...Shell command failed" to the output. 2001-12-13 David Ponce - * ruler-mode.el (ruler-mode-left-fringe-cols): Variable removed. + * ruler-mode.el (ruler-mode-left-fringe-cols): Variable removed. (ruler-mode-left-fringe-cols): Function replaced by more efficient implementation `ruler-mode-extra-left-cols'. (ruler-mode-ruler): Use above new function. Take into account diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index ab7d25632d8..7782fa10e4e 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -8855,7 +8855,7 @@ (org-get-indentation): New optional argument LINE. (org-fix-indentation, org-remove-tabs): New functions. (org-export-as-ascii, org-ascii-level-start): Determine and apply - correct indentation for headlines that are converted it items. + correct indentation for headlines that are converted to items. (org-skip-comments): Remove table lines that contain narrowing cookies but no other non-empty fields. (org-set-tags): Allow groups of mutually exclusive tags. @@ -16884,7 +16884,7 @@ * progmodes/cc-fonts.el (c-font-lock-complex-decl-prepare) (c-font-lock-declarators, c-font-lock-declarations) (c-complex-decl-matchers, c-basic-matchers-after): Use a text - property to mark the items in in declarator lists to handle + property to mark the items in declarator lists to handle refontification inside multiline declarations better. * progmodes/cc-fonts.el (c-font-lock-declarations): Recognize a diff --git a/lisp/button.el b/lisp/button.el index 6ef79532ae7..262a19c1806 100644 --- a/lisp/button.el +++ b/lisp/button.el @@ -42,7 +42,7 @@ ;; button face may not be visible. Using overlays avoids this. ;; ;; Using `define-button-type' to define default properties for buttons -;; is not necessary, but it is is encouraged, since doing so makes the +;; is not necessary, but it is encouraged, since doing so makes the ;; resulting code clearer and more efficient. ;; diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 7d70e83200d..e5969a3c291 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,9 @@ +2011-11-16 Juanma Barranquero + + * semantic/lex.el (semantic-lex-tokens): + * semantic/tag-ls.el (semantic-tag-protected-p): + * srecode/mode.el (srecode-prefix-map): Fix typos. + 2011-11-15 Juanma Barranquero * ede/project-am.el (project-compile-target-command): Fix typo. diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index 87a436fbc3d..4da3be98f37 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -491,7 +491,7 @@ For compatibility with Semantic 1.x it defaults to `semantic-flex'.") (symbol) (whitespace) ) - "An alist of of semantic token types. + "An alist of semantic token types. As of December 2001 (semantic 1.4beta13), this variable is not used in any code. The only use is to refer to the doc-string from elsewhere. @@ -1758,7 +1758,7 @@ If there is no error, then the last value of FORMS is returned." (semantic-alias-obsolete 'semantic-flex-map-keywords 'semantic-lex-map-keywords "23.2") (semantic-alias-obsolete 'semantic-flex-keywords 'semantic-lex-keywords "23.2") (semantic-alias-obsolete 'semantic-flex-buffer 'semantic-lex-buffer "23.2") -(semantic-alias-obsolete 'semantic-flex-list 'semantic-lex-list "23.2") +(semantic-alias-obsolete 'semantic-flex-list 'semantic-lex-list "23.2") ;; This simple scanner uses the syntax table to generate a stream of ;; simple tokens of the form: @@ -1769,7 +1769,7 @@ If there is no error, then the last value of FORMS is returned." ;; objects boundary. (defvar semantic-flex-tokens semantic-lex-tokens - "An alist of of semantic token types. + "An alist of semantic token types. See variable `semantic-lex-tokens'.") (defvar semantic-flex-unterminated-syntax-end-function diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el index 3d8ed2c5b80..4d001322108 100644 --- a/lisp/cedet/semantic/tag-ls.el +++ b/lisp/cedet/semantic/tag-ls.el @@ -98,7 +98,7 @@ See `semantic-tag-protection'." prot)) (defun semantic-tag-protected-p (tag protection &optional parent) - "Non-nil if TAG is is protected. + "Non-nil if TAG is protected. PROTECTION is a symbol which can be returned by the method `semantic-tag-protection'. PARENT is the parent data type which contains TAG. @@ -106,7 +106,7 @@ PARENT is the parent data type which contains TAG. For these PROTECTIONs, true is returned if TAG is: @table @asis @item nil - Always true + Always true. @item private True if nil. @item protected diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el index bb2db79acc6..23d09bc9a4b 100644 --- a/lisp/cedet/srecode/mode.el +++ b/lisp/cedet/srecode/mode.el @@ -61,7 +61,7 @@ (define-key km (format "%c" k) 'srecode-bind-insert) (setq k (1+ k)))) km) - "Keymap used behind the srecode prefix key in in srecode minor mode.") + "Keymap used behind the srecode prefix key in srecode minor mode.") (defvar srecode-menu-bar (list diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 95d93eb113d..8257c6aebea 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -130,7 +130,7 @@ ;; - a 2 dimensional precedence table (key word "prec2"), is a 2D ;; table recording the precedence relation (can be `<', `=', `>', or ;; nil) between each pair of tokens. -;; - a precedence-level table (key word "grammar"), which is a alist +;; - a precedence-level table (key word "grammar"), which is an alist ;; giving for each token its left and right precedence level (a ;; number or nil). This is used in `smie-grammar'. ;; The prec2 tables are only intermediate data structures: the source diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el index cc3e633f098..7144138445c 100644 --- a/lisp/emacs-lisp/tcover-unsafep.el +++ b/lisp/emacs-lisp/tcover-unsafep.el @@ -100,7 +100,7 @@ . (risky-local-variable format-alist)) ( (setq buffer-display-count (delete-file "x")) . (function delete-file)) - ;;These are actualy safe (they signal errors) + ;;These are actually safe (they signal errors) ( (apply '(x) '(1 2 3)) . (function (x))) ( (let (((x))) 1) diff --git a/lisp/expand.el b/lisp/expand.el index 544d0b1cb17..beb76321781 100644 --- a/lisp/expand.el +++ b/lisp/expand.el @@ -111,7 +111,7 @@ ("while" "while () {\n\n}" (8 12)) ("default" "default:\n\nbreak;" 10) ("main" "int\nmain(int argc, char * argv[])\n{\n\n}\n" 37)) - "Expansions for C mode. See `expand-add-abbrevs'.") + "Expansions for C mode. See `expand-add-abbrevs'.") ;; lisp example from Jari Aalto (defconst expand-sample-lisp-mode-expand-list @@ -181,7 +181,7 @@ (list 12 14)) ) - "Expansions for Lisp mode. See `expand-add-abbrevs'.") + "Expansions for Lisp mode. See `expand-add-abbrevs'.") ;; perl example from Jari Aalto (defconst expand-sample-perl-mode-expand-list @@ -257,20 +257,20 @@ (list "rtu" "return ;" (list 8)) ) - "Expansions for Perl mode. See `expand-add-abbrevs'.") + "Expansions for Perl mode. See `expand-add-abbrevs'.") ;;; Code: ;;;###autoload (defun expand-add-abbrevs (table abbrevs) - "Add a list of abbrev to abbrev table TABLE. + "Add a list of abbreviations to abbrev table TABLE. ABBREVS is a list of abbrev definitions; each abbrev description entry has the form (ABBREV EXPANSION ARG). ABBREV is the abbreviation to replace. EXPANSION is the replacement string or a function which will make the -expansion. For example you, could use the DMacros or skeleton packages +expansion. For example, you could use the DMacros or skeleton packages to generate such functions. ARG is an optional argument which can be a number or a list of @@ -279,7 +279,7 @@ beginning of the expanded text. If ARG is a list of numbers, point is placed according to the first member of the list, but you can visit the other specified positions -cyclicaly with the functions `expand-jump-to-previous-slot' and +cyclically with the functions `expand-jump-to-previous-slot' and `expand-jump-to-next-slot'. If ARG is omitted, point is placed at the end of the expanded text." @@ -293,18 +293,15 @@ If ARG is omitted, point is placed at the end of the expanded text." (defvar expand-list nil "Temporary variable used by the Expand package.") (defvar expand-pos nil - "If non-nil, stores a vector containing markers to positions defined by the last expansion. -This variable is local to a buffer.") + "If non-nil, stores a vector containing markers to positions defined by the last expansion.") (make-variable-buffer-local 'expand-pos) (defvar expand-index 0 - "Index of the last marker used in `expand-pos'. -This variable is local to a buffer.") + "Index of the last marker used in `expand-pos'.") (make-variable-buffer-local 'expand-index) (defvar expand-point nil - "End of the expanded region. -This variable is local to a buffer.") + "End of the expanded region.") (make-variable-buffer-local 'expand-point) (defun expand-add-abbrev (table abbrev expansion arg) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 4c31bbb52e4..a28213a6b26 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2011-11-16 Juanma Barranquero + + * registry.el (registry-lookup, registry-lookup-breaks-before-lexbind): + Fix typos. + 2011-11-15 Juanma Barranquero * gnus-art.el (gnus-article-part-wrapper): @@ -4429,7 +4434,7 @@ gnus-original-article-buffer is alive. * nndoc.el (nndoc-dissect-buffer): Reverse the order of the articles to - reflect the order they're in in the digest. + reflect the order they are in the digest. * gnus.el (gnus-group-startup-message): Move point to the start of the buffer. diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1 index c4f563adbb6..86c4eea59ab 100644 --- a/lisp/gnus/ChangeLog.1 +++ b/lisp/gnus/ChangeLog.1 @@ -1336,7 +1336,7 @@ 1998-05-07 Hrvoje Niksic - * nnmail.el: (nnmail-get-split-group): Use `regexp-quote' + * nnmail.el (nnmail-get-split-group): Use `regexp-quote' when file name is a part of pattern. * nnmail.el (nnmail-crosspost-link-function): Ditto. diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index 669f9675536..32e40f68fc2 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -3613,7 +3613,7 @@ articles in every agentized group? ")) (setq r d d (directory-file-name d))) ;; if ANY ancestor was NOT in keep hash and - ;; it it's already in to-remove, add it to + ;; it's already in to-remove, add it to ;; to-remove. (if (and r (not (member r to-remove))) diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index 8e158f7ca0f..5fd309a5c7d 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el @@ -149,7 +149,7 @@ (defmethod registry-lookup ((db registry-db) keys) "Search for KEYS in the registry-db THIS. -Returns a alist of the key followed by the entry in a list, not a cons cell." +Returns an alist of the key followed by the entry in a list, not a cons cell." (let ((data (oref db :data))) (delq nil (mapcar @@ -160,7 +160,7 @@ Returns a alist of the key followed by the entry in a list, not a cons cell." (defmethod registry-lookup-breaks-before-lexbind ((db registry-db) keys) "Search for KEYS in the registry-db THIS. -Returns a alist of the key followed by the entry in a list, not a cons cell." +Returns an alist of the key followed by the entry in a list, not a cons cell." (let ((data (oref db :data))) (delq nil (loop for key in keys diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index ee9c9fca2b5..ca179a78b61 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero + + * mh-search.el (mh-pick-parse-search-buffer): Fix typo. + 2011-09-20 Bill Wohler Release MH-E version 8.3. @@ -40,7 +44,7 @@ switch-to-buffer. The previous change which used pop-to-buffer produced the wrong behavior. -2011-07-12 Henrique Martins (tiny change) +2011-07-12 Henrique Martins (tiny change) * mh-xface.el (mh-picon-get-image): Remove quote from block argument. diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 4ba5e847981..5a3f57720f4 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -1484,7 +1484,7 @@ * mh-alias.el (Commentary): Removed as it is now in the manual. (mh-alias-system-aliases): Moved here from mh-customize.el. By definition, "system" definitions are not user-visible, and user - filenames are in the the Aliasfile: profile component, so this + filenames are in the Aliasfile: profile component, so this variable really shouldn't be a defcustom. (mh-alias-tstamp, mh-alias-filenames, mh-alias-reload) (mh-alias-add-alias, mh-alias-grab-from-field) @@ -4533,7 +4533,7 @@ * mh-xemacs-toolbar.el: Remove the code since that gets generated when mh-tool-bar-define is expanded. - (mh-xemacs-icon-map): A alist to map GNU Emacs icon names to the + (mh-xemacs-icon-map): An alist to map GNU Emacs icon names to the actual icons to be used in XEmacs. This is used in mh-tool-bar-define. @@ -5022,7 +5022,7 @@ * mh-utils.el (mh-truncate-log-buffer): Modify the function to return the current size of mh-log-buffer. Also we are now a bit more careful in adding separators between consecutive messages. - (mh-exec-cmd): Fix a bug where the the log buffer would be + (mh-exec-cmd): Fix a bug where the log buffer would be displayed even if no error happened in the current command but the log buffer had messages from a previous error. @@ -8594,7 +8594,7 @@ mail-header-separator. (mh-send-letter): The default BCC encapsulation will make a MIME message unreadable. If we are running nmh and the letter contains - a Bcc: and a Content-Type: field, add the -mime switch to to the + a Bcc: and a Content-Type: field, add the -mime switch to the arguments to send. 2002-10-21 Peter S Galbraith @@ -9610,7 +9610,7 @@ 2002-06-27 Satyaki Das * mh-e.el (mh-next-undeleted-msg): Get rid of optional arg - reverse-p. If there are no more undeleted messages the the point + reverse-p. If there are no more undeleted messages the point remains at its original position and a message is produced (closes SF #494304). (mh-previous-undeleted-msg): Change similar to @@ -11049,7 +11049,7 @@ line, starting with Re: (mh-scan-body-regexp): Regexp matching the message body beginning displayed in scan lines. - (mh-scan.font-lock-regexp): Regexp matching output of the the + (mh-scan.font-lock-regexp): Regexp matching output of the optional scan.font-lock format file. (mh-folder-font-lock-keywords): New font-lock for folder-mode that uses the above regexps. diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el index c8f2440e276..c06bc6649a5 100644 --- a/lisp/mh-e/mh-search.el +++ b/lisp/mh-e/mh-search.el @@ -646,7 +646,7 @@ Uses the pick method described in `mh-pick-execute-search'." (defun mh-pick-parse-search-buffer () "Parse the search buffer contents. -The function returns a alist. The car of each element is either +The function returns an alist. The car of each element is either the header name to search in or nil to search the whole message. The cdr of the element is the pattern to search." (save-excursion diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index e5eb2015418..03b84a45ea3 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -505,7 +505,7 @@ not well formed." (defun dbus-event-member-name (event) "Return the member name the event is coming from. -It is either a signal name or a method name. The result is is a +It is either a signal name or a method name. The result is a string. EVENT is a D-Bus event, see `dbus-check-event'. This function raises a `dbus-error' signal in case the event is not well formed." diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5fca1018095..a47e7fa8f6f 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3851,7 +3851,7 @@ Only works for Bourne-like shells." ;; expects English? Or just to set LC_MESSAGES to "C" if Tramp ;; expects only English messages? (Juri Linkov) ;; * Make shadowfile.el grok Tramp filenames. (Bug#4526, Bug#4846) -;; * I was wondering it it would be possible to use tramp even if I'm +;; * I was wondering if it would be possible to use tramp even if I'm ;; actually using sshfs. But when I launch a command I would like ;; to get it executed on the remote machine where the files really ;; are. (Andrea Crotti) diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 9d7b7c658c1..1f1c3abfdc2 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,9 @@ +2011-11-16 Juanma Barranquero + + * org-agenda.el (org-create-marker-find-array): + * org-bibtex.el (org-bibtex-fields): + * org-list.el (org-list-insert-item): Fix typos. + 2011-11-11 Juanma Barranquero * org-plot.el (org-plot/gnuplot-to-grid-data): Fix typo in docstring. @@ -3499,7 +3505,7 @@ * org.el (org-set-autofill-regexps): Use `org-item-re' in `paragraph-start' to recognize alphabetical lists. (org-fill-paragraph): Enforce a pre-computed fill-prefix before - calling `fill-paragraph' when point in in an item. Also prevent + calling `fill-paragraph' when point is in an item. Also prevent paragraphs getting merged into an adjacent list upon filling. (org-adaptive-fill-function): Make sure to determine real fill-prefix for auto-fill. @@ -11440,7 +11446,7 @@ package. * org-latex.el (org-export-latex-tables): Only add a caption when - macro in in longtable environments if one has been defined. + macro is in longtable environments if one has been defined. * org-html.el (org-export-as-html): Only take title from buffer if not exporting body-only. diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 1d0802dcda5..6ba62544f4b 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -2972,7 +2972,7 @@ removed from the entry content. Currently only `planning' is allowed here." (nreverse markers))) (defun org-create-marker-find-array (marker-list) - "Create a alist of files names with all marker positions in that file." + "Create an alist of files names with all marker positions in that file." (let (f tbl m a p) (while (setq m (pop marker-list)) (setq p (marker-position m) diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el index 5c9b37b2341..bd2b168f2bc 100644 --- a/lisp/org/org-bibtex.el +++ b/lisp/org/org-bibtex.el @@ -204,7 +204,7 @@ (:pages . "One or more page numbers or range of numbers, such as 42-111 or 7,41,73-97 or 43+ (the ‘+’ in this last example indicates pages following that don’t form simple range). BibTEX requires double dashes for page ranges (--).") (:publisher . "The publisher’s name.") (:school . "The name of the school where a thesis was written.") - (:series . "The name of a series or set of books. When citing an entire book, the the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.") + (:series . "The name of a series or set of books. When citing an entire book, the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.") (:title . "The work’s title, typed as explained in the LaTeX book.") (:type . "The type of a technical report for example, 'Research Note'.") (:volume . "The volume of a journal or multi-volume book.") diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index 2fe512329ca..14b3e12c888 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el @@ -1207,7 +1207,7 @@ some heuristics to guess the result." If POS is before first character after bullet of the item, the new item will be created before the current one. -STRUCT is the list structure. PREVS is the the alist of previous +STRUCT is the list structure. PREVS is the alist of previous items, as returned by `org-list-prevs-alist'. Insert a checkbox if CHECKBOX is non-nil, and string AFTER-BULLET diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index 1ea8df36cd6..a7a332d97f2 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el @@ -151,7 +151,7 @@ "Local keymap for the 5x5 game.") (5x5-defvar-local 5x5-solver-output nil - "List that is is the output of an arithmetic solver. + "List that is the output of an arithmetic solver. This list L is such that @@ -816,9 +816,8 @@ solution that is presented is the one that needs least number of strokes --- other solutions can be viewed by rotating through the list. The list of solution is ordered by number of strokes, so rotating left just after calling `5x5-solve-suggest' will show -the the solution with second least number of strokes, while -rotating right will show the solution with greatest number of -strokes." +the solution with second least number of strokes, while rotating +right will show the solution with greatest number of strokes." (interactive "P") (let ((len (length 5x5-solver-output))) (when (>= len 3) diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 89a37307506..9d2aad7741b 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -105,8 +105,8 @@ ;; should be loaded before the ada-mode, which will then setup some variables ;; to improve the support for Ada code. ;; Here is the list of these modes: -;; `which-function-mode': Display the name of the subprogram the cursor is -;; in in the mode line. +;; `which-function-mode': Display in the modeline the name of the subprogram +;; the cursor is in. ;; `outline-mode': Provides the capability to collapse or expand the code ;; for specific language constructs, for instance if you want to hide the ;; code corresponding to a subprogram diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index d56d5ae7c1a..31a58e48f50 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -8832,7 +8832,7 @@ comment at the start of cc-engine.el for more info." ;; CASE B.4: Continued statement with block open. The most ;; accurate analysis is perhaps `statement-cont' together with ;; `block-open' but we play DWIM and use `substatement-open' - ;; instead. The rationaly is that this typically is a macro + ;; instead. The rationale is that this typically is a macro ;; followed by a block which makes it very similar to a ;; statement with a substatement block. (t diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el index f18ec5abe81..d0e2c5abe7d 100644 --- a/lisp/progmodes/tcl.el +++ b/lisp/progmodes/tcl.el @@ -861,7 +861,7 @@ Returns nil if line starts inside a string, t if in a comment." expr-p) (progn ;; Line is continuation line, or the sexp opener - ;; is not a curly brace, or we are are looking at + ;; is not a curly brace, or we are looking at ;; an `expr' expression (which must be split ;; specially). So indentation is column of first ;; good spot after sexp opener (with some added diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index 4cb88f6bd23..284c164150d 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el @@ -134,7 +134,7 @@ ;; terminal-initialization function. Also, our handling of reverse ;; video is slightly different. (defun msdos-create-frame-with-faces (&optional parameters) - "Create an frame on MS-DOS display. + "Create a frame on MS-DOS display. Optional frame parameters PARAMETERS specify the frame parameters. Parameters not specified by PARAMETERS are taken from `default-frame-alist'. If either PARAMETERS or `default-frame-alist' diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el index 6e73fda662b..91f6624e7a3 100644 --- a/lisp/textmodes/page-ext.el +++ b/lisp/textmodes/page-ext.el @@ -435,7 +435,7 @@ REVERSE (non-nil means reverse order), BEG and END (region to sort)." (skip-chars-forward " \t\n") )) - ;; ENDRECFUN is is called with point within the record. + ;; ENDRECFUN is called with point within the record. ;; It should move point to the end of the record. (function (lambda () (if (re-search-forward diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index d33cbb97dd8..1194742a24c 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -2194,7 +2194,7 @@ This command is executed when texinfmt sees @item inside @multitable." (put 'image 'texinfo-format 'texinfo-format-image) (defun texinfo-format-image () - "Insert an image from an an file ending in .txt. + "Insert an image from a file ending in .txt. Use only the FILENAME arg; for Info, ignore the other arguments to @image." (let ((args (texinfo-format-parse-args)) filename) @@ -3909,11 +3909,11 @@ Default is to leave paragraph indentation as is." ;;; @set, @clear, @ifset, @ifclear ;; If a flag is set with @set FLAG, then text between @ifset and @end -;; ifset is formatted normally, but if the flag is is cleared with +;; ifset is formatted normally, but if the flag is cleared with ;; @clear FLAG, then the text is not formatted; it is ignored. ;; If a flag is cleared with @clear FLAG, then text between @ifclear -;; and @end ifclear is formatted normally, but if the flag is is set with +;; and @end ifclear is formatted normally, but if the flag is set with ;; @set FLAG, then the text is not formatted; it is ignored. @ifclear ;; is the opposite of @ifset. diff --git a/nt/ChangeLog b/nt/ChangeLog index 7fca6271052..8de94033196 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -13,7 +13,7 @@ (INT32_MIN, UINTMAX_MAX, UINTMAX_MIN, INTMAX_MAX, INTMAX_MIN) (intmax_t, INT64_MAX): Add for MSVC. - * config.nt: (mode_t) [!__GNUC__]: Define mode_t for MSVC. + * config.nt (mode_t) [!__GNUC__]: Define mode_t for MSVC. 2011-11-05 Eli Zaretskii @@ -28,7 +28,7 @@ * INSTALL: Update for newer versions of MSVC. -2011-11-05 Fabrice Popineau (tiny change) +2011-11-05 Fabrice Popineau (tiny change) Support MSVC build with newer versions of Visual Studio. * nmake.defs (USE_CRT_DLL): Define to 1. diff --git a/src/ChangeLog b/src/ChangeLog index 0cbf2274ff9..0a3758d6bfd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero + + * window.c (syms_of_window) : Fix typo. + 2011-11-16 Martin Rudalics * window.h (window): Rename slot "nest" to "combination_limit". @@ -259,7 +263,7 @@ * w32fns.c [_MSC_VER]: DECLARE_HANDLE for any MSVC version. -2011-11-05 Fabrice Popineau (tiny change) +2011-11-05 Fabrice Popineau (tiny change) Support MSVC build with newer versions of Visual Studio. * w32.c: Don't include w32api.h for MSVC. @@ -321,7 +325,7 @@ * xdisp.c (try_cursor_movement): Make sure ROW isn't decremented past the beginning of the current glyph matrix. -2011-10-30 Adam Sjøgren (tiny change) +2011-10-30 Adam Sjøgren (tiny change) * xterm.c: Include X11/Xproto.h if HAVE_GTK3. (x_error_handler): Ignore BadMatch for X_SetInputFocus for @@ -3049,7 +3053,7 @@ * nsselect.m (ns_string_from_pasteboard): Don't use deprecated methods cString and lossyCString on OSX >= 10.4 - * nsmenu.m (fillWithWidgetValue): Don't use depercated method + * nsmenu.m (fillWithWidgetValue): Don't use deprecated method sizeToFit on OSX >= 10.2. * nsimage.m (allocInitFromFile): Don't use deprecated method diff --git a/src/ChangeLog.1 b/src/ChangeLog.1 index 830905cd0b5..efe77648458 100644 --- a/src/ChangeLog.1 +++ b/src/ChangeLog.1 @@ -405,7 +405,7 @@ Copy their own header field a_scovfrl from ohdr. * unexec.c [COFF]: - Round positions of text and and data sections in output file + Round positions of text and data sections in output file to page boundaries. * crt0.c: Install version for Encore machines. diff --git a/src/frame.c b/src/frame.c index d56a2efb17f..ab60fd5b808 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1237,7 +1237,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force) else { #ifdef HAVE_X_WINDOWS - /* Also, save clipboard to the the clipboard manager. */ + /* Also, save clipboard to the clipboard manager. */ x_clipboard_manager_save_frame (frame); #endif diff --git a/src/window.c b/src/window.c index 1b344773b1a..b34101c2f91 100644 --- a/src/window.c +++ b/src/window.c @@ -6506,7 +6506,7 @@ This variable takes no effect if `window-combination-limit' is non-nil. */); doc: /* Non-nil means splitting a window makes a new parent window. If this variable is nil, splitting a window will create a new parent window only if the window has no parent window or the window shall -become a combination orthogonal to the one it it is part of. +become a combination orthogonal to the one it is part of. If this variable is t, splitting a window always creates a new parent window. If all splits behave this way, each frame's window tree is a @@ -6515,7 +6515,7 @@ sibling. Other values are reserved for future use. -The value of this variable is also assigned to the combination_limit +The value of this variable is also assigned to the combination-limit status of the new parent window. The combination-limit status of a window can be retrieved via the function `window-combination-limit' and altered by the function `set-window-combination-limit'. */); diff --git a/test/ChangeLog b/test/ChangeLog index de4fb270440..5265f4175a7 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero + + * cedet/srecode-tests.el (srecode-field-utest-impl): Fix typo. + 2011-10-30 Ulf Jasper * automated/newsticker-tests.el diff --git a/test/cedet/srecode-tests.el b/test/cedet/srecode-tests.el index 10b06f5cd01..a1b8f60b2ec 100644 --- a/test/cedet/srecode-tests.el +++ b/test/cedet/srecode-tests.el @@ -177,7 +177,7 @@ It is filled with some text." (mapc (lambda (T) (when (slot-boundp T 'overlay) - (error "Overlay did not clear off of of field %s" + (error "Overlay did not clear off of field %s" (object-name T)))) fields)