From 7ee6a1d37268f1f4b7047fc6ccad271d2ee5fd31 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 13 Apr 2011 13:50:12 +0200 Subject: [PATCH] Fix typos. --- doc/emacs/ChangeLog | 5 +++++ doc/emacs/mini.texi | 2 +- doc/emacs/screen.texi | 2 +- doc/lispref/ChangeLog | 4 ++++ doc/lispref/windows.texi | 2 +- lisp/ChangeLog.14 | 2 +- lisp/cedet/ChangeLog | 8 ++++++++ lisp/cedet/ede/pconf.el | 4 ++-- lisp/cedet/ede/proj-comp.el | 4 ++-- lisp/cedet/ede/proj-elisp.el | 8 ++++---- lisp/cedet/ede/proj-scheme.el | 2 +- src/dispextern.h | 4 ++-- src/msdos.c | 2 +- 13 files changed, 33 insertions(+), 16 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index edd66bddfdf..4923316c4db 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2011-04-13 Juanma Barranquero + + * mini.texi (Minibuffer Edit): + * screen.texi (Mode Line): Fix typo. + 2011-03-26 Chong Yidong * display.texi (Auto Scrolling): Fix scroll-up/scroll-down confusion. diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index bf7e4469dd9..b7bda61e238 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -165,7 +165,7 @@ however: for instance, you cannot split it. @xref{Windows}. @vindex resize-mini-windows Normally, the minibuffer window occupies a single screen line. However, if you add two or more lines' worth of text into the -minibuffer, it expands automatically to accomodate the text. The +minibuffer, it expands automatically to accommodate the text. The variable @code{resize-mini-windows} controls the resizing of the minibuffer. The default value is @code{grow-only}, which means the behavior we have just described. If the value is @code{t}, the diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi index c3b2e178278..f12c03e1abf 100644 --- a/doc/emacs/screen.texi +++ b/doc/emacs/screen.texi @@ -260,7 +260,7 @@ the buffer. Minor modes are optional editing modes that provide additional features on top of the major mode. @xref{Minor Modes}. Some features are listed together with the minor modes whenever they -are turned on, even through they are not really minor modes. +are turned on, even though they are not really minor modes. @samp{Narrow} means that the buffer being displayed has editing restricted to only a portion of its text (@pxref{Narrowing}). @samp{Def} means that a keyboard macro is currently being defined diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 035fee67f8d..fc57e20e612 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2011-04-13 Juanma Barranquero + + * windows.texi (Choosing Window): Fix typo. + 2011-04-10 Chong Yidong * frames.texi (Layout Parameters): Note the difference between diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 77fd44fb162..f17fc3c718b 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -1015,7 +1015,7 @@ a window only if the space taken up by that window can accommodate two windows one above the other that are both at least @code{window-min-height} lines tall. Moreover, if the window that shall be split has a mode line, @code{split-window-sensibly} does not split -the window unless the new window can accomodate a mode line too. +the window unless the new window can accommodate a mode line too. @end defopt @defopt split-width-threshold diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index cf08fd0ae44..54d41f4d0ed 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -4283,7 +4283,7 @@ (proced-descend): New variable. (proced-sort): New arg descend. (proced-sort-interactive): Repeated calls toggle sort order. - (proced-format): Accomodate changes of proced-format-alist. + (proced-format): Accommodate changes of proced-format-alist. Undefined attributes are displayed as "?". (proced-process-attributes): New optional arg pid-list. Ignore processes with empty attribute list. diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 2d0cbb8159b..d8a4209cc98 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,11 @@ +2011-04-13 Juanma Barranquero + + * ede/pconf.el (ede-proj-tweak-autoconf, ede-proj-flush-autoconf): + * ede/proj-comp.el (ede-proj-tweak-autoconf, ede-proj-flush-autoconf): + * ede/proj-elisp.el (ede-proj-tweak-autoconf, ede-proj-flush-autoconf) + (ede-proj-tweak-autoconf, ede-proj-flush-autoconf): + * ede/proj-scheme.el (ede-proj-tweak-autoconf): Fix typos in docstrings. + 2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el index a2258c1d16f..77299c7eb39 100644 --- a/lisp/cedet/ede/pconf.el +++ b/lisp/cedet/ede/pconf.el @@ -160,7 +160,7 @@ don't do it. A value of nil means to just do it.") (ede-proj-configure-synchronize this)) (defmethod ede-proj-tweak-autoconf ((this ede-proj-target)) - "Tweak the configure file (current buffer) to accomodate THIS." + "Tweak the configure file (current buffer) to accommodate THIS." ;; Check the compilers belonging to THIS, and call the autoconf ;; setup for those compilers. (mapc 'ede-proj-tweak-autoconf (ede-proj-compilers this)) @@ -168,7 +168,7 @@ don't do it. A value of nil means to just do it.") ) (defmethod ede-proj-flush-autoconf ((this ede-proj-target)) - "Flush the configure file (current buffer) to accomodate THIS. + "Flush the configure file (current buffer) to accommodate THIS. By flushing, remove any cruft that may be in the file. Subsequent calls to `ede-proj-tweak-autoconf' can restore items removed by flush." nil) diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el index 9ec5cc64306..8757a6a1403 100644 --- a/lisp/cedet/ede/proj-comp.el +++ b/lisp/cedet/ede/proj-comp.el @@ -236,7 +236,7 @@ This will prevent rules from creating duplicate variables or rules." ;;; Methods: (defmethod ede-proj-tweak-autoconf ((this ede-compilation-program)) - "Tweak the configure file (current buffer) to accomodate THIS." + "Tweak the configure file (current buffer) to accommodate THIS." (mapcar (lambda (obj) (cond ((stringp obj) @@ -248,7 +248,7 @@ This will prevent rules from creating duplicate variables or rules." (oref this autoconf))) (defmethod ede-proj-flush-autoconf ((this ede-compilation-program)) - "Flush the configure file (current buffer) to accomodate THIS." + "Flush the configure file (current buffer) to accommodate THIS." nil) (defmacro proj-comp-insert-variable-once (varname &rest body) diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el index cff68debef0..1182c41128c 100644 --- a/lisp/cedet/ede/proj-elisp.el +++ b/lisp/cedet/ede/proj-elisp.el @@ -214,7 +214,7 @@ is found, such as a `-version' variable, or the standard header." (error "Don't know how to update load path")))) (defmethod ede-proj-tweak-autoconf ((this ede-proj-target-elisp)) - "Tweak the configure file (current buffer) to accomodate THIS." + "Tweak the configure file (current buffer) to accommodate THIS." (call-next-method) ;; Ok, now we have to tweak the autoconf provided `elisp-comp' program. (let ((ec (ede-expand-filename this "elisp-comp" 'newfile))) @@ -238,7 +238,7 @@ is found, such as a `-version' variable, or the standard header." (save-buffer)) ))) (defmethod ede-proj-flush-autoconf ((this ede-proj-target-elisp)) - "Flush the configure file (current buffer) to accomodate THIS." + "Flush the configure file (current buffer) to accommodate THIS." ;; Remove crufty old paths from elisp-compile (let ((ec (ede-expand-filename this "elisp-comp" 'newfile)) ) @@ -381,11 +381,11 @@ Argument THIS is the target which needs to insert an info file." ) (defmethod ede-proj-tweak-autoconf ((this ede-proj-target-elisp-autoloads)) - "Tweak the configure file (current buffer) to accomodate THIS." + "Tweak the configure file (current buffer) to accommodate THIS." (error "Autoloads not supported in autoconf yet")) (defmethod ede-proj-flush-autoconf ((this ede-proj-target-elisp-autoloads)) - "Flush the configure file (current buffer) to accomodate THIS." + "Flush the configure file (current buffer) to accommodate THIS." nil) (provide 'ede/proj-elisp) diff --git a/lisp/cedet/ede/proj-scheme.el b/lisp/cedet/ede/proj-scheme.el index 64a17503684..e3d99129d31 100644 --- a/lisp/cedet/ede/proj-scheme.el +++ b/lisp/cedet/ede/proj-scheme.el @@ -41,7 +41,7 @@ "This target consists of scheme files.") (defmethod ede-proj-tweak-autoconf ((this ede-proj-target-scheme)) - "Tweak the configure file (current buffer) to accomodate THIS." + "Tweak the configure file (current buffer) to accommodate THIS." (autoconf-insert-new-macro "AM_INIT_GUILE_MODULE")) (provide 'ede/proj-scheme) diff --git a/src/dispextern.h b/src/dispextern.h index 8e19bdae197..8ae5e23fa97 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -63,7 +63,7 @@ typedef HDC XImagePtr_or_DC; #ifdef HAVE_NS #include "nsgui.h" -/* following typedef needed to accomodate the MSDOS port, believe it or not */ +/* Following typedef needed to accommodate the MSDOS port, believe it or not. */ typedef struct ns_display_info Display_Info; typedef Pixmap XImagePtr; typedef XImagePtr XImagePtr_or_DC; @@ -368,7 +368,7 @@ struct glyph doesn't have a glyph in a font. */ unsigned glyph_not_available_p : 1; - + /* Non-zero means don't display cursor here. */ unsigned avoid_cursor_p : 1; diff --git a/src/msdos.c b/src/msdos.c index 87b857bbb9d..c176680bf9d 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -960,7 +960,7 @@ IT_set_face (int face) /* According to RBIL (INTERRUP.A, V-1000), 160 is the maximum possible width of a DOS display in any known text mode. We multiply by 2 to - accomodate the screen attribute byte. */ + accommodate the screen attribute byte. */ #define MAX_SCREEN_BUF 160*2 Lisp_Object Vdos_unsupported_char_glyph; -- 2.39.2