aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2011-04-13 13:50:12 +0200
committerJuanma Barranquero2011-04-13 13:50:12 +0200
commit7ee6a1d37268f1f4b7047fc6ccad271d2ee5fd31 (patch)
treee131fa1805a8201a25261336aa8846a57c321cfe
parent300f9fca551d3aa024ff24b85e6ab7f0ae49ae03 (diff)
downloademacs-7ee6a1d37268f1f4b7047fc6ccad271d2ee5fd31.tar.gz
emacs-7ee6a1d37268f1f4b7047fc6ccad271d2ee5fd31.zip
Fix typos.
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/mini.texi2
-rw-r--r--doc/emacs/screen.texi2
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/windows.texi2
-rw-r--r--lisp/ChangeLog.142
-rw-r--r--lisp/cedet/ChangeLog8
-rw-r--r--lisp/cedet/ede/pconf.el4
-rw-r--r--lisp/cedet/ede/proj-comp.el4
-rw-r--r--lisp/cedet/ede/proj-elisp.el8
-rw-r--r--lisp/cedet/ede/proj-scheme.el2
-rw-r--r--src/dispextern.h4
-rw-r--r--src/msdos.c2
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 @@
12011-04-13 Juanma Barranquero <lekktu@gmail.com>
2
3 * mini.texi (Minibuffer Edit):
4 * screen.texi (Mode Line): Fix typo.
5
12011-03-26 Chong Yidong <cyd@stupidchicken.com> 62011-03-26 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * display.texi (Auto Scrolling): Fix scroll-up/scroll-down confusion. 8 * 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}.
165@vindex resize-mini-windows 165@vindex resize-mini-windows
166 Normally, the minibuffer window occupies a single screen line. 166 Normally, the minibuffer window occupies a single screen line.
167However, if you add two or more lines' worth of text into the 167However, if you add two or more lines' worth of text into the
168minibuffer, it expands automatically to accomodate the text. The 168minibuffer, it expands automatically to accommodate the text. The
169variable @code{resize-mini-windows} controls the resizing of the 169variable @code{resize-mini-windows} controls the resizing of the
170minibuffer. The default value is @code{grow-only}, which means the 170minibuffer. The default value is @code{grow-only}, which means the
171behavior we have just described. If the value is @code{t}, the 171behavior 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
260additional features on top of the major mode. @xref{Minor Modes}. 260additional features on top of the major mode. @xref{Minor Modes}.
261 261
262 Some features are listed together with the minor modes whenever they 262 Some features are listed together with the minor modes whenever they
263are turned on, even through they are not really minor modes. 263are turned on, even though they are not really minor modes.
264@samp{Narrow} means that the buffer being displayed has editing 264@samp{Narrow} means that the buffer being displayed has editing
265restricted to only a portion of its text (@pxref{Narrowing}). 265restricted to only a portion of its text (@pxref{Narrowing}).
266@samp{Def} means that a keyboard macro is currently being defined 266@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 @@
12011-04-13 Juanma Barranquero <lekktu@gmail.com>
2
3 * windows.texi (Choosing Window): Fix typo.
4
12011-04-10 Chong Yidong <cyd@stupidchicken.com> 52011-04-10 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * frames.texi (Layout Parameters): Note the difference between 7 * 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
1015windows one above the other that are both at least 1015windows one above the other that are both at least
1016@code{window-min-height} lines tall. Moreover, if the window that shall 1016@code{window-min-height} lines tall. Moreover, if the window that shall
1017be split has a mode line, @code{split-window-sensibly} does not split 1017be split has a mode line, @code{split-window-sensibly} does not split
1018the window unless the new window can accomodate a mode line too. 1018the window unless the new window can accommodate a mode line too.
1019@end defopt 1019@end defopt
1020 1020
1021@defopt split-width-threshold 1021@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 @@
4283 (proced-descend): New variable. 4283 (proced-descend): New variable.
4284 (proced-sort): New arg descend. 4284 (proced-sort): New arg descend.
4285 (proced-sort-interactive): Repeated calls toggle sort order. 4285 (proced-sort-interactive): Repeated calls toggle sort order.
4286 (proced-format): Accomodate changes of proced-format-alist. 4286 (proced-format): Accommodate changes of proced-format-alist.
4287 Undefined attributes are displayed as "?". 4287 Undefined attributes are displayed as "?".
4288 (proced-process-attributes): New optional arg pid-list. 4288 (proced-process-attributes): New optional arg pid-list.
4289 Ignore processes with empty attribute list. 4289 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 @@
12011-04-13 Juanma Barranquero <lekktu@gmail.com>
2
3 * ede/pconf.el (ede-proj-tweak-autoconf, ede-proj-flush-autoconf):
4 * ede/proj-comp.el (ede-proj-tweak-autoconf, ede-proj-flush-autoconf):
5 * ede/proj-elisp.el (ede-proj-tweak-autoconf, ede-proj-flush-autoconf)
6 (ede-proj-tweak-autoconf, ede-proj-flush-autoconf):
7 * ede/proj-scheme.el (ede-proj-tweak-autoconf): Fix typos in docstrings.
8
12011-03-07 Chong Yidong <cyd@stupidchicken.com> 92011-03-07 Chong Yidong <cyd@stupidchicken.com>
2 10
3 * Version 23.3 released. 11 * 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.")
160 (ede-proj-configure-synchronize this)) 160 (ede-proj-configure-synchronize this))
161 161
162(defmethod ede-proj-tweak-autoconf ((this ede-proj-target)) 162(defmethod ede-proj-tweak-autoconf ((this ede-proj-target))
163 "Tweak the configure file (current buffer) to accomodate THIS." 163 "Tweak the configure file (current buffer) to accommodate THIS."
164 ;; Check the compilers belonging to THIS, and call the autoconf 164 ;; Check the compilers belonging to THIS, and call the autoconf
165 ;; setup for those compilers. 165 ;; setup for those compilers.
166 (mapc 'ede-proj-tweak-autoconf (ede-proj-compilers this)) 166 (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.")
168 ) 168 )
169 169
170(defmethod ede-proj-flush-autoconf ((this ede-proj-target)) 170(defmethod ede-proj-flush-autoconf ((this ede-proj-target))
171 "Flush the configure file (current buffer) to accomodate THIS. 171 "Flush the configure file (current buffer) to accommodate THIS.
172By flushing, remove any cruft that may be in the file. Subsequent 172By flushing, remove any cruft that may be in the file. Subsequent
173calls to `ede-proj-tweak-autoconf' can restore items removed by flush." 173calls to `ede-proj-tweak-autoconf' can restore items removed by flush."
174 nil) 174 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."
236 236
237;;; Methods: 237;;; Methods:
238(defmethod ede-proj-tweak-autoconf ((this ede-compilation-program)) 238(defmethod ede-proj-tweak-autoconf ((this ede-compilation-program))
239 "Tweak the configure file (current buffer) to accomodate THIS." 239 "Tweak the configure file (current buffer) to accommodate THIS."
240 (mapcar 240 (mapcar
241 (lambda (obj) 241 (lambda (obj)
242 (cond ((stringp obj) 242 (cond ((stringp obj)
@@ -248,7 +248,7 @@ This will prevent rules from creating duplicate variables or rules."
248 (oref this autoconf))) 248 (oref this autoconf)))
249 249
250(defmethod ede-proj-flush-autoconf ((this ede-compilation-program)) 250(defmethod ede-proj-flush-autoconf ((this ede-compilation-program))
251 "Flush the configure file (current buffer) to accomodate THIS." 251 "Flush the configure file (current buffer) to accommodate THIS."
252 nil) 252 nil)
253 253
254(defmacro proj-comp-insert-variable-once (varname &rest body) 254(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."
214 (error "Don't know how to update load path")))) 214 (error "Don't know how to update load path"))))
215 215
216(defmethod ede-proj-tweak-autoconf ((this ede-proj-target-elisp)) 216(defmethod ede-proj-tweak-autoconf ((this ede-proj-target-elisp))
217 "Tweak the configure file (current buffer) to accomodate THIS." 217 "Tweak the configure file (current buffer) to accommodate THIS."
218 (call-next-method) 218 (call-next-method)
219 ;; Ok, now we have to tweak the autoconf provided `elisp-comp' program. 219 ;; Ok, now we have to tweak the autoconf provided `elisp-comp' program.
220 (let ((ec (ede-expand-filename this "elisp-comp" 'newfile))) 220 (let ((ec (ede-expand-filename this "elisp-comp" 'newfile)))
@@ -238,7 +238,7 @@ is found, such as a `-version' variable, or the standard header."
238 (save-buffer)) ))) 238 (save-buffer)) )))
239 239
240(defmethod ede-proj-flush-autoconf ((this ede-proj-target-elisp)) 240(defmethod ede-proj-flush-autoconf ((this ede-proj-target-elisp))
241 "Flush the configure file (current buffer) to accomodate THIS." 241 "Flush the configure file (current buffer) to accommodate THIS."
242 ;; Remove crufty old paths from elisp-compile 242 ;; Remove crufty old paths from elisp-compile
243 (let ((ec (ede-expand-filename this "elisp-comp" 'newfile)) 243 (let ((ec (ede-expand-filename this "elisp-comp" 'newfile))
244 ) 244 )
@@ -381,11 +381,11 @@ Argument THIS is the target which needs to insert an info file."
381 ) 381 )
382 382
383(defmethod ede-proj-tweak-autoconf ((this ede-proj-target-elisp-autoloads)) 383(defmethod ede-proj-tweak-autoconf ((this ede-proj-target-elisp-autoloads))
384 "Tweak the configure file (current buffer) to accomodate THIS." 384 "Tweak the configure file (current buffer) to accommodate THIS."
385 (error "Autoloads not supported in autoconf yet")) 385 (error "Autoloads not supported in autoconf yet"))
386 386
387(defmethod ede-proj-flush-autoconf ((this ede-proj-target-elisp-autoloads)) 387(defmethod ede-proj-flush-autoconf ((this ede-proj-target-elisp-autoloads))
388 "Flush the configure file (current buffer) to accomodate THIS." 388 "Flush the configure file (current buffer) to accommodate THIS."
389 nil) 389 nil)
390 390
391(provide 'ede/proj-elisp) 391(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 @@
41 "This target consists of scheme files.") 41 "This target consists of scheme files.")
42 42
43(defmethod ede-proj-tweak-autoconf ((this ede-proj-target-scheme)) 43(defmethod ede-proj-tweak-autoconf ((this ede-proj-target-scheme))
44 "Tweak the configure file (current buffer) to accomodate THIS." 44 "Tweak the configure file (current buffer) to accommodate THIS."
45 (autoconf-insert-new-macro "AM_INIT_GUILE_MODULE")) 45 (autoconf-insert-new-macro "AM_INIT_GUILE_MODULE"))
46 46
47(provide 'ede/proj-scheme) 47(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;
63 63
64#ifdef HAVE_NS 64#ifdef HAVE_NS
65#include "nsgui.h" 65#include "nsgui.h"
66/* following typedef needed to accomodate the MSDOS port, believe it or not */ 66/* Following typedef needed to accommodate the MSDOS port, believe it or not. */
67typedef struct ns_display_info Display_Info; 67typedef struct ns_display_info Display_Info;
68typedef Pixmap XImagePtr; 68typedef Pixmap XImagePtr;
69typedef XImagePtr XImagePtr_or_DC; 69typedef XImagePtr XImagePtr_or_DC;
@@ -368,7 +368,7 @@ struct glyph
368 doesn't have a glyph in a font. */ 368 doesn't have a glyph in a font. */
369 unsigned glyph_not_available_p : 1; 369 unsigned glyph_not_available_p : 1;
370 370
371 371
372 /* Non-zero means don't display cursor here. */ 372 /* Non-zero means don't display cursor here. */
373 unsigned avoid_cursor_p : 1; 373 unsigned avoid_cursor_p : 1;
374 374
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)
960 960
961/* According to RBIL (INTERRUP.A, V-1000), 160 is the maximum possible 961/* According to RBIL (INTERRUP.A, V-1000), 160 is the maximum possible
962 width of a DOS display in any known text mode. We multiply by 2 to 962 width of a DOS display in any known text mode. We multiply by 2 to
963 accomodate the screen attribute byte. */ 963 accommodate the screen attribute byte. */
964#define MAX_SCREEN_BUF 160*2 964#define MAX_SCREEN_BUF 160*2
965 965
966Lisp_Object Vdos_unsupported_char_glyph; 966Lisp_Object Vdos_unsupported_char_glyph;