aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2011-11-14 22:00:24 +0100
committerJuanma Barranquero2011-11-14 22:00:24 +0100
commit0b381c7eb83c635f39159168a48c869d632d8081 (patch)
tree32ad79519ce958dc2dbcdcd357d37d652314edb1
parent8350f087efe62e2ce0ded434534629a56cdc4e8c (diff)
downloademacs-0b381c7eb83c635f39159168a48c869d632d8081.tar.gz
emacs-0b381c7eb83c635f39159168a48c869d632d8081.zip
Fix typos.
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/intro.texi2
-rw-r--r--doc/misc/ChangeLog7
-rw-r--r--doc/misc/ediff.texi2
-rw-r--r--doc/misc/sem-user.texi2
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/MAILINGLISTS2
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/ChangeLog.52
-rw-r--r--lisp/ChangeLog.72
-rw-r--r--lisp/allout-widgets.el2
-rw-r--r--lisp/allout.el2
-rw-r--r--lisp/bs.el2
-rw-r--r--lisp/cedet/ChangeLog12
-rw-r--r--lisp/cedet/ede/auto.el2
-rw-r--r--lisp/cedet/ede/generic.el2
-rw-r--r--lisp/cedet/ede/proj-comp.el2
-rw-r--r--lisp/cedet/semantic/analyze.el2
-rw-r--r--lisp/cedet/semantic/ctxt.el2
-rw-r--r--lisp/cedet/semantic/db-typecache.el2
-rw-r--r--lisp/cedet/semantic/imenu.el2
-rw-r--r--lisp/cedet/semantic/scope.el4
-rw-r--r--lisp/cedet/semantic/tag-ls.el2
-rw-r--r--lisp/cedet/semantic/wisent/python.el4
-rw-r--r--lisp/cedet/srecode/semantic.el2
-rw-r--r--lisp/emacs-lisp/eieio-speedbar.el4
-rw-r--r--lisp/erc/ChangeLog4
-rw-r--r--lisp/erc/ChangeLog.012
-rw-r--r--lisp/erc/erc-notify.el6
-rw-r--r--lisp/international/mule.el4
-rw-r--r--lisp/international/titdic-cnv.el2
-rw-r--r--lisp/mail/rmail.el2
-rw-r--r--lisp/mail/rmailmm.el4
-rw-r--r--lisp/mh-e/ChangeLog.122
-rw-r--r--lisp/progmodes/prolog.el4
-rw-r--r--lisp/progmodes/verilog-mode.el2
-rw-r--r--lisp/term/x-win.el4
-rw-r--r--lisp/textmodes/ispell.el2
-rw-r--r--lisp/textmodes/reftex-global.el2
-rw-r--r--lisp/textmodes/sgml-mode.el2
-rw-r--r--src/ChangeLog2
-rw-r--r--src/ChangeLog.104
-rw-r--r--src/ChangeLog.112
-rw-r--r--src/ChangeLog.32
-rw-r--r--src/ChangeLog.72
-rw-r--r--src/charset.c4
-rw-r--r--src/charset.h6
-rw-r--r--src/chartab.c2
-rw-r--r--src/composite.c2
-rw-r--r--src/fontset.c2
-rw-r--r--src/image.c2
-rw-r--r--src/unexelf.c2
-rw-r--r--src/xfont.c6
53 files changed, 110 insertions, 76 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a8e1439d242..1e7f0529bd5 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12011-11-14 Juanma Barranquero <lekktu@gmail.com>
2
3 * intro.texi (Lisp History): Fix typo.
4
12011-11-12 Martin Rudalics <rudalics@gmx.at> 52011-11-12 Martin Rudalics <rudalics@gmx.at>
2 6
3 * windows.texi (Splitting Windows, Deleting Windows): Remove 7 * windows.texi (Splitting Windows, Deleting Windows): Remove
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi
index 7c070726023..44ac947fa99 100644
--- a/doc/lispref/intro.texi
+++ b/doc/lispref/intro.texi
@@ -101,7 +101,7 @@ for other purposes as well, such as writing editing commands.
101 Dozens of Lisp implementations have been built over the years, each 101 Dozens of Lisp implementations have been built over the years, each
102with its own idiosyncrasies. Many of them were inspired by Maclisp, 102with its own idiosyncrasies. Many of them were inspired by Maclisp,
103which was written in the 1960s at MIT's Project MAC. Eventually the 103which was written in the 1960s at MIT's Project MAC. Eventually the
104implementors of the descendants of Maclisp came together and developed a 104implementers of the descendants of Maclisp came together and developed a
105standard for Lisp systems, called Common Lisp. In the meantime, Gerry 105standard for Lisp systems, called Common Lisp. In the meantime, Gerry
106Sussman and Guy Steele at MIT developed a simplified but very powerful 106Sussman and Guy Steele at MIT developed a simplified but very powerful
107dialect of Lisp, called Scheme. 107dialect of Lisp, called Scheme.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index af8d38a077f..f06405be625 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12011-11-14 Juanma Barranquero <lekktu@gmail.com>
2
3 * ediff.texi (Hooks):
4 * sem-user.texi (Semanticdb Roots): Fix typo.
5
12011-11-11 Juanma Barranquero <lekktu@gmail.com> 62011-11-11 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * semantic.texi (Tag handling): Fix typo. 8 * semantic.texi (Tag handling): Fix typo.
@@ -300,7 +305,7 @@
300 305
3012011-08-15 Eric Schulte <schulte.eric@gmail.com> 3062011-08-15 Eric Schulte <schulte.eric@gmail.com>
302 307
303 * org.texi (Evaluating code blocks): Expanded discussion of 308 * org.texi (Evaluating code blocks): Expanded discussion of
304 #+call: line syntax. 309 #+call: line syntax.
305 (Header arguments in function calls): Expanded discussion of 310 (Header arguments in function calls): Expanded discussion of
306 #+call: line syntax. 311 #+call: line syntax.
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 20c2ed90873..62cd684b57b 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -1207,7 +1207,7 @@ This hook can be used to alter bindings in Ediff's keymap,
1207@code{ediff-mode-map}. These hooks are 1207@code{ediff-mode-map}. These hooks are
1208run right after the default bindings are set but before 1208run right after the default bindings are set but before
1209@code{ediff-load-hook}. The regular user needs not be concerned with this 1209@code{ediff-load-hook}. The regular user needs not be concerned with this
1210hook---it is provided for implementors of other Emacs packages built on top 1210hook---it is provided for implementers of other Emacs packages built on top
1211of Ediff. 1211of Ediff.
1212 1212
1213@item ediff-before-setup-windows-hook 1213@item ediff-before-setup-windows-hook
diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi
index 463276f9fd0..7a363523aa6 100644
--- a/doc/misc/sem-user.texi
+++ b/doc/misc/sem-user.texi
@@ -382,7 +382,7 @@ them yourself.
382@deffn Option semanticdb-project-roots 382@deffn Option semanticdb-project-roots
383The value of this variable is a list of directories (strings) that are 383The value of this variable is a list of directories (strings) that are
384project roots. All subdirectories of a project root are considered 384project roots. All subdirectories of a project root are considered
385part of the same project. This variable can be overriden by 385part of the same project. This variable can be overridden by
386@code{semanticdb-project-root-functions}. 386@code{semanticdb-project-root-functions}.
387@end deffn 387@end deffn
388 388
diff --git a/etc/ChangeLog b/etc/ChangeLog
index b494c8e3c96..1b1bc3f2abd 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12011-11-14 Juanma Barranquero <lekktu@gmail.com>
2
3 * MAILINGLISTS: Fix typo.
4
12011-10-29 Eli Zaretskii <eliz@gnu.org> 52011-10-29 Eli Zaretskii <eliz@gnu.org>
2 6
3 * themes/wombat-theme.el: Add a coding cookie. (Bug#9905) 7 * themes/wombat-theme.el: Add a coding cookie. (Bug#9905)
diff --git a/etc/MAILINGLISTS b/etc/MAILINGLISTS
index ef918d3d211..98f10511835 100644
--- a/etc/MAILINGLISTS
+++ b/etc/MAILINGLISTS
@@ -170,7 +170,7 @@ for yourself in particular, you may have to hire someone. The GNU
170project maintains a list of people providing such services. It is 170project maintains a list of people providing such services. It is
171found in <URL:http://www.gnu.org/prep/SERVICE>. 171found in <URL:http://www.gnu.org/prep/SERVICE>.
172 172
173Anything addressed to the implementors and maintainers of a GNU program 173Anything addressed to the implementers and maintainers of a GNU program
174via a bug-* list, should NOT be sent to the corresponding info-* or 174via a bug-* list, should NOT be sent to the corresponding info-* or
175help-* list. 175help-* list.
176 176
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b84a7b9ded7..091117ef53d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
12011-11-14 Juanma Barranquero <lekktu@gmail.com>
2
3 * international/mule.el (define-charset):
4 * mail/rmailmm.el (rmail-mime-find-header-encoding):
5 * progmodes/prolog.el (prolog-mode-hook, prolog-inferior-mode-hook):
6 * progmodes/verilog-mode.el (verilog-backward-token):
7 * textmodes/ispell.el (lookup-words):
8 * textmodes/sgml-mode.el (sgml-guess-indent): Fix typos.
9
12011-11-14 Glenn Morris <rgm@gnu.org> 102011-11-14 Glenn Morris <rgm@gnu.org>
2 11
3 * progmodes/executable.el 12 * progmodes/executable.el
@@ -5631,7 +5640,7 @@
56312011-05-28 Stefan Monnier <monnier@iro.umontreal.ca> 56402011-05-28 Stefan Monnier <monnier@iro.umontreal.ca>
5632 5641
5633 * minibuffer.el (completion--capf-wrapper): Check applicability before 5642 * minibuffer.el (completion--capf-wrapper): Check applicability before
5634 retuning non-nil for non-exclusive completion data. 5643 returning non-nil for non-exclusive completion data.
5635 * progmodes/etags.el (tags-completion-at-point-function): 5644 * progmodes/etags.el (tags-completion-at-point-function):
5636 * info-look.el (info-lookup-completions-at-point): Mark as 5645 * info-look.el (info-lookup-completions-at-point): Mark as
5637 non-exclusive. 5646 non-exclusive.
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index 1edf6d692a0..5e261722cb1 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -879,7 +879,7 @@
879 * ada-mode.el (initial comments): Copyright 1995; don't speak 879 * ada-mode.el (initial comments): Copyright 1995; don't speak
880 about setup; correct history for a file that actually IS in 880 about setup; correct history for a file that actually IS in
881 Emacs 19.29; update list of known bugs. 881 Emacs 19.29; update list of known bugs.
882 (all functions): Inititialize all local variables explicitely to 'nil'. 882 (all functions): Initialize all local variables explicitely to 'nil'.
883 (ada-font-lock-keywords): Initialized according to new user option 883 (ada-font-lock-keywords): Initialized according to new user option
884 `font-lock-maximum-decoration'. 884 `font-lock-maximum-decoration'.
885 885
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index ed7ee443c4c..e9723e04a27 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -1948,7 +1948,7 @@
1948 Add support for loading the files that contain :version when doing 1948 Add support for loading the files that contain :version when doing
1949 `customize-changed-options' so it can know which variables have 1949 `customize-changed-options' so it can know which variables have
1950 changed even in files that were not loaded at the time it was called. 1950 changed even in files that were not loaded at the time it was called.
1951 * cus-edit.el (customize-changed-options): Remeber all the 1951 * cus-edit.el (customize-changed-options): Remember all the
1952 versions and load the corresponding files before we show the 1952 versions and load the corresponding files before we show the
1953 customization buffer. Change the sorting to show the groups first 1953 customization buffer. Change the sorting to show the groups first
1954 in the customization buffer. 1954 in the customization buffer.
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 472615039bb..c165886aeed 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -1465,7 +1465,7 @@ recursive operation."
1465 1465
1466 :from nil ; item beginning - marker 1466 :from nil ; item beginning - marker
1467 :to nil ; item end - marker 1467 :to nil ; item end - marker
1468 :span-overlay nil ; overlay by which actual postion is determined 1468 :span-overlay nil ; overlay by which actual position is determined
1469 1469
1470 ;; also serves as guide-end: 1470 ;; also serves as guide-end:
1471 :icon-start nil 1471 :icon-start nil
diff --git a/lisp/allout.el b/lisp/allout.el
index 6b1542cd3f8..9eeddb207ff 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -3807,7 +3807,7 @@ Nuances:
3807 ;;(if doing-beginning (goto-char doing-beginning)) 3807 ;;(if doing-beginning (goto-char doing-beginning))
3808 (if (not (bobp)) 3808 (if (not (bobp))
3809 ;; We insert a newline char rather than using open-line to 3809 ;; We insert a newline char rather than using open-line to
3810 ;; avoid rear-stickiness inheritence of read-only property. 3810 ;; avoid rear-stickiness inheritance of read-only property.
3811 (progn (if (and (not (> depth ref-depth)) 3811 (progn (if (and (not (> depth ref-depth))
3812 (not before)) 3812 (not before))
3813 (open-line 1) 3813 (open-line 1)
diff --git a/lisp/bs.el b/lisp/bs.el
index 0c32c8b4f19..2a31b05a31f 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -25,7 +25,7 @@
25;; Version: 1.17 25;; Version: 1.17
26;; X-URL: http://www.geekware.de/software/emacs 26;; X-URL: http://www.geekware.de/software/emacs
27;; 27;;
28;; The bs-package contains a main function bs-show for poping up a 28;; The bs-package contains a main function bs-show for popping up a
29;; buffer in a way similar to `list-buffers' and `electric-buffer-list': 29;; buffer in a way similar to `list-buffers' and `electric-buffer-list':
30;; The new buffer offers a Buffer Selection Menu for manipulating 30;; The new buffer offers a Buffer Selection Menu for manipulating
31;; the buffer list and buffers. 31;; the buffer list and buffers.
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 2dc345b45da..0d621ad640a 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,11 @@
12011-11-14 Juanma Barranquero <lekktu@gmail.com>
2
3 * ede/auto.el (ede-project-autoload):
4 * ede/proj-comp.el (ede-makefile-rule):
5 * semantic/analyze.el (semantic-analyze-current-context):
6 * semantic/ctxt.el (semantic-get-local-variables):
7 * semantic/tag-ls.el (semantic-tag-calculate-parent): Fix typos.
8
12011-11-03 David Engster <dengste@eml.cc> 92011-11-03 David Engster <dengste@eml.cc>
2 10
3 * srecode.el: 11 * srecode.el:
@@ -444,7 +452,7 @@
444 * semantic/decorate/include.el 452 * semantic/decorate/include.el
445 (semantic-decoration-on-unknown-includes): Change light bgcolor. 453 (semantic-decoration-on-unknown-includes): Change light bgcolor.
446 (semantic-decoration-on-includes-highlight-default): Check that 454 (semantic-decoration-on-includes-highlight-default): Check that
447 the include tag has a postion. 455 the include tag has a position.
448 456
449 * semantic/complete.el (semantic-collector-local-members): 457 * semantic/complete.el (semantic-collector-local-members):
450 (semantic-complete-read-tag-local-members) 458 (semantic-complete-read-tag-local-members)
@@ -547,7 +555,7 @@
547 (semantic-analyzer-debug-missing-innertype): Change "prefix" to 555 (semantic-analyzer-debug-missing-innertype): Change "prefix" to
548 "symbol" in messages. 556 "symbol" in messages.
549 557
550 * semantic/analyze/refs.el: (semantic-analyze-refs-impl) 558 * semantic/analyze/refs.el (semantic-analyze-refs-impl)
551 (semantic-analyze-refs-proto): When calculating value, make sure 559 (semantic-analyze-refs-proto): When calculating value, make sure
552 the found tag is 'similar' to the originating tag. 560 the found tag is 'similar' to the originating tag.
553 (semantic--analyze-refs-find-tags-with-parent): Attempt to 561 (semantic--analyze-refs-find-tags-with-parent): Attempt to
diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el
index 09535ffce6b..d08ab543b82 100644
--- a/lisp/cedet/ede/auto.el
+++ b/lisp/cedet/ede/auto.el
@@ -49,7 +49,7 @@ routine instead.")
49 :documentation 49 :documentation
50 "Initializers passed to the project object. 50 "Initializers passed to the project object.
51These are used so there can be multiple types of projects 51These are used so there can be multiple types of projects
52associated with a single object class, based on the initilizeres used.") 52associated with a single object class, based on the initializers used.")
53 (load-type :initarg :load-type 53 (load-type :initarg :load-type
54 :documentation "Fn symbol used to load this project file.") 54 :documentation "Fn symbol used to load this project file.")
55 (class-sym :initarg :class-sym 55 (class-sym :initarg :class-sym
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 7eef0a4121e..b557d703f29 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -70,7 +70,7 @@
70;; subclasses `ede-generic-target'. The slots `shortname' and 70;; subclasses `ede-generic-target'. The slots `shortname' and
71;; `extension' should be given new initial values. 71;; `extension' should be given new initial values.
72;; 72;;
73;; Optionally, any target method used by EDE can then be overriden. 73;; Optionally, any target method used by EDE can then be overridden.
74;; The ede-generic-target-c-cpp has some example methods setting up 74;; The ede-generic-target-c-cpp has some example methods setting up
75;; the pre-processor map and system include path. 75;; the pre-processor map and system include path.
76;; 76;;
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index 1a2843f7651..ae5796e042b 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -149,7 +149,7 @@ belonging to the target name.")
149 :type list 149 :type list
150 :custom (repeat string) 150 :custom (repeat string)
151 :documentation "Scripts to execute. 151 :documentation "Scripts to execute.
152These scripst will be executed in sh (Unless the SHELL variable is overriden). 152These scripts will be executed in sh (Unless the SHELL variable is overridden).
153Do not prefix with TAB. 153Do not prefix with TAB.
154Each individual element of this list can be either a string, or 154Each individual element of this list can be either a string, or
155a lambda function. (The custom element does not yet express that.") 155a lambda function. (The custom element does not yet express that.")
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 5cdd1577a6e..a61fb6b1cf2 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -476,7 +476,7 @@ If called interactively, display interesting information about POSITION
476in a separate buffer. 476in a separate buffer.
477Returns an object based on symbol `semantic-analyze-context'. 477Returns an object based on symbol `semantic-analyze-context'.
478 478
479This function can be overriden with the symbol `analyze-context'. 479This function can be overridden with the symbol `analyze-context'.
480When overriding this function, your override will be called while 480When overriding this function, your override will be called while
481cursor is at POSITION. In addition, your function will not be called 481cursor is at POSITION. In addition, your function will not be called
482if a cached copy of the return object is found." 482if a cached copy of the return object is found."
diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el
index 2eddfdc1c8e..1108e019870 100644
--- a/lisp/cedet/semantic/ctxt.el
+++ b/lisp/cedet/semantic/ctxt.el
@@ -154,7 +154,7 @@ Return non-nil if there is no upper context."
154(define-overloadable-function semantic-get-local-variables (&optional point) 154(define-overloadable-function semantic-get-local-variables (&optional point)
155 "Get the local variables based on POINT's context. 155 "Get the local variables based on POINT's context.
156Local variables are returned in Semantic tag format. 156Local variables are returned in Semantic tag format.
157This can be overriden with `get-local-variables'." 157This can be overridden with `get-local-variables'."
158 ;; Disable parsing messages 158 ;; Disable parsing messages
159 (let ((semantic--progress-reporter nil)) 159 (let ((semantic--progress-reporter nil))
160 (save-excursion 160 (save-excursion
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index 0096c1aab09..76428057ef5 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -97,7 +97,7 @@ Said object must support `semantic-reset' methods.")
97 (when (semantic-find-tags-by-class 'type new-tags) 97 (when (semantic-find-tags-by-class 'type new-tags)
98 ;; Reset our index 98 ;; Reset our index
99 (oset tc filestream nil) 99 (oset tc filestream nil)
100 t ;; Return true, our core file tags have changed in a relavant way. 100 t ;; Return true, our core file tags have changed in a relevant way.
101 ) 101 )
102 102
103 ;; NO CODE HERE 103 ;; NO CODE HERE
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 35d9ff04a2a..033c34e1b83 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -393,7 +393,7 @@ Optional argument PARENT is a tag parent of STREAM."
393 semantic-imenu-bucketize-file) 393 semantic-imenu-bucketize-file)
394 (semantic-create-imenu-index-1 parts tag) 394 (semantic-create-imenu-index-1 parts tag)
395 (semantic-create-imenu-subindex parts)))) 395 (semantic-create-imenu-subindex parts))))
396 ;; Only add a *definition* if we have a postion 396 ;; Only add a *definition* if we have a position
397 ;; in that type tag. 397 ;; in that type tag.
398 (if (semantic-tag-with-position-p tag) 398 (if (semantic-tag-with-position-p tag)
399 (cons 399 (cons
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 53695015e4a..30c57571599 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -412,7 +412,7 @@ implicit \"object\"."
412 )) 412 ))
413 (setq typelist (cdr typelist))) 413 (setq typelist (cdr typelist)))
414 414
415 ;; Loop over the types (which should be sorted by postion 415 ;; Loop over the types (which should be sorted by position)
416 ;; adding to the scopelist as we go, and using the scopelist 416 ;; adding to the scopelist as we go, and using the scopelist
417 ;; for additional searching! 417 ;; for additional searching!
418 (while typelist2 418 (while typelist2
@@ -424,7 +424,7 @@ implicit \"object\"."
424 currentscope)) 424 currentscope))
425 (setq typelist2 (cdr typelist2))) 425 (setq typelist2 (cdr typelist2)))
426 426
427 ;; Collect all the types (class, etc) that are in our heratage. 427 ;; Collect all the types (class, etc) that are in our heritage.
428 ;; These are types that we can extract members from, not those 428 ;; These are types that we can extract members from, not those
429 ;; declared in using statements, or the like. 429 ;; declared in using statements, or the like.
430 ;; Get the PARENTS including nesting scope for this location. 430 ;; Get the PARENTS including nesting scope for this location.
diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el
index 8f54698d506..72c14141166 100644
--- a/lisp/cedet/semantic/tag-ls.el
+++ b/lisp/cedet/semantic/tag-ls.el
@@ -41,7 +41,7 @@
41 41
42(define-overloadable-function semantic-tag-calculate-parent (tag) 42(define-overloadable-function semantic-tag-calculate-parent (tag)
43 "Attempt to calculate the parent of TAG. 43 "Attempt to calculate the parent of TAG.
44The default behavior (if not overriden with `tag-calculate-parent') 44The default behavior (if not overridden with `tag-calculate-parent')
45is to search a buffer found with TAG, and if externally defined, 45is to search a buffer found with TAG, and if externally defined,
46search locally, then semanticdb for that tag (when enabled.)") 46search locally, then semanticdb for that tag (when enabled.)")
47 47
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index 095a817f08d..1f52e9eb3b6 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -108,7 +108,7 @@ line ends at the end of the buffer, leave the point there."
108(defun wisent-python-forward-line-skip-indented () 108(defun wisent-python-forward-line-skip-indented ()
109 "Move point to the next logical line, skipping indented lines. 109 "Move point to the next logical line, skipping indented lines.
110That is the next line whose indentation is less than or equal to the 110That is the next line whose indentation is less than or equal to the
111identation of the current line." 111indentation of the current line."
112 (let ((indent (current-indentation))) 112 (let ((indent (current-indentation)))
113 (while (progn (wisent-python-forward-line) 113 (while (progn (wisent-python-forward-line)
114 (and (not (eobp)) 114 (and (not (eobp))
@@ -291,7 +291,7 @@ To be implemented for Python! For now just return nil."
291 ;; Character used to separation a parent/child relationship 291 ;; Character used to separation a parent/child relationship
292 semantic-type-relation-separator-character '(".") 292 semantic-type-relation-separator-character '(".")
293 semantic-command-separation-character ";" 293 semantic-command-separation-character ";"
294 ;; The following is no more necessary as semantic-lex is overriden 294 ;; The following is no more necessary as semantic-lex is overridden
295 ;; in python-mode. 295 ;; in python-mode.
296 ;; semantic-lex-analyzer 'wisent-python-lexer 296 ;; semantic-lex-analyzer 'wisent-python-lexer
297 297
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 4a1a15c1d12..956bdfbd97a 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -394,7 +394,7 @@ as `function' will leave point where code might be inserted."
394 (srecode-semantic-apply-tag-to-dict tagobj dict))) 394 (srecode-semantic-apply-tag-to-dict tagobj dict)))
395 395
396 ;; Insert dict-entries into the dictionary LAST so that previous 396 ;; Insert dict-entries into the dictionary LAST so that previous
397 ;; items can be overriden. 397 ;; items can be overridden.
398 (let ((entries dict-entries)) 398 (let ((entries dict-entries))
399 (while entries 399 (while entries
400 (srecode-dictionary-set-value dict 400 (srecode-dictionary-set-value dict
diff --git a/lisp/emacs-lisp/eieio-speedbar.el b/lisp/emacs-lisp/eieio-speedbar.el
index d28ecd9615b..4ff3cc01978 100644
--- a/lisp/emacs-lisp/eieio-speedbar.el
+++ b/lisp/emacs-lisp/eieio-speedbar.el
@@ -282,7 +282,7 @@ Add one of the child classes to this class to the parent list of a class."
282 :abstract t) 282 :abstract t)
283 283
284 284
285;;; Methods to eieio-speedbar-* which do not need to be overriden 285;;; Methods to eieio-speedbar-* which do not need to be overridden
286;; 286;;
287(defmethod eieio-speedbar-make-tag-line ((object eieio-speedbar) 287(defmethod eieio-speedbar-make-tag-line ((object eieio-speedbar)
288 depth) 288 depth)
@@ -409,7 +409,7 @@ Optional DEPTH is the depth we start at."
409 default-directory)))) 409 default-directory))))
410 410
411 411
412;;; Methods to the eieio-speedbar-* classes which need to be overriden. 412;;; Methods to the eieio-speedbar-* classes which need to be overridden.
413;; 413;;
414(defmethod eieio-speedbar-object-children ((object eieio-speedbar)) 414(defmethod eieio-speedbar-object-children ((object eieio-speedbar))
415 "Return a list of children to be displayed in speedbar. 415 "Return a list of children to be displayed in speedbar.
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index d72d3f51bb1..9a029893352 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
12011-11-14 Juanma Barranquero <lekktu@gmail.com>
2
3 * erc-notify.el (erc-notify-interval, erc-cmd-NOTIFY): Fix typos.
4
12011-10-20 Chong Yidong <cyd@gnu.org> 52011-10-20 Chong Yidong <cyd@gnu.org>
2 6
3 * erc.el (define-erc-module): Fix autogenerated docstring to 7 * erc.el (define-erc-module): Fix autogenerated docstring to
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index e189ce26e1d..f73d2af949c 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -457,7 +457,7 @@
457 * erc.el: * Reduction patch 2 457 * erc.el: * Reduction patch 2
458 This time, we move the input ring handling into erc-ring.el 458 This time, we move the input ring handling into erc-ring.el
459 Remember that you need (require 'erc-ring) in your .emacs to get the input handling as a feature 459 Remember that you need (require 'erc-ring) in your .emacs to get the input handling as a feature
460 And remeber, that you don't need it if you don't use input ring :-) 460 And remember, that you don't need it if you don't use input ring :-)
461 461
462 * erc-ring.el: * Initial checkin 462 * erc-ring.el: * Initial checkin
463 463
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index 7ae15307a55..10f6806ec12 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -46,7 +46,7 @@ status change."
46 :type '(repeat string)) 46 :type '(repeat string))
47 47
48(defcustom erc-notify-interval 60 48(defcustom erc-notify-interval 60
49 "*Time interval (in seconds) for checking online status of notificated 49 "*Time interval (in seconds) for checking online status of notified
50people." 50people."
51 :group 'erc-notify 51 :group 'erc-notify
52 :type 'integer) 52 :type 'integer)
@@ -197,11 +197,11 @@ nick from `erc-last-ison' to prevent any further notifications."
197;;;###autoload 197;;;###autoload
198(defun erc-cmd-NOTIFY (&rest args) 198(defun erc-cmd-NOTIFY (&rest args)
199 "Change `erc-notify-list' or list current notify-list members online. 199 "Change `erc-notify-list' or list current notify-list members online.
200Without args, list the current list of notificated people online, 200Without args, list the current list of notified people online,
201with args, toggle notify status of people." 201with args, toggle notify status of people."
202 (cond 202 (cond
203 ((null args) 203 ((null args)
204 ;; Print current notificated people (online) 204 ;; Print current notified people (online)
205 (let ((ison (erc-with-server-buffer erc-last-ison))) 205 (let ((ison (erc-with-server-buffer erc-last-ison)))
206 (if (not ison) 206 (if (not ison)
207 (erc-display-message 207 (erc-display-message
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index cac37b3b8c5..2640778c64b 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -120,14 +120,14 @@ MAX-N is the maximum byte value of that.
120 120
121`:min-code' 121`:min-code'
122 122
123VALUE must be an integer specifying the mininum code point of the 123VALUE must be an integer specifying the minimum code point of the
124charset. If omitted, it is calculated from `:code-space'. VALUE may 124charset. If omitted, it is calculated from `:code-space'. VALUE may
125be a cons (HIGH . LOW), where HIGH is the most significant 16 bits of 125be a cons (HIGH . LOW), where HIGH is the most significant 16 bits of
126the code point and LOW is the least significant 16 bits. 126the code point and LOW is the least significant 16 bits.
127 127
128`:max-code' 128`:max-code'
129 129
130VALUE must be an integer specifying the maxinum code point of the 130VALUE must be an integer specifying the maximum code point of the
131charset. If omitted, it is calculated from `:code-space'. VALUE may 131charset. If omitted, it is calculated from `:code-space'. VALUE may
132be a cons (HIGH . LOW), where HIGH is the most significant 16 bits of 132be a cons (HIGH . LOW), where HIGH is the most significant 16 bits of
133the code point and LOW is the least significant 16 bits. 133the code point and LOW is the least significant 16 bits.
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index e68dc8bdc17..ad055ac9064 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -734,7 +734,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
734;; dictionary in the buffer DICBUF. The input method name of the 734;; dictionary in the buffer DICBUF. The input method name of the
735;; Quail package is NAME, and the title string is TITLE. 735;; Quail package is NAME, and the title string is TITLE.
736 736
737;; TSANG-P is non-nil, genereate $(06AQo(B input method. Otherwise 737;; TSANG-P is non-nil, generate $(06AQo(B input method. Otherwise
738;; generate $(0X|/y(B (simple version of $(06AQo(B). If BIG5-P is non-nil, the 738;; generate $(0X|/y(B (simple version of $(06AQo(B). If BIG5-P is non-nil, the
739;; input method is for inputting Big5 characters. Otherwise the input 739;; input method is for inputting Big5 characters. Otherwise the input
740;; method is for inputting CNS characters. 740;; method is for inputting CNS characters.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 5842f8e741f..4ecd1c2fd0d 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4500,7 +4500,7 @@ With prefix argument N moves forward N messages with these labels.
4500 4500
4501;;;*** 4501;;;***
4502 4502
4503;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "2c8675d7c069c68bc36a4003b15448d1") 4503;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "5d992206e382290d07ad7d9a2bf250c9")
4504;;; Generated autoloads from rmailmm.el 4504;;; Generated autoloads from rmailmm.el
4505 4505
4506(autoload 'rmail-mime "rmailmm" "\ 4506(autoload 'rmail-mime "rmailmm" "\
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index f9eaa68c85b..be38449a680 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -484,7 +484,7 @@ See `rmail-mime-entity' for the detail."
484 (insert "\n")))) 484 (insert "\n"))))
485 485
486(defun rmail-mime-find-header-encoding (header) 486(defun rmail-mime-find-header-encoding (header)
487 "Retun the last coding system used to decode HEADER. 487 "Return the last coding system used to decode HEADER.
488HEADER is a header component of a MIME-entity object (see 488HEADER is a header component of a MIME-entity object (see
489`rmail-mime-entity')." 489`rmail-mime-entity')."
490 (with-temp-buffer 490 (with-temp-buffer
@@ -1332,7 +1332,7 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
1332 (if (consp rmail-mime-coding-system) 1332 (if (consp rmail-mime-coding-system)
1333 ;; Decoding is done by rfc2047-decode-region only for a 1333 ;; Decoding is done by rfc2047-decode-region only for a
1334 ;; header. But, as the used coding system may have been 1334 ;; header. But, as the used coding system may have been
1335 ;; overriden by mm-charset-override-alist, we can't 1335 ;; overridden by mm-charset-override-alist, we can't
1336 ;; trust (car rmail-mime-coding-system). So, here we 1336 ;; trust (car rmail-mime-coding-system). So, here we
1337 ;; try the decoding again with mm-charset-override-alist 1337 ;; try the decoding again with mm-charset-override-alist
1338 ;; bound to nil. 1338 ;; bound to nil.
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 69ca927d5e7..827ce047591 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -610,7 +610,7 @@
610 'utils) (mh-require-cl) calls: 610 'utils) (mh-require-cl) calls:
611 611
612 (eval-when-compile (require 'mh-acros)) 612 (eval-when-compile (require 'mh-acros))
613 (mh-require-cl) 613 (mh-require-cl)
614 614
6152004-08-10 Bill Wohler <wohler@newt.com> 6152004-08-10 Bill Wohler <wohler@newt.com>
616 616
@@ -1960,8 +1960,8 @@
1960 switch between available variants. 1960 switch between available variants.
1961 (mh-variants): Available MH variants are described in this variable. 1961 (mh-variants): Available MH variants are described in this variable.
1962 (mh-variant-in-use, mh-variant-p): Developers may check which 1962 (mh-variant-in-use, mh-variant-p): Developers may check which
1963 variant is currently in use with the variable `mh-variant-in-use' 1963 variant is currently in use with the variable `mh-variant-in-use'
1964 or the function `mh-variant-p'. 1964 or the function `mh-variant-p'.
1965 1965
19662003-08-15 Bill Wohler <wohler@newt.com> 19662003-08-15 Bill Wohler <wohler@newt.com>
1967 1967
@@ -5959,7 +5959,7 @@
5959 to allow the user a customizable variable which will turn off 5959 to allow the user a customizable variable which will turn off
5960 folders based completion. 5960 folders based completion.
5961 (mh-prompt-for-folder): Use mh-folder-completing-read to read in 5961 (mh-prompt-for-folder): Use mh-folder-completing-read to read in
5962 the folder name with hierachical completion (closes SF #664821). 5962 the folder name with hierarchical completion (closes SF #664821).
5963 5963
5964 * mh-speed.el (mh-speed-folders, mh-speed-folders-cache) 5964 * mh-speed.el (mh-speed-folders, mh-speed-folders-cache)
5965 (mh-speed-folders-actual): Moved to mh-utils.el as mh-sub-folders, 5965 (mh-speed-folders-actual): Moved to mh-utils.el as mh-sub-folders,
@@ -8162,7 +8162,7 @@
8162 8162
81632002-10-24 Bill Wohler <wohler@newt.com> 81632002-10-24 Bill Wohler <wohler@newt.com>
8164 8164
8165 * mh-e is completely checkdoc clean now. 8165 * mh-e is completely checkdoc clean now.
8166 8166
8167 * mh-utils.el (mh-clean-message-header-flag): Renamed from 8167 * mh-utils.el (mh-clean-message-header-flag): Renamed from
8168 mh-clean-message-header. 8168 mh-clean-message-header.
@@ -9213,7 +9213,7 @@
9213 font, you may set this variable to expand the single reply 9213 font, you may set this variable to expand the single reply
9214 button into three buttons that won't lead to minibuffer prompt 9214 button into three buttons that won't lead to minibuffer prompt
9215 about who to reply to. 9215 about who to reply to.
9216 (mh-folder-tool-bar-map): Use mh-tool-bar-reply-3-buttons to 9216 (mh-folder-tool-bar-map): Use mh-tool-bar-reply-3-buttons to
9217 decide how many buttons to use for replying. 9217 decide how many buttons to use for replying.
9218 9218
9219 * mh-mime.el (mh-file-mime-type-substitutions) 9219 * mh-mime.el (mh-file-mime-type-substitutions)
@@ -10456,10 +10456,10 @@
10456 10456
104572001-12-04 Eric Ding <ericding@alum.mit.edu> 104572001-12-04 Eric Ding <ericding@alum.mit.edu>
10458 10458
10459 * mh-e.el: changes to face colors on dark backgrounds. 10459 * mh-e.el: changes to face colors on dark backgrounds.
10460 (mh-folder-followup-face): change to LightGoldenRod. 10460 (mh-folder-followup-face): change to LightGoldenRod.
10461 (mh-folder-date-face): change to snow3. 10461 (mh-folder-date-face): change to snow3.
10462 (mh-folder-msg-number-face): change to snow4. 10462 (mh-folder-msg-number-face): change to snow4.
10463 10463
104642001-12-04 Bill Wohler <wohler@newt.com> 104642001-12-04 Bill Wohler <wohler@newt.com>
10465 10465
@@ -11336,7 +11336,7 @@
11336 typically have 70 lines in my Emacs frame, so having a default of 11336 typically have 70 lines in my Emacs frame, so having a default of
11337 4 was silly for my case. 11337 4 was silly for my case.
11338 * mh-e.el (mh-update-sequences): Check for nil value of 11338 * mh-e.el (mh-update-sequences): Check for nil value of
11339 mh-current-folder, which happens if mh-summary-height < 4 11339 mh-current-folder, which happens if mh-summary-height < 4
11340 although I haven't tracked doen why that happens. 11340 although I haven't tracked doen why that happens.
11341 11341
113422001-10-22 Peter S Galbraith <psg@debian.org> 113422001-10-22 Peter S Galbraith <psg@debian.org>
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 283919c131e..00315856ad5 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -1023,7 +1023,7 @@ VERSION is of the format (Major . Minor)"
1023 1023
1024 1024
1025(defvar prolog-mode-hook nil 1025(defvar prolog-mode-hook nil
1026 "List of functions to call after the prolog mode has initialised.") 1026 "List of functions to call after the prolog mode has initialized.")
1027 1027
1028(unless (fboundp 'prog-mode) 1028(unless (fboundp 'prog-mode)
1029 (defalias 'prog-mode 'fundamental-mode)) 1029 (defalias 'prog-mode 'fundamental-mode))
@@ -1090,7 +1090,7 @@ Actually this is just customized `prolog-mode'."
1090 map)) 1090 map))
1091 1091
1092(defvar prolog-inferior-mode-hook nil 1092(defvar prolog-inferior-mode-hook nil
1093 "List of functions to call after the inferior prolog mode has initialised.") 1093 "List of functions to call after the inferior prolog mode has initialized.")
1094 1094
1095(defvar prolog-inferior-error-regexp-alist 1095(defvar prolog-inferior-error-regexp-alist
1096 '(;; GNU Prolog used to not follow the GNU standard format. 1096 '(;; GNU Prolog used to not follow the GNU standard format.
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 9ef7440f8da..ecd3b4af360 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -5128,7 +5128,7 @@ Set point to where line starts."
5128 continued)) 5128 continued))
5129 5129
5130(defun verilog-backward-token () 5130(defun verilog-backward-token ()
5131 "Step backward token, returing true if this is a continued line." 5131 "Step backward token, returning true if this is a continued line."
5132 (interactive) 5132 (interactive)
5133 (verilog-backward-syntactic-ws) 5133 (verilog-backward-syntactic-ws)
5134 (cond 5134 (cond
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index e3c42626a3f..05e18ed24a0 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1226,7 +1226,7 @@ The value nil is the same as the list (UTF8_STRING COMPOUND_TEXT STRING)."
1226 (if (string= clip-text "") (setq clip-text nil)) 1226 (if (string= clip-text "") (setq clip-text nil))
1227 1227
1228 ;; Check the CLIPBOARD selection for 'newness', is it different 1228 ;; Check the CLIPBOARD selection for 'newness', is it different
1229 ;; from what we remebered them to be last time we did a 1229 ;; from what we remembered them to be last time we did a
1230 ;; cut/paste operation. 1230 ;; cut/paste operation.
1231 (setq clip-text 1231 (setq clip-text
1232 (cond ;; check clipboard 1232 (cond ;; check clipboard
@@ -1243,7 +1243,7 @@ The value nil is the same as the list (UTF8_STRING COMPOUND_TEXT STRING)."
1243 (when x-select-enable-primary 1243 (when x-select-enable-primary
1244 (setq primary-text (x-selection-value-internal 'PRIMARY)) 1244 (setq primary-text (x-selection-value-internal 'PRIMARY))
1245 ;; Check the PRIMARY selection for 'newness', is it different 1245 ;; Check the PRIMARY selection for 'newness', is it different
1246 ;; from what we remebered them to be last time we did a 1246 ;; from what we remembered them to be last time we did a
1247 ;; cut/paste operation. 1247 ;; cut/paste operation.
1248 (setq primary-text 1248 (setq primary-text
1249 (cond ;; check primary selection 1249 (cond ;; check primary selection
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index d22346b518b..2ba1410d8f8 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2284,7 +2284,7 @@ Otherwise the variable `ispell-grep-command' contains the command used to
2284search for the words (usually egrep). 2284search for the words (usually egrep).
2285 2285
2286Optional second argument contains the dictionary to use; the default is 2286Optional second argument contains the dictionary to use; the default is
2287`ispell-alternate-dictionary', overriden by `ispell-complete-word-dict' 2287`ispell-alternate-dictionary', overridden by `ispell-complete-word-dict'
2288if defined." 2288if defined."
2289 ;; We don't use the filter for this function, rather the result is written 2289 ;; We don't use the filter for this function, rather the result is written
2290 ;; into a buffer. Hence there is no need to save the filter values. 2290 ;; into a buffer. Hence there is no need to save the filter values.
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index 6a3a7bef244..b7978fb37b6 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -253,7 +253,7 @@ one with the `xr' package."
253 253
254(defun reftex-translate (files search-re translate-alist error-fmt test) 254(defun reftex-translate (files search-re translate-alist error-fmt test)
255 ;; In FILES, look for SEARCH-RE and replace match 1 of it with 255 ;; In FILES, look for SEARCH-RE and replace match 1 of it with
256 ;; its association in TRANSLATE-ALSIT. 256 ;; its association in TRANSLATE-ALIST.
257 ;; If we do not find an association and TEST is non-nil, query 257 ;; If we do not find an association and TEST is non-nil, query
258 ;; to ignore the problematic string. 258 ;; to ignore the problematic string.
259 ;; If TEST is nil, it is ignored without query. 259 ;; If TEST is nil, it is ignored without query.
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 871701b7303..fa958632799 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1558,7 +1558,7 @@ LCON is the lexical context, if any."
1558 1558
1559(defun sgml-guess-indent () 1559(defun sgml-guess-indent ()
1560 "Guess an appropriate value for `sgml-basic-offset'. 1560 "Guess an appropriate value for `sgml-basic-offset'.
1561Base the guessed identation level on the first indented tag in the buffer. 1561Base the guessed indentation level on the first indented tag in the buffer.
1562Add this to `sgml-mode-hook' for convenience." 1562Add this to `sgml-mode-hook' for convenience."
1563 (interactive) 1563 (interactive)
1564 (save-excursion 1564 (save-excursion
diff --git a/src/ChangeLog b/src/ChangeLog
index 3c93caec5d8..860c019eb01 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -44,7 +44,7 @@
44 44
452011-11-11 Dmitry Antipov <dmantipov@yandex.ru> 452011-11-11 Dmitry Antipov <dmantipov@yandex.ru>
46 46
47 * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext. 47 * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.
48 48
492011-11-11 Kenichi Handa <handa@m17n.org> 492011-11-11 Kenichi Handa <handa@m17n.org>
50 50
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 9b61d107059..beb66847253 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -19139,7 +19139,7 @@
19139 (font_rescale_ratio): New function. 19139 (font_rescale_ratio): New function.
19140 (split_font_name): If NUMERIC_P is nonzero, set font->rescale_ratio. 19140 (split_font_name): If NUMERIC_P is nonzero, set font->rescale_ratio.
19141 (better_font_p): On comparing point sized, pay attention to 19141 (better_font_p): On comparing point sized, pay attention to
19142 recale_ratio member of fonts. 19142 rescale_ratio member of fonts.
19143 (build_scalable_font_name): Reflect font->rescale_ratio in the 19143 (build_scalable_font_name): Reflect font->rescale_ratio in the
19144 font name. 19144 font name.
19145 (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp variable. 19145 (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp variable.
@@ -22780,7 +22780,7 @@
227802002-07-23 Kenichi Handa <handa@etl.go.jp> 227802002-07-23 Kenichi Handa <handa@etl.go.jp>
22781 22781
22782 * xdisp.c (face_before_or_after_it_pos): 22782 * xdisp.c (face_before_or_after_it_pos):
22783 Call FETCH_MULTIBYTE_CHAR with byte postion, not char position. 22783 Call FETCH_MULTIBYTE_CHAR with byte position, not char position.
22784 22784
227852002-07-22 Juanma Barranquero <lektu@terra.es> 227852002-07-22 Juanma Barranquero <lektu@terra.es>
22786 22786
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 49bafda36a0..4e894cb3644 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -26748,7 +26748,7 @@
267482008-02-01 Kenichi Handa <handa@m17n.org> 267482008-02-01 Kenichi Handa <handa@m17n.org>
26749 26749
26750 * xdisp.c (face_before_or_after_it_pos): 26750 * xdisp.c (face_before_or_after_it_pos):
26751 Call FETCH_MULTIBYTE_CHAR with byte postion, not char position. 26751 Call FETCH_MULTIBYTE_CHAR with byte position, not char position.
26752 26752
267532008-02-01 Kenichi Handa <handa@m17n.org> 267532008-02-01 Kenichi Handa <handa@m17n.org>
26754 26754
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 2b63ed11bcc..cdfe63fc59c 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -15414,7 +15414,7 @@
15414 * xfns.c (Fx_create_screen): If user has specified 15414 * xfns.c (Fx_create_screen): If user has specified
15415 `x-iconic-startup' then start emacs in iconic form. 15415 `x-iconic-startup' then start emacs in iconic form.
15416 Look for icon position in `icon-left' and `icon-top', or use 15416 Look for icon position in `icon-left' and `icon-top', or use
15417 window postion. 15417 window position.
15418 15418
15419 * xterm.c (x_term_init): If server doesn't respond, use fatal 15419 * xterm.c (x_term_init): If server doesn't respond, use fatal
15420 instead of error. Also tell user about -d option. 15420 instead of error. Also tell user about -d option.
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index fa55d6974ad..699b2bf817e 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -7485,7 +7485,7 @@
7485 7485
74861997-06-09 Kenichi Handa <handa@etl.go.jp> 74861997-06-09 Kenichi Handa <handa@etl.go.jp>
7487 7487
7488 * buffer.c (init_buffer_once): Inititialize the member 7488 * buffer.c (init_buffer_once): Initialize the member
7489 buffer_file_coding_system. 7489 buffer_file_coding_system.
7490 (syms_of_buffer): Declare Lisp variables 7490 (syms_of_buffer): Declare Lisp variables
7491 default-buffer-file-coding-system and buffer-file-coding-system. 7491 default-buffer-file-coding-system and buffer-file-coding-system.
diff --git a/src/charset.c b/src/charset.c
index 8d6a3982d14..266753f9d05 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -162,8 +162,8 @@ static struct
162 /* 1 iff the following table is used for encoder. */ 162 /* 1 iff the following table is used for encoder. */
163 short for_encoder; 163 short for_encoder;
164 164
165 /* When the following table is used for encoding, mininum and 165 /* When the following table is used for encoding, minimum and
166 maxinum character of the current charset. */ 166 maximum character of the current charset. */
167 int min_char, max_char; 167 int min_char, max_char;
168 168
169 /* A Unicode character correspoinding to the code indice 0 (i.e. the 169 /* A Unicode character correspoinding to the code indice 0 (i.e. the
diff --git a/src/charset.h b/src/charset.h
index be02bc0feae..fc35d6bb991 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -153,7 +153,7 @@ struct charset
153 /* Dimension of the charset: 1, 2, 3, or 4. */ 153 /* Dimension of the charset: 1, 2, 3, or 4. */
154 int dimension; 154 int dimension;
155 155
156 /* Byte code range of each dimension. <code_space>[4N] is a mininum 156 /* Byte code range of each dimension. <code_space>[4N] is a minimum
157 byte code of the (N+1)th dimension, <code_space>[4N+1] is a 157 byte code of the (N+1)th dimension, <code_space>[4N+1] is a
158 maximum byte code of the (N+1)th dimension, <code_space>[4N+2] is 158 maximum byte code of the (N+1)th dimension, <code_space>[4N+2] is
159 (<code_space>[4N+1] - <code_space>[4N] + 1), <code_space>[4N+3] 159 (<code_space>[4N+1] - <code_space>[4N] + 1), <code_space>[4N+3]
@@ -199,14 +199,14 @@ struct charset
199 /* The method for encoding/decoding characters of the charset. */ 199 /* The method for encoding/decoding characters of the charset. */
200 enum charset_method method; 200 enum charset_method method;
201 201
202 /* Mininum and Maximum code points of the charset. */ 202 /* Minimum and Maximum code points of the charset. */
203 unsigned min_code, max_code; 203 unsigned min_code, max_code;
204 204
205 /* Offset value used by macros CODE_POINT_TO_INDEX and 205 /* Offset value used by macros CODE_POINT_TO_INDEX and
206 INDEX_TO_CODE_POINT. . */ 206 INDEX_TO_CODE_POINT. . */
207 unsigned char_index_offset; 207 unsigned char_index_offset;
208 208
209 /* Mininum and Maximum character codes of the charset. If the 209 /* Minimum and Maximum character codes of the charset. If the
210 charset is compatible with ASCII, min_char is a minimum non-ASCII 210 charset is compatible with ASCII, min_char is a minimum non-ASCII
211 character of the charset. If the method of charset is 211 character of the charset. If the method of charset is
212 CHARSET_METHOD_OFFSET, even if the charset is unified, min_char 212 CHARSET_METHOD_OFFSET, even if the charset is unified, min_char
diff --git a/src/chartab.c b/src/chartab.c
index 1d4ac04312a..7e8161461f3 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -758,7 +758,7 @@ map_sub_char_table (void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object),
758{ 758{
759 /* Depth of TABLE. */ 759 /* Depth of TABLE. */
760 int depth; 760 int depth;
761 /* Minimum and maxinum characters covered by TABLE. */ 761 /* Minimum and maximum characters covered by TABLE. */
762 int min_char, max_char; 762 int min_char, max_char;
763 /* Number of characters covered by one element of TABLE. */ 763 /* Number of characters covered by one element of TABLE. */
764 int chars_in_block; 764 int chars_in_block;
diff --git a/src/composite.c b/src/composite.c
index c8e4dd082ae..885e0262673 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1307,7 +1307,7 @@ composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I
1307 if (cmp_it->lookback == 0) 1307 if (cmp_it->lookback == 0)
1308 goto no_composition; 1308 goto no_composition;
1309 lgstring = Qnil; 1309 lgstring = Qnil;
1310 /* Try to find a shorter compostion that starts after CPOS. */ 1310 /* Try to find a shorter composition that starts after CPOS. */
1311 composition_compute_stop_pos (cmp_it, charpos, bytepos, cpos, 1311 composition_compute_stop_pos (cmp_it, charpos, bytepos, cpos,
1312 string); 1312 string);
1313 if (cmp_it->ch == -2 || cmp_it->stop_pos < charpos) 1313 if (cmp_it->ch == -2 || cmp_it->stop_pos < charpos)
diff --git a/src/fontset.c b/src/fontset.c
index 5c9ebf8440a..d802d235962 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1702,7 +1702,7 @@ static Lisp_Object auto_fontset_alist;
1702/* Number of automatically created fontsets. */ 1702/* Number of automatically created fontsets. */
1703static printmax_t num_auto_fontsets; 1703static printmax_t num_auto_fontsets;
1704 1704
1705/* Retun a fontset synthesized from FONT-OBJECT. This is called from 1705/* Return a fontset synthesized from FONT-OBJECT. This is called from
1706 x_new_font when FONT-OBJECT is used for the default ASCII font of a 1706 x_new_font when FONT-OBJECT is used for the default ASCII font of a
1707 frame, and the returned fontset is used for the default fontset of 1707 frame, and the returned fontset is used for the default fontset of
1708 that frame. The fontset specifies a font of the same registry as 1708 that frame. The fontset specifies a font of the same registry as
diff --git a/src/image.c b/src/image.c
index 14c74f10607..1869b83ac2a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7824,7 +7824,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
7824 7824
7825 if (imagemagick_rendermethod == 1) 7825 if (imagemagick_rendermethod == 1)
7826 { 7826 {
7827 /* Magicexportimage is normaly faster than pixelpushing. This 7827 /* Magicexportimage is normally faster than pixelpushing. This
7828 method is also well tested. Some aspects of this method are 7828 method is also well tested. Some aspects of this method are
7829 ad-hoc and needs to be more researched. */ 7829 ad-hoc and needs to be more researched. */
7830 int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/ 7830 int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/
diff --git a/src/unexelf.c b/src/unexelf.c
index 979d6dce629..04c029f7e80 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -1019,7 +1019,7 @@ temacs:
1019 /* The conditional bit below was in Oliva's original code 1019 /* The conditional bit below was in Oliva's original code
1020 (1999-08-25) and seems to have been dropped by mistake 1020 (1999-08-25) and seems to have been dropped by mistake
1021 subsequently. It prevents a crash at startup under X in 1021 subsequently. It prevents a crash at startup under X in
1022 `IRIX64 6.5 6.5.17m', whether compiled on that relase or 1022 `IRIX64 6.5 6.5.17m', whether compiled on that release or
1023 an earlier one. It causes no trouble on the other ELF 1023 an earlier one. It causes no trouble on the other ELF
1024 platforms I could test (Irix 6.5.15m, Solaris 8, Debian 1024 platforms I could test (Irix 6.5.15m, Solaris 8, Debian
1025 Potato x86, Debian Woody SPARC); however, it's reported 1025 Potato x86, Debian Woody SPARC); however, it's reported
diff --git a/src/xfont.c b/src/xfont.c
index 2c3ca911623..60e5aa6e98e 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -272,8 +272,8 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont,
272 return 0; 272 return 0;
273} 273}
274 274
275/* A hash table recoding which font supports which scritps. Each key 275/* A hash table recoding which font supports which scripts. Each key
276 is a vector of characteristic font propertis FOUNDRY to WIDTH and 276 is a vector of characteristic font properties FOUNDRY to WIDTH and
277 ADDSTYLE, and each value is a list of script symbols. 277 ADDSTYLE, and each value is a list of script symbols.
278 278
279 We assume that fonts that have the same value in the above 279 We assume that fonts that have the same value in the above
@@ -281,7 +281,7 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont,
281 281
282static Lisp_Object xfont_scripts_cache; 282static Lisp_Object xfont_scripts_cache;
283 283
284/* Re-usable vector to store characteristic font properites. */ 284/* Re-usable vector to store characteristic font properties. */
285static Lisp_Object xfont_scratch_props; 285static Lisp_Object xfont_scratch_props;
286 286
287/* Return a list of scripts supported by the font of FONTNAME whose 287/* Return a list of scripts supported by the font of FONTNAME whose