From 40a8bdf60f261d476869cdb1276a00e5641ceba4 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 12 Nov 2011 00:17:16 +0100 Subject: [PATCH] Fix typos. --- admin/grammars/python.wy | 2 +- admin/nt/README-ftp-server | 2 +- doc/misc/ChangeLog | 4 ++++ doc/misc/semantic.texi | 2 +- lisp/ChangeLog | 5 +++++ lisp/ChangeLog.9 | 2 +- lisp/cedet/semantic/bovine/c.el | 2 +- lisp/cedet/semantic/decorate/include.el | 2 +- lisp/cedet/semantic/tag-file.el | 2 +- lisp/cedet/srecode/getset.el | 2 +- lisp/ezimage.el | 4 ++-- lisp/org/ChangeLog | 4 ++++ lisp/org/org-list.el | 4 ++-- lisp/org/org-plot.el | 2 +- lisp/progmodes/idlw-shell.el | 4 ++-- lisp/textmodes/sgml-mode.el | 2 +- nt/README.W32 | 2 +- src/ChangeLog.11 | 6 +++--- src/ChangeLog.8 | 2 +- src/s/hpux10-20.h | 2 +- src/xfaces.c | 2 +- 21 files changed, 36 insertions(+), 23 deletions(-) diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy index a0af813e5e..b30305ee78 100644 --- a/admin/grammars/python.wy +++ b/admin/grammars/python.wy @@ -828,7 +828,7 @@ paren_classes ; ;; In general, the base class can be specified by a general expression -;; which evalue to a class object, i.e., base classes are not just names! +;; which evaluates to a class object, i.e., base classes are not just names! ;; However base classes are names in most cases. Thus the ;; non-terminals below work only with simple names. Even if the ;; parser can parse general expressions, I don't see much benefit in diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index 5dee94f28c..3c70ed8dbe 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -92,7 +92,7 @@ See the end of the file for license conditions. or libpng.dll. LibPNG requires zlib, which should come from the same source as you got libpng. - JPEG: requires the Independant JPEG Group's libjpeg 6b or later, + JPEG: requires the Independent JPEG Group's libjpeg 6b or later, which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll. TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 029406e2d3..af8d38a077 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2011-11-11 Juanma Barranquero + + * semantic.texi (Tag handling): Fix typo. + 2011-10-31 Katsumi Yamaoka * gnus.texi (Other Gnus Versions): Remove. diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index f3f11d29f1..f6cf7a07ae 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -306,7 +306,7 @@ Files associated with tags. Goto-tag, file for include, and file for a prototype. @item semantic-tag-ls.el -Language dependant features of a tag, such as parent calculation, slot +Language dependent features of a tag, such as parent calculation, slot protection, and other states like abstract, virtual, static, and leaf. @item semantic-dep.el diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6cd58cd3d2..fd403ee047 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-11-11 Juanma Barranquero + + * progmodes/idlw-shell.el (idlwave-shell-make-new-bp-overlay): + * textmodes/sgml-mode.el (html-tag-help): Fix typos. + 2011-11-11 Stefan Monnier * electric.el (electric-indent-post-self-insert-function): Make it diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 14214ccc3d..edfe26fbc0 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -2628,7 +2628,7 @@ 2001-07-06 Vinicius Jose Latorre - * ps-print.el: Use locale dependant date to print date in header. + * ps-print.el: Use locale dependent date to print date in header. Doc fix. (ps-print-version): New version number (6.5.3). (ps-right-header, ps-right-footer): Initialization and doc fix. diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 0b3e688189..1076402ac9 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -249,7 +249,7 @@ Return the defined symbol as a special spp lex token." (point)))) ) - ;; Only do argument checking if the paren was immediatly after + ;; Only do argument checking if the paren was immediately after ;; the macro name. (if with-args (semantic-lex-spp-first-token-arg-list (car raw-stream))) diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index e984965a73..a37f43d177 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -296,7 +296,7 @@ This mode provides a nice context menu on the include statements." ;; Set ourselves up for synchronization (semanticdb-cache-get table 'semantic-decoration-unparsed-include-cache) - ;; Add a dependancy. + ;; Add a dependency. (let ((table semanticdb-current-table)) (semanticdb-add-reference table tag)) ) diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el index 17fd3b4535..d118d9b620 100644 --- a/lisp/cedet/semantic/tag-file.el +++ b/lisp/cedet/semantic/tag-file.el @@ -154,7 +154,7 @@ Depends on `semantic-dependency-include-path' for searching. Always searches (setq result ;; I don't have a plan for refreshing tags with a dependency ;; stuck on them somehow. I'm thinking that putting a cache - ;; onto the dependancy finding with a hash table might be best. + ;; onto the dependency finding with a hash table might be best. ;;(if (semantic--tag-get-property tag 'dependency-file) ;; (semantic--tag-get-property tag 'dependency-file) (:override diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el index a582d4ff59..9a6c27dcd7 100644 --- a/lisp/cedet/srecode/getset.el +++ b/lisp/cedet/srecode/getset.el @@ -215,7 +215,7 @@ INCLASS specifies if the cursor is already in CLASS or not." (when (not te) (message "Unknown location for tag-end in %s:" (semantic-tag-name aftertag))) (goto-char te) - ;; If there is a comment immediatly after aftertag, skip over it. + ;; If there is a comment immediately after aftertag, skip over it. (when (looking-at (concat "\\s-*\n?\\s-*" semantic-lex-comment-regex)) (let ((pos (point)) (rnext (semantic-find-tag-by-overlay-next (point)))) diff --git a/lisp/ezimage.el b/lisp/ezimage.el index b828f79f8f..e8680b65d9 100644 --- a/lisp/ezimage.el +++ b/lisp/ezimage.el @@ -257,9 +257,9 @@ Optional argument STRING is a string upon which to add text properties." (a (assoc bt ezimage-expand-image-button-alist))) ;; Regular images (created with `insert-image' are intangible ;; which (I suppose) make them more compatible with XEmacs 21. - ;; Unfortunatly, there is a giant pile o code dependent on the + ;; Unfortunately, there is a giant pile of code dependent on the ;; underlying text. This means if we leave it tangible, then I - ;; don't have to change said giant piles o code. + ;; don't have to change said giant piles of code. (if (and a (symbol-value (cdr a))) (ezimage-insert-over-text (symbol-value (cdr a)) start diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index ae150621dc..468825937b 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,7 @@ +2011-11-11 Juanma Barranquero + + * org-plot.el (org-plot/gnuplot-to-grid-data): Fix typo in docstring. + 2011-09-27 Eli Zaretskii * org.el (org-mode): Force left-to-right paragraphs in Org diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index d3c5dd99aa..866176e4e8 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el @@ -70,12 +70,12 @@ ;; (a few thousand lines long). Thus, code should follow the rule : ;; "collect once, use many". As a corollary, it is usally a bad idea ;; to use directly an interactive function inside the code, as those, -;; being independant entities, read the whole list structure another +;; being independent entities, read the whole list structure another ;; time. ;;; Code: -(eval-when-compile +(eval-when-compile (require 'cl)) (require 'org-macs) (require 'org-compat) diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el index b90c248eb6..419467226c 100644 --- a/lisp/org/org-plot.el +++ b/lisp/org/org-plot.el @@ -136,7 +136,7 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE." "Export the data in TABLE to DATA-FILE for gnuplot. This means in a format appropriate for grid plotting by gnuplot. PARAMS specifies which columns of TABLE should be plotted as independent -and dependant variables." +and dependent variables." (interactive) (let* ((ind (- (plist-get params :ind) 1)) (deps (if (plist-member params :deps) diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 18f47d14a3..453badfa46 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -959,7 +959,7 @@ IDL has currently stepped.") ;; Can not use history expansion because "!" is used for system variables. (setq comint-input-autoexpand nil) ;; (setq comint-input-ring-size 64) - + (set (make-local-variable 'completion-ignore-case) t) (set (make-local-variable 'comint-completion-addsuffix) '("/" . "")) (setq comint-input-ignoredups t) @@ -3707,7 +3707,7 @@ Existing overlays are recycled, in order to minimize consumption." (defun idlwave-shell-make-new-bp-overlay (&optional type disabled) "Make a new overlay for highlighting breakpoints. -This stuff is strongly dependant upon the version of Emacs. If TYPE +This stuff is strongly dependent upon the version of Emacs. If TYPE is passed, make an overlay of that type ('bp or 'bp-cond, currently only for glyphs)." (let ((ov (make-overlay 1 1)) diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index be8dd9c913..5b23a24259 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -1872,7 +1872,7 @@ This takes effect when first loading the library.") ("dir" . "Directory list (obsolete)") ("div" . "Generic block-level container") ("dl" . "Definition list") - ("dt" . "Term to be definined") + ("dt" . "Term to be defined") ("em" . "Emphasized") ("embed" . "Embedded data in foreign format") ("fig" . "Figure") diff --git a/nt/README.W32 b/nt/README.W32 index e4044e409d..259a0ea6e4 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -142,7 +142,7 @@ See the end of the file for license conditions. the PNG support will not work, and you will have to download newer versions. - JPEG: requires the Independant JPEG Group's libjpeg 6b or later, + JPEG: requires the Independent JPEG Group's libjpeg 6b or later, which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll. TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index 0a9df7d1ae..bd1a6ec591 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -7949,7 +7949,7 @@ 2010-05-11 Karel Klíč * ftfont.c: Fix incorrect parentheses of #if condition for - definining M17N_FLT_USE_NEW_FEATURE. + defining M17N_FLT_USE_NEW_FEATURE. 2010-05-11 Glenn Morris @@ -25474,7 +25474,7 @@ * term.c (terminal_encode_buffer): Make externally visible. - * makefile.w32-in: Add character.h dependancies. + * makefile.w32-in: Add character.h dependencies. (character.o, chartab.o): New targets. 2008-02-01 Kenichi Handa @@ -29718,7 +29718,7 @@ * keyboard.c (restore_kboard_configuration): Only define when MULTI_KBOARD defined. - * makefile.w32-in: Update dependancies from Makefile.in. + * makefile.w32-in: Update dependencies from Makefile.in. (OBJ1): Add terminal.$(O) * term.c (dissociate_if_controlling_tty) [WINDOWSNT]: diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 833119c9fc..6fd4d5dea2 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -13404,7 +13404,7 @@ 1998-10-20 Jason Rumney - * makefile.nt (w32fns.c): Add x-list-font.c to dependancies. + * makefile.nt (w32fns.c): Add x-list-font.c to dependencies. * w32faces.c: Update comments referring to obsolete structs. (allocate_face, copy_face, face_eql, load_font) diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index 1cd91a41b5..37199bcc29 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h @@ -89,7 +89,7 @@ along with GNU Emacs. If not, see . */ #undef HAVE_RANDOM -/* Rainer Malzbender says definining +/* Rainer Malzbender says defining HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ #ifndef HAVE_XRMSETDATABASE #define HAVE_XRMSETDATABASE diff --git a/src/xfaces.c b/src/xfaces.c index 9faa7c79e0..0ed6fa1d8e 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -27,7 +27,7 @@ along with GNU Emacs. If not, see . */ 1. Font family name. - 2. Font foundary name. + 2. Font foundry name. 3. Relative proportionate width, aka character set width or set width (swidth), e.g. `semi-compressed'. -- 2.20.1