from trunk

63 files changed, 514 insertions, 162 deletions

diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 1686c5bcae7..e253cb6d1b4 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -88,9 +88,8 @@ Resent-CC:   maintainer email address, plus any X-Debbugs-CC: entries
 
 The "maintainer email address" is "bug-gnu-emacs@gnu.org" in most cases.
 
-They also have:
+A new report also has:
 
-Reply-To: bug submitter, 123@debbugs.gnu.org
 Mail-Followup-To: bug submitter, 123@debbugs.gnu.org
 
 ** To not get acknowledgement mail from the tracker,
@@ -174,13 +173,23 @@ reopen 123
 *** Bugs can be tagged in various ways (eg wontfix, patch, etc).
 The available tags are:
 patch wontfix moreinfo unreproducible fixed notabug
-Note that the list at http://debbugs.gnu.org/Developer#tags
-is incorrect, at least for Emacs.
+See http://debbugs.gnu.org/Developer#tags
 The list of tags can be prefixed with +, - or =, meaning to add (the
 default), remove, or reset the tags. E.g.:
 
 tags 123 + wontfix
 
+** URL shortcuts
+
+http://debbugs.gnu.org/...
+
+123             # given bug number
+123;mbox=yes    # mbox version of given bug
+package         # bugs in given package    (don't use "emacs" - too many bugs!)
+from:submitter@email.address
+severity:severity      # all bugs of given severity
+tag:tag                # all bugs with given tag
+
 ** Usertags
 
 See <http://wiki.debian.org/bugs.debian.org/usertags>
@@ -335,19 +344,10 @@ The bug will be re-archived after the next 28 day period of no activity.
 
 It's a function of the number of displayed bugs.  You can speed things
 up by only looking at the newest 100 bugs:
-
 http://debbugs.gnu.org/cgi-bin/pkgreport.cgi?newest=100;package=emacs
 
-The above page is accessible from the "Options" section at the end of
-the "main list of bugs" page. Select bugs "in package" = emacs;
-"newest bugs" = 100.  (I have no idea how you get to that Options
-section without having to go through the bug list page first...)
-
-** Mails to the bug tracker disappear
-
-Apparently it has some kind of spam filter that sometimes silently
-discards valid mails. Adding a subject (pointless in control messages)
-may help.
+Or use the static index:
+http://debbugs.gnu.org/db/ix/full.html
 
 ** ChangeLog issues
 
diff --git a/etc/ChangeLog b/etc/ChangeLog
index d62bdf10866..15530e5d59f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,21 @@
+2010-01-14  Nick Roberts  <nickrob@snap.net.nz>
+
+        * etc/images/gud/recstart.xpm, etc/images/gud/recstop.xpm:
+        * etc/images/gud/rcont.xpm, etc/images/gud/rnext.xpm:
+        * etc/images/gud/rfinish.xpm, etc/images/gud/rnexti.xpm:
+        * etc/images/gud/rstep.xpm, etc/images/gud/rstepi.xpm:
+        New icons for reverse debugging.
+
+2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * srecode/doc-cpp.srt (function-comment, variable-same-line-comment)
+        (group-comment-start, group-comment-end):
+        * srecode/doc-default.srt (section-comment, function-comment)
+        (variable-same-line-comment, group-comment-start, group-comment-end):
+        * srecode/doc-java.srt (function-comment, variable-same-line-comment)
+        (group-comment-start, gropu-comment-end):
+        Fix typos in template docstrings.
+
 2010-01-14  Kenichi Handa  <handa@m17n.org>
 
         * NEWS: Describe the change of auto-composition-mode.
@@ -276,7 +294,7 @@
 
 2009-06-12  Kenichi Handa  <handa@m17n.org>
 
-        * HELLO: Use "/" instead of "," to seperate independent words.
+        * HELLO: Use "/" instead of "," to separate independent words.
 
         * charsets/*.map: All re-generated.
 
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index f56c2bd771a..ac7861ae8af 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1312,9 +1312,8 @@ in both directions.  This feature is currently only available in Emacs
 ** erc is switching to global-minor-modes for activation of submodules.
 
 This allows you to customize such a mode and get automatic loading of
-the module.  No longer putting a lot of require statments in .emacs.
-At least this is the long-term plan, not all modules are converted
-yet.
+the module.  No longer putting a lot of require statements in .emacs.
+At least this is the long-term plan, not all modules are converted yet.
 
 ** The most important user visible change is that you now need to activate
 erc-completion-mode, to get TAB completion.  The new completion code
diff --git a/etc/NEWS b/etc/NEWS
index cd5b9a82d32..5d1ffac8904 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2155,7 +2155,6 @@ ordered by their priorities.
 **** `coding-system-from-name' returns a coding system matching with
 the argument name.
 
-
 ** There is a new input method, Robin, different from Quail.
 It has three functionalities:
  i) a simple input method (converts an ASCII sequence into a string).
diff --git a/etc/images/gud/rcont.xpm b/etc/images/gud/rcont.xpm
new file mode 100644
index 00000000000..ce817193109
--- /dev/null
+++ b/etc/images/gud/rcont.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+static char * reverse_continue_xpm[] = {
+"24 24 6 1",
+"       c None",
+".      c #D99FAA",
+"+      c #CC0033",
+"@      c #616161",
+"#      c #2A1F55",
+"$      c #AA9FAA",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                 .+     ",
+"               .++.     ",
+"      @#  #@  +++++++   ",
+"     @#$  $#@  .++.     ",
+"     ##    ##    .+     ",
+"     ##    ##           ",
+"     ##    ##           ",
+"     #@    @#           ",
+"    ##      ##          ",
+"     #@    @#           ",
+"     ##    ##           ",
+"     ##    ##           ",
+"     ##    ##           ",
+"     @#$  $#@           ",
+"      @#  #@            ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/gud/recstart.xpm b/etc/images/gud/recstart.xpm
new file mode 100644
index 00000000000..341a5d743ad
--- /dev/null
+++ b/etc/images/gud/recstart.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * break_xpm[] = {
+"24 24 2 1",
+"       c None",
+".      c #cc0033",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"          ....          ",
+"        ........        ",
+"       ..........       ",
+"      ............      ",
+"     ..............     ",
+"     ..............     ",
+"    ................    ",
+"    ................    ",
+"    ................    ",
+"    ................    ",
+"     ..............     ",
+"     ..............     ",
+"      ............      ",
+"       ..........       ",
+"        ........        ",
+"          ....          ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/gud/recstop.xpm b/etc/images/gud/recstop.xpm
new file mode 100644
index 00000000000..341a5d743ad
--- /dev/null
+++ b/etc/images/gud/recstop.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * break_xpm[] = {
+"24 24 2 1",
+"       c None",
+".      c #cc0033",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"          ....          ",
+"        ........        ",
+"       ..........       ",
+"      ............      ",
+"     ..............     ",
+"     ..............     ",
+"    ................    ",
+"    ................    ",
+"    ................    ",
+"    ................    ",
+"     ..............     ",
+"     ..............     ",
+"      ............      ",
+"       ..........       ",
+"        ........        ",
+"          ....          ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/gud/rfinish.xpm b/etc/images/gud/rfinish.xpm
new file mode 100644
index 00000000000..f118466378d
--- /dev/null
+++ b/etc/images/gud/rfinish.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+static char * reverse_step_xpm[] = {
+"24 24 6 1",
+"       c None",
+".      c #D40000",
+"+      c #616161",
+"@      c #2A1F55",
+"#      c #ADADAD",
+"$      c #CC9999",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"             .....      ",
+"            .     .     ",
+"           .       .    ",
+"      +@   .   @+  .    ",
+"     +@#   .   #@+ .    ",
+"     @@  .$.$.  @@ .    ",
+"     @@  $...$  @@      ",
+"     @@   ...   @@      ",
+"     @+   $.$   +@      ",
+"    @@     .     @@     ",
+"     @+         +@      ",
+"     @@         @@      ",
+"     @@         @@      ",
+"     @@         @@      ",
+"     +@#       #@+      ",
+"      +@       @+       ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/gud/rnext.xpm b/etc/images/gud/rnext.xpm
new file mode 100644
index 00000000000..ee6e03e4d07
--- /dev/null
+++ b/etc/images/gud/rnext.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * reverse_next_xpm[] = {
+"24 24 7 1",
+"       c None",
+".      c #CC0033",
+"+      c #616161",
+"@      c #2A1F55",
+"#      c #ADADAD",
+"$      c #D40000",
+"%      c #CC9999",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"        ..........      ",
+"       .          .     ",
+"      .            .    ",
+"      .    +@  @+  .    ",
+"      .   +@#  #@+ .    ",
+"    $%.%$ @@    @@ .    ",
+"    %...% @@    @@      ",
+"     ...  @@    @@      ",
+"     %.%  @+    +@      ",
+"      .  @@      @@     ",
+"          @+    +@      ",
+"          @@    @@      ",
+"          @@    @@      ",
+"          @@    @@      ",
+"          +@#  #@+      ",
+"           +@  @+       ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/gud/rnexti.xpm b/etc/images/gud/rnexti.xpm
new file mode 100644
index 00000000000..03d28734bfc
--- /dev/null
+++ b/etc/images/gud/rnexti.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+static char * reverse_nexti_xpm[] = {
+"24 24 6 1",
+"       c None",
+".      c #CC0033",
+"+      c #D40000",
+"@      c #CC9999",
+"#      c #616161",
+"$      c #2A1F55",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"        ..........      ",
+"       .          .     ",
+"      .            .    ",
+"      .            .    ",
+"      .            .    ",
+"    +@.@+   #  #   .    ",
+"    @...@  #$  $#       ",
+"     ...  #$    $#      ",
+"     @.@ #$      $#     ",
+"      . #$        $#    ",
+"        $#        #$    ",
+"         $#      #$     ",
+"          $#    #$      ",
+"           $#  #$       ",
+"            $  $        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/gud/rstep.xpm b/etc/images/gud/rstep.xpm
new file mode 100644
index 00000000000..54516bf2c25
--- /dev/null
+++ b/etc/images/gud/rstep.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * reverse_finish_xpm[] = {
+"24 24 7 1",
+"       c None",
+".      c #CC0033",
+"+      c #616161",
+"@      c #2A1F55",
+"#      c #ADADAD",
+"$      c #D40000",
+"%      c #CC9999",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"        .....           ",
+"       .     .          ",
+"      .       .         ",
+"      .    +@ . @+      ",
+"      .   +@# . #@+     ",
+"    $%.%$ @@  .  @@     ",
+"    %...% @@     @@     ",
+"     ...  @@     @@     ",
+"     %.%  @+     +@     ",
+"      .  @@       @@    ",
+"          @+     +@     ",
+"          @@     @@     ",
+"          @@     @@     ",
+"          @@     @@     ",
+"          +@#   #@+     ",
+"           +@   @+      ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/gud/rstepi.xpm b/etc/images/gud/rstepi.xpm
new file mode 100644
index 00000000000..e78a48eb2a8
--- /dev/null
+++ b/etc/images/gud/rstepi.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+static char * reverse_stepi_xpm[] = {
+"24 24 5 1",
+"       c None",
+".      c #D40000",
+"+      c #616161",
+"@      c #2A1F55",
+"#      c #CC9999",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"             .....      ",
+"            .     .     ",
+"           .       .    ",
+"           .       .    ",
+"       +   .   +   .    ",
+"      +@ .#.#. @+  .    ",
+"     +@  #...#  @+      ",
+"    +@    ...    @+     ",
+"   +@     #.#     @+    ",
+"   @+      .      +@    ",
+"    @+           +@     ",
+"     @+         +@      ",
+"      @+       +@       ",
+"       @       @        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt
index f3679a196f8..fce0d283d7d 100644
--- a/etc/srecode/doc-cpp.srt
+++ b/etc/srecode/doc-cpp.srt
@@ -36,14 +36,14 @@ template section-comment :indent :blank
 ----
 
 template function-comment :tag :indent :blank
-"A comment occuring in front of a function.
+"A comment occurring in front of a function.
 Recycle doxygen comment code from the more general template set."
 ----
 {{>:declaration:doxygen-function}}
 ----
 
 template variable-same-line-comment :tag
-"A comment occuring after a veriable declaration.
+"A comment occurring after a veriable declaration.
 Recycle doxygen comment code from the more general template set."
 ----
 {{>:declaration:doxygen-variable-same-line}}
@@ -51,14 +51,14 @@ Recycle doxygen comment code from the more general template set."
 
 ;; These happen to be the same as in a classdecl.
 template group-comment-start :blank :indent
-"A comment occuring in front of a group of declarations.
+"A comment occurring in front of a group of declarations.
 Recycle doxygen comment code from the more general template set."
 ----
 {{>:classdecl:doxygen-function-group-start}}
 ----
 
 template group-comment-end :blank :indent
-"A comment occuring at the end of a a group of declarations.
+"A comment occurring at the end of a a group of declarations.
 Recycle doxygen comment code from the more general template set."
 ----
 {{>:classdecl:doxygen-function-group-end}}
@@ -68,14 +68,14 @@ Recycle doxygen comment code from the more general template set."
 context classdecl
 
 template group-comment-start :blank :indent
-"A comment occuring in front of a group of declarations.
+"A comment occurring in front of a group of declarations.
 Recycle doxygen comment code from the more general template set."
 ----
 {{>:classdecl:doxygen-function-group-start}}
 ----
 
 template group-comment-end :blank :indent
-"A comment occuring at the end of a a group of declarations.
+"A comment occurring at the end of a a group of declarations.
 Recycle doxygen comment code from the more general template set."
 ----
 {{>:classdecl:doxygen-function-group-end}}
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt
index bf4011bb1a9..f07849b9207 100644
--- a/etc/srecode/doc-default.srt
+++ b/etc/srecode/doc-default.srt
@@ -26,7 +26,7 @@ set application "document"
 context declaration
 
 template section-comment :blank :indent
-"A comment occuring in front of a group of declarations."
+"A comment occurring in front of a group of declarations."
 ----
 {{comment_start}} {{?TITLE}}
 {{comment_prefix}}
@@ -35,7 +35,7 @@ template section-comment :blank :indent
 ----
 
 template function-comment :tag :indent :blank
-"A comment occuring in front of a function."
+"A comment occurring in front of a function."
 ----
 {{comment_start}} {{?NAME}} --
 {{DOC:srecode-comment-prefix}}
@@ -43,21 +43,21 @@ template function-comment :tag :indent :blank
 ----
 
 template variable-same-line-comment :tag
-"A comment occuring after a veriable declaration."
+"A comment occurring after a veriable declaration."
 ----
 {{comment_start}} {{?DOC}} {{comment_end}}
 ----
 
 ;; These happen to be the same as in a classdecl.
 template group-comment-start :blank :indent
-"A comment occuring in front of a group of declarations."
+"A comment occurring in front of a group of declarations."
 ----
 {{comment_start}} {{?GROUPNAME}} --
 {{comment_end}}
 ----
 
 template group-comment-end :indent
-"A comment occuring at the end of a a group of declarations."
+"A comment occurring at the end of a a group of declarations."
 ----
 {{comment_start}} End {{?GROUPNAME}} {{comment_end}}
 ----
@@ -66,13 +66,13 @@ template group-comment-end :indent
 context classdecl
 
 template group-comment-start :blank :indent
-"A comment occuring in front of a group of declarations."
+"A comment occurring in front of a group of declarations."
 ----
 {{>:declaration:group-comment-start}}
 ----
 
 template group-comment-end :indent
-"A comment occuring at the end of a a group of declarations."
+"A comment occurring at the end of a a group of declarations."
 ----
 {{>:declaration:group-comment-end}}
 ----
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt
index 66deb733232..cb289913f36 100644
--- a/etc/srecode/doc-java.srt
+++ b/etc/srecode/doc-java.srt
@@ -37,14 +37,14 @@ template section-comment :indent :blank
 ----
 
 template function-comment :tag :indent :blank
-"A comment occuring in front of a function.
+"A comment occurring in front of a function.
 Recycle javadoc comment code from the more general template set."
 ----
 {{>:declaration:javadoc-function}}
 ----
 
 template variable-same-line-comment :tag
-"A comment occuring after a veriable declaration.
+"A comment occurring after a veriable declaration.
 Recycle javadoc comment code from the more general template set."
 ----
 {{>:declaration:javadoc-variable-same-line}}
@@ -52,14 +52,14 @@ Recycle javadoc comment code from the more general template set."
 
 ;; These happen to be the same as in a classdecl.
 template group-comment-start :blank :indent
-"A comment occuring in front of a group of declarations.
+"A comment occurring in front of a group of declarations.
 Recycle javadoc comment code from the more general template set."
 ----
 {{>:classdecl:javadoc-function-group-start}}
 ----
 
 template group-comment-end :blank :indent
-"A comment occuring at the end of a a group of declarations.
+"A comment occurring at the end of a a group of declarations.
 Recycle javadoc comment code from the more general template set."
 ----
 {{>:classdecl:javadoc-function-group-end}}
@@ -69,14 +69,14 @@ Recycle javadoc comment code from the more general template set."
 context classdecl
 
 template group-comment-start :blank :indent
-"A comment occuring in front of a group of declarations.
+"A comment occurring in front of a group of declarations.
 Recycle javadoc comment code from the more general template set."
 ----
 {{>:classdecl:javadoc-function-group-start}}
 ----
 
 template group-comment-end :blank :indent
-"A comment occuring at the end of a a group of declarations.
+"A comment occurring at the end of a a group of declarations.
 Recycle javadoc comment code from the more general template set."
 ----
 {{>:classdecl:javadoc-function-group-end}}
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b14d89c325..92116cafe03 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,66 @@
+2010-01-15  Glenn Morris  <rgm@gnu.org>
+
+        * log-view.el (top-level): Require 'wid-edit.  (Bug#5311)
+
+        * wid-edit.el (widget-keymap): Doc fix.
+
+        * vc-svn.el (vc-svn-print-log): Use --limit rather than -l since the
+        former seems to be more widely accepted by various svn versions.
+
+2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * find-cmd.el (find-constituents):
+        * vc-arch.el (vc-arch-root):
+        * window.el (window-body-height, pop-up-frames):
+        * cedet/semantic/edit.el (semantic-reparse-needed-change-hook)
+        (semantic-no-reparse-needed-change-hook):
+        * cedet/srecode/insert.el (srecode-resolve-argument-list)
+        (srecode-template-inserter-blank, srecode-template-inserter-variable)
+        (srecode-template-inserter-ask, srecode-template-inserter-width)
+        (srecode-template-inserter-section-start)
+        (srecode-template-inserter-section-end, srecode-insert-method):
+        * emacs-lisp/eieio-base.el (eieio-singleton, slot-missing):
+        * progmodes/ada-stmt.el (ada-if):
+        * progmodes/gdb-ui.el (gdb-jsonify-buffer):
+        * textmodes/ispell.el (ispell-grep-options, ispell-dictionary-alist)
+        (ispell-encoding8-command, ispell-aspell-supports-utf8)
+        (ispell-last-program-name, ispell-help): Fix typos in docstrings.
+
+        * progmodes/flymake.el (flymake-post-syntax-check):
+        Fix typo in error message.
+
+2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * hexl.el (hexl-printable-character): Fix check of `hexl-iso',
+        which is always a string.  (Bug#5313)
+
+2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/ada-xref.el (ada-default-prj-properties):
+        Simplify previous change.
+
+2010-01-14  Stephen Leake  <stephen_leake@member.fsf.org>
+
+        * progmodes/ada-xref.el (ada-default-prj-properties):
+        Default ada_project_path to $ADA_PROJECT_PATH.
+
+2010-01-14  Stephen Leake  <stephen_leake@member.fsf.org>
+
+        * progmodes/ada-mode.el (ada-create-keymap):
+        Override `narrow-to-defun' with `ada-narrow-to-defun'.
+
+2010-01-14  Stephen Leake  <stephen_leake@member.fsf.org>
+
+        * progmodes/ada-mode.el: Deal with Ada 2005 "overriding" keyword.
+        (ada-subprog-start-re, ada-imenu-subprogram-menu-re): Add keyword.
+        (ada-get-current-indent, ada-imenu-generic-expression)
+        (ada-which-function): Check for it.
+
+2010-01-14  Stephen Leake  <stephen_leake@member.fsf.org>
+
+        * progmodes/ada-mode.el (ada-clean-buffer-before-saving): Make obsolete.
+        (ada-mode): Don't obey `ada-clean-buffer-before-saving' anymore.
+
 2010-01-14  Glenn Morris  <rgm@gnu.org>
 
         * frame.el (show-trailing-whitespace): Safe if boolean.  (Bug#5312)
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index e2d8df7ce98..50b82e13a15 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -6773,7 +6773,7 @@
         (ruler-mode-mouse-grab-any-column)
         (ruler-mode-mouse-drag-any-column-iteration)
         (ruler-mode-mouse-drag-any-column): New functions.
-        (ruler-mode-map): [header-line down-mouse-2] Bound to
+        (ruler-mode-map) [header-line down-mouse-2]: Bound to
         `ruler-mode-mouse-grab-any-column' instead of
         `ruler-mode-mouse-set-fill-column'.
         (ruler-mode-ruler-help-echo): Update its value.
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index 9f637f10b38..cd36210f7fc 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -2083,7 +2083,7 @@
         * desktop.el (desktop-save): Use dired-directory as name
         of top-level in order to capture wildcards used.
         (desktop-buffer-dired): Skip possible wildcard when checking
-        for directory existance.  Use dired-insert-subdir, not
+        for directory existence.  Use dired-insert-subdir, not
         dired-maybe-insert-subdir.
 
 1995-04-06  Karl Heuer  <kwzh@nutrimat.gnu.ai.mit.edu>
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 91d27db2d6a..f4b62c6f352 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -6760,7 +6760,7 @@
 
 1999-01-22  Andrew Innes  <andrewi@gnu.org>
 
-        * startup.el (command-line): [windows-nt]: Check for existence of
+        * startup.el (command-line) [windows-nt]: Check for existence of
         .emacs file so as to notice .emacs.el or .emacs.elc and use them
         in preference to _emacs.
 
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 89ae36bcf9e..bdb9268a030 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -442,7 +442,7 @@ If FORCE equals 'newfile, then the cache is ignored."
               (setq ans calc))
           ;; If we failed to calculate something, we
           ;; should add it to the hash, but ONLY if we are not
-          ;; going to FORCE the file into existance.
+          ;; going to FORCE the file into existence.
           (when (not force)
             (ede-locate-add-file-to-hash loc filename 'nomatch))))
       ))
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index c57da3a5aa5..0f18d49b7c3 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -81,15 +81,13 @@ common hook `after-change-functions'.")
 
 (defvar semantic-reparse-needed-change-hook nil
   "Hooks run when a user edit is detected as needing a reparse.
-For language specific hooks, make sure you define this as a local
-hook.
-Not used yet; part of the next generation reparse mechanism")
+For language specific hooks, make sure you define this as a local hook.
+Not used yet; part of the next generation reparse mechanism.")
 
 (defvar semantic-no-reparse-needed-change-hook nil
   "Hooks run when a user edit is detected as not needing a reparse.
 If the hook returns non-nil, then declare that a reparse is needed.
-For language specific hooks, make sure you define this as a local
-hook.
+For language specific hooks, make sure you define this as a local hook.
 Not used yet; part of the next generation reparse mechanism.")
 
 (defvar semantic-edits-new-change-hooks nil
@@ -307,7 +305,7 @@ See `semantic-edits-change-leaf-tag' for details on parents."
                     (semantic-tag-components (car tags)))
               ;; Ok, we are completely encompassed within the first tag
               ;; entry, AND that tag has children.  This means that change
-              ;; occured outside of all children, but inside some tag
+              ;; occurred outside of all children, but inside some tag
               ;; with children.
               (if (or (not (semantic-tag-with-position-p (car list-to-search)))
                       (> start (semantic-tag-end
@@ -751,7 +749,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
 
 ;;;; Whitespace change
        ((and (not tags) (not newf-tags))
-        ;; A change that occured outside of any existing tags
+        ;; A change that occurred outside of any existing tags
         ;; and there are no new tags to replace it.
         (when semantic-edits-verbose-flag
           (message "White space changes"))
@@ -760,7 +758,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
 
 ;;;; New tags in old whitespace area.
        ((and (not tags) newf-tags)
-        ;; A change occured outside existing tags which added
+        ;; A change occurred outside existing tags which added
         ;; a new tag.  We need to splice these tags back
         ;; into the cache at the right place.
         (semantic-edits-splice-insert newf-tags parent-tag cache-list)
@@ -775,7 +773,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
 
 ;;;; Old tags removed
        ((and tags (not newf-tags))
-        ;; A change occured where pre-existing tags were
+        ;; A change occurred where pre-existing tags were
         ;; deleted!  Remove the tag from the cache.
         (semantic-edits-splice-remove tags parent-tag cache-list)
 
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index 7f6ddc85bfc..af312494a81 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -900,7 +900,7 @@ START and END define the bounds of the token in the current buffer.
 Optional STR is the string for the token only if the bounds in
 the buffer do not cover the string they represent.  (As from
 macro expansion.)"
-  ;; This if statement checks the existance of a STR argument at
+  ;; This if statement checks the existence of a STR argument at
   ;; compile time, where STR is some symbol or constant.  If the
   ;; variable STr (runtime) is nil, this will make an incorrect decision.
   ;;
diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index 30a836c89b2..bb15bf50110 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -33,7 +33,7 @@
 ;;
 ;; Using :blank means that the template should force blank lines
 ;; before and after the template, reguardless of where the insertion
-;; is occuring.
+;; is occurring.
 (defun srecode-semantic-handle-:blank (dict)
   "Add macros into the dictionary DICT specifying blank line spacing.
 The wrapgap means make sure the first and last lines of the macro
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 4777470d473..1ccd4e8d393 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -201,7 +201,7 @@ Apply anything learned to the dictionary DICT."
   "Resolve arguments in the argument list ARGS.
 ARGS is a list of symbols, such as :blank, or :file.
 Apply values to DICT.
-Optional argument TEMP is the template that is getting it's arguments resolved."
+Optional argument TEMP is the template that is getting its arguments resolved."
   (let ((fcn nil))
     (while args
       (setq fcn (intern-soft (concat "srecode-semantic-handle-"
@@ -334,14 +334,14 @@ occur in your template.")
    ((key :initform "\r"
          :allocation :class
          :documentation
-         "The character represeinting this inserter style.
+         "The character representing this inserter style.
 Can't be blank, or it might be used by regular variable insertion.")
     (where :initform 'begin
            :initarg :where
            :documentation
-           "This should be 'begin or 'end, indicating where to insrt a CR.
+           "This should be 'begin or 'end, indicating where to insert a CR.
 When set to 'begin, it will insert a CR if we are not at 'bol'.
-When set to 'end it will insert a CR if we are not at 'eol'")
+When set to 'end it will insert a CR if we are not at 'eol'.")
     ;; @TODO - Add slot and control for the number of blank
     ;;         lines before and after point.
    )
@@ -407,7 +407,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
         :allocation :class
         :documentation
         "The character code used to identify inserters of this style."))
-  "Insert the value of a dictionary entry
+  "Insert the value of a dictionary entry.
 If there is no entry, insert nothing.")
 
 (defvar srecode-inserter-variable-current-dictionary nil
@@ -493,7 +493,7 @@ If SECONDNAME is nil, return VALUE."
              :documentation
              "The function used to read in the text for this prompt.")
    )
-  "Insert the value of a dictionary entry
+  "Insert the value of a dictionary entry.
 If there is no entry, prompt the user for the value to use.
 The prompt text used is derived from the previous PROMPT command in the
 template file.")
@@ -626,8 +626,8 @@ Use DICTIONARY to resolve values."
         "The character code used to identify inserters of this style.")
    )
   "Inserts the value of a dictionary variable with a specific width.
-The second argument specifies the width, and a pad, seperated by a colon.
-thus a specification of `10:left' will insert the value of A
+The second argument specifies the width, and a pad, separated by a colon.
+Thus a specification of `10:left' will insert the value of A
 to 10 characters, with spaces added to the left.  Use `right' for adding
 spaces to the right.")
 
@@ -771,7 +771,7 @@ Calls back to `srecode-insert-method-helper' for this class."
         "The character code used to identify inserters of this style.")
    (template :initarg :template
              :documentation
-             "A Template used to frame the codes from this inserter.")
+             "A template used to frame the codes from this inserter.")
    )
   "Apply values from a sub-dictionary to a template section.
 The dictionary saved at the named dictionary entry will be
@@ -806,7 +806,7 @@ Return the remains of INPUT."
         :documentation
         "The character code used to identify inserters of this style.")
    )
-  "All template segments between the secion-start and section-end
+  "All template segments between the section-start and section-end
 are treated specially.")
 
 (defmethod srecode-insert-method ((sti srecode-template-inserter-section-end)
@@ -881,7 +881,7 @@ this template instance."
               (setq active (cdr active)))
             (when (not tmpl)
               ;; If it wasn't in this context, look to see if it
-              ;; defines it's own context
+              ;; defines its own context
               (setq tmpl (srecode-template-get-table (srecode-table)
                                                      templatenamepart)))
             )
@@ -897,7 +897,7 @@ this template instance."
                                   dictionary)
   "Insert the STI inserter.
 Finds the template with this macro function part, and inserts it
-with the dictionaries found in the dictinary."
+with the dictionaries found in the dictionary."
   (srecode-insert-include-lookup sti dictionary)
   ;; Insert the template.
   ;; Our baseclass has a simple way to do this.
@@ -952,7 +952,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   "Insert the template STI.
 This will first insert the include part via inheritance, then
 insert the section it wraps into the location in the included
-template where  a ^ inserter occurs."
+template where a ^ inserter occurs."
   ;; Step 1: Look up the included inserter
   (srecode-insert-include-lookup sti dictionary)
   ;; Step 2: Temporarilly override the point inserter.
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index 8403171cf16..b573af29ee2 100644
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -150,7 +150,7 @@ Returns the first match."
               "The only instance of this class that will be instantiated.
 Multiple calls to `make-instance' will return this object."))
   "This special class causes subclasses to be singletons.
-A singleton is a class which will only ever have one instace."
+A singleton is a class which will only ever have one instance."
   :abstract t)
 
 (defmethod constructor :STATIC ((class eieio-singleton) name &rest slots)
@@ -309,7 +309,7 @@ access to it."
 
 (defmethod slot-missing ((obj eieio-named)
                          slot-name operation &optional new-value)
-  "Called when a on-existant slot is accessed.
+  "Called when a non-existent slot is accessed.
 For variable `eieio-named', provide an imaginary `object-name' slot.
 Argument OBJ is the named object.
 Argument SLOT-NAME is the slot that was attempted to be accessed.
diff --git a/lisp/find-cmd.el b/lisp/find-cmd.el
index 307964ef17f..11b64b04717 100644
--- a/lisp/find-cmd.el
+++ b/lisp/find-cmd.el
@@ -122,7 +122,7 @@
     (okdir   . (1 find-command t)))
   "Holds details of each of the find options.
 The car of each alist is the name.  The cdr is minimum args, the
-function used to join many occurences of the argument together,
+function used to join many occurrences of the argument together,
 and whether or not to leave quotes off the string (non-nil means
 the string will be quoted).")
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index cb4c24a39db..8e7ae005762 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -5151,7 +5151,7 @@
         * gnus-agent.el (directory-files-and-attributes): Move all the way
         forward (the third and final move).
         (gnus-agent-read-agentview): Trap reconstruction errors due to
-        nonexistant directory.  Handle by returning nil.
+        nonexistent directory.  Handle by returning nil.
 
 2006-05-30  Didier Verna  <didier@xemacs.org>
 
@@ -12206,7 +12206,7 @@
         (gnus-agent-set-local): Delete stored entry if either min, or max,
         are nil.
         (gnus-agent-fetch-session): Reworded error/quit messages.  On
-        quit, use gnus-agent-regenerate-group to record existance of any
+        quit, use gnus-agent-regenerate-group to record existence of any
         articles fetched to disk before the quit occurred.
         (gnus-agent-expire-group-1): Use gnus-agent-with-refreshed-group,
         gnus-agent-update-view-total-fetched-for, and
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index 9abb387f13e..8bd4cfde3f6 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -158,7 +158,7 @@ There are currently two built-in format functions:
 ;; I just ignore it.
 ;;;###autoload
 (defun gnus-user-format-function-d (header)
-  ;; Returns an aproximative delay string for the next occurence of this
+  ;; Returns an aproximative delay string for the next occurrence of this
   ;; message. The delay is given only in the first non zero unit.
   ;; Code partly stolen from article-make-date-line
   (let* ((extras (mail-header-extra header))
@@ -195,7 +195,7 @@ There are currently two built-in format functions:
 ;; I just ignore it.
 ;;;###autoload
 (defun gnus-user-format-function-D (header)
-  ;; Returns a formatted time string for the next occurence of this message.
+  ;; Returns a formatted time string for the next occurrence of this message.
   (let* ((extras (mail-header-extra header))
          (sched (gnus-diary-header-schedule extras))
          (occur (nndiary-next-occurence sched (current-time))))
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index 71c1cd1e164..62a5db6ea3e 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -67,7 +67,7 @@
 ;;   IMHO, nnoo is actually badly designed.  A much simpler, and yet more
 ;;   powerful one would be to make *real* functions and variables for a new
 ;;   back end based on another. Lisp is a reflexive language so that's a very
-;;   easy thing to do: inspect the function's form, replace occurences of
+;;   easy thing to do: inspect the function's form, replace occurrences of
 ;;   <nnfrom> (even in strings) with <nnto>, and you're done.
 
 ;; * nndiary-get-new-mail, nndiary-mail-source and nndiary-split-methods:
@@ -1322,7 +1322,7 @@ all.  This may very well take some time.")
     (sort res 'time-less-p)))
 
 (defun nndiary-last-occurence (sched)
-  ;; Returns the last occurence of schedule SCHED as an Emacs time struct, or
+  ;; Returns the last occurrence of schedule SCHED as an Emacs time struct, or
   ;; nil for permanent schedule or errors.
   (let ((minute (nndiary-max (nth 0 sched)))
         (hour (nndiary-max (nth 1 sched)))
@@ -1393,7 +1393,7 @@ all.  This may very well take some time.")
                             (encode-time 0 minute hour
                                          (car days) month year time-zone)))
                    )))))
-         ;; There's an upper limit, but we didn't find any last occurence.
+         ;; There's an upper limit, but we didn't find any last occurrence.
          ;; This means that the schedule is undecidable. This can happen if
          ;; you happen to say something like "each Feb 31 until 2038".
          (progn
@@ -1402,8 +1402,8 @@ all.  This may very well take some time.")
         ))))
 
 (defun nndiary-next-occurence (sched now)
-  ;; Returns the next occurence of schedule SCHED, starting from time NOW.
-  ;; If there's no next occurence, returns the last one (if any) which is then
+  ;; Returns the next occurrence of schedule SCHED, starting from time NOW.
+  ;; If there's no next occurrence, returns the last one (if any) which is then
   ;; in the past.
   (let* ((today (decode-time now))
          (this-minute (nth 1 today))
@@ -1557,12 +1557,12 @@ all.  This may very well take some time.")
         ;; The article should be re-considered as unread if there's a reminder
         ;; between the group timestamp and the current time.
         (when (and sched (setq sched (nndiary-next-occurence sched now)))
-          (let ((reminders ;; add the next occurence itself at the end.
+          (let ((reminders ;; add the next occurrence itself at the end.
                  (append (nndiary-compute-reminders sched) (list sched))))
             (while (and reminders (time-less-p (car reminders) timestamp))
               (pop reminders))
             ;; The reminders might be empty if the last date is in the past,
-            ;; or we've got at least the next occurence itself left. All past
+            ;; or we've got at least the next occurrence itself left. All past
             ;; dates are renewed.
             (or (not reminders)
                 (time-less-p (car reminders) now)))
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index cfeb36a0e12..fb5fb44113f 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1200,7 +1200,7 @@ Use the nov database for the current group if available."
                 ;; #### already belongs to a range, whereas the corresponding
                 ;; #### article doesn't exist (for example, if you delete an
                 ;; #### article). For that reason, it is important to update
-                ;; #### the ranges (meaning remove inexistant articles) before
+                ;; #### the ranges (meaning remove inexistent articles) before
                 ;; #### doing anything on them.
                 ;; 2 a/ read articles:
                 (let ((read (gnus-info-read info)))
diff --git a/lisp/gnus/webmail.el b/lisp/gnus/webmail.el
index 599edc6b5e6..106445d0522 100644
--- a/lisp/gnus/webmail.el
+++ b/lisp/gnus/webmail.el
@@ -529,7 +529,7 @@
           (widen)))
       (delete-region p (point-max))
       (goto-char (point-min))
-      ;; Some blank line to seperate mails.
+      ;; Some blank line to separate mails.
       (insert "\n\nFrom nobody " (current-time-string) "\n")
       (insert "X-Gnus-Webmail: " (symbol-value 'user)
               "@" (symbol-name webmail-type) "\n")
@@ -658,7 +658,7 @@
           (setq p (point))))
       (delete-region p (point-max))
       (goto-char (point-min))
-      ;; Some blank line to seperate mails.
+      ;; Some blank line to separate mails.
       (insert "\n\nFrom nobody " (current-time-string) "\n")
       (insert "X-Gnus-Webmail: " (symbol-value 'user)
               "@" (symbol-name webmail-type) "\n")
@@ -835,7 +835,7 @@
         (setq mime (webmail-netaddress-single-part))
         (widen))
       (goto-char (point-min))
-      ;; Some blank line to seperate mails.
+      ;; Some blank line to separate mails.
       (insert "\n\nFrom nobody " (current-time-string) "\n")
       (insert "X-Gnus-Webmail: " (symbol-value 'user)
               "@" (symbol-name webmail-type) "\n")
@@ -962,7 +962,7 @@
         (setq mime (webmail-netaddress-single-part))
         (widen))
       (goto-char (point-min))
-      ;; Some blank line to seperate mails.
+      ;; Some blank line to separate mails.
       (insert "\n\nFrom nobody " (current-time-string) "\n")
       (insert "X-Gnus-Webmail: " (symbol-value 'user)
               "@" (symbol-name webmail-type) "\n")
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 2854ca12d45..7edf5ec10ac 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -779,11 +779,11 @@ This discards the buffer's undo information."
 
 (defun hexl-printable-character (ch)
   "Return a displayable string for character CH."
-  (format "%c" (if hexl-iso
-                   (if (or (< ch 32) (and (>= ch 127) (< ch 160)))
+  (format "%c" (if (equal hexl-iso "")
+                   (if (or (< ch 32) (>= ch 127))
                        46
                      ch)
-                 (if (or (< ch 32) (>= ch 127))
+                 (if (or (< ch 32) (and (>= ch 127) (< ch 160)))
                      46
                    ch))))
 
diff --git a/lisp/log-view.el b/lisp/log-view.el
index 195a80b46dc..6fbe8429671 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -122,6 +122,9 @@
   :group 'pcl-cvs
   :prefix "log-view-")
 
+;; Needed because log-view-mode-map inherits from widget-keymap.  (Bug#5311)
+(require 'wid-edit)
+
 (easy-mmode-defmap log-view-mode-map
   '(("z" . kill-this-buffer)
     ("q" . quit-window)
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 03e52fee5a2..c1eff5a0d25 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org-protocol.el (org-protocol-flatten-greedy, org-protocol-flatten):
+        Fix typos in docstrings.
+
 2010-01-01  Juanma Barranquero  <lekktu@gmail.com>
 
         * org.el (org-get-outline-path, org-speed-command-help):
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index f0c0e302282..59f08f1dfa2 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -355,9 +355,9 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ü'."
     ret ))
 
 (defun org-protocol-flatten-greedy (param-list &optional strip-path replacement)
-  "Greedy handlers might recieve a list like this from emacsclient:
+  "Greedy handlers might receive a list like this from emacsclient:
  '( (\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\")
-where \"/dir/\" is the absolute path to emacsclients working directory. This
+where \"/dir/\" is the absolute path to emacsclients working directory.  This
 function transforms it into a flat list utilizing `org-protocol-flatten' and
 transforms the elements of that list as follows:
 
@@ -400,10 +400,10 @@ returned list."
 
 
 (defun org-protocol-flatten (l)
-  "Greedy handlers might recieve a list like this from emacsclient:
+  "Greedy handlers might receive a list like this from emacsclient:
  '( (\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\")
-where \"/dir/\" is the absolute path to emacsclients working directory. This
-function transforms it into a flat list."
+where \"/dir/\" is the absolute path to emacsclients working directory.
+This function transforms it into a flat list."
   (if (null l) ()
     (if (listp l)
        (append (org-protocol-flatten (car l)) (org-protocol-flatten (cdr l)))
diff --git a/lisp/paths.el b/lisp/paths.el
index aac1047e8cf..510caa3a876 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -58,7 +58,7 @@ comparison."
           (list config-dir))
          (unpruned-prefixes
           ;; Directory trees that may not exist at installation time, and
-          ;; so shouldn't be pruned based on existance.
+          ;; so shouldn't be pruned based on existence.
           '("/usr/local/"))
          (prefixes
           ;; Directory trees in which to look for info subdirectories
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index d0affdc0726..2b94fdb25ff 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -229,11 +229,13 @@ It may be `downcase-word', `upcase-word', `ada-loose-case-word' or
                  (const ada-no-auto-case))
   :group 'ada)
 
-;; FIXME If this is not something required by the ada language, this
-;; should be removed.
 (defcustom ada-clean-buffer-before-saving t
   "*Non-nil means remove trailing spaces and untabify the buffer before saving."
   :type 'boolean :group 'ada)
+(make-obsolete-variable 'ada-clean-buffer-before-saving
+                        "use the `write-file-functions' hook."
+                        "23.2")
+
 
 (defcustom ada-indent 3
   "*Size of Ada indentation.
@@ -672,7 +674,7 @@ A new statement starts after these.")
 
 (defvar ada-subprog-start-re
   (eval-when-compile
-    (concat "\\<" (regexp-opt '("accept" "entry" "function" "package" "procedure"
+    (concat "\\<" (regexp-opt '("accept" "entry" "function" "overriding" "package" "procedure"
                                 "protected" "task") t) "\\>"))
   "Regexp for the start of a subprogram.")
 
@@ -719,7 +721,7 @@ displaying the menu if point was on an identifier."
 (defconst ada-imenu-comment-re "\\([ \t]*--.*\\)?")
 
 (defconst ada-imenu-subprogram-menu-re
-  (concat "^[ \t]*\\(procedure\\|function\\)[ \t\n]+"
+  (concat "^[ \t]*\\(overriding[ \t]*\\)?\\(procedure\\|function\\)[ \t\n]+"
           "\\(\\(\\sw\\|_\\)+\\)[ \t\n]*\\([ \t\n]\\|([^)]+)"
           ada-imenu-comment-re
           "\\)[ \t\n]*"
@@ -727,7 +729,7 @@ displaying the menu if point was on an identifier."
 
 (defvar ada-imenu-generic-expression
   (list
-   (list nil ada-imenu-subprogram-menu-re 2)
+   (list nil ada-imenu-subprogram-menu-re 3)
    (list "*Specs*"
          (concat
           "^[ \t]*\\(procedure\\|function\\)[ \t\n]+\\(\\(\\sw\\|_\\)+\\)"
@@ -1303,14 +1305,6 @@ the file name."
 
   (set-syntax-table ada-mode-syntax-table)
 
-  (if ada-clean-buffer-before-saving
-      (progn
-        ;; remove all spaces at the end of lines in the whole buffer.
-        (add-hook 'local-write-file-hooks 'delete-trailing-whitespace)
-        ;; convert all tabs to the correct number of spaces.
-        (add-hook 'local-write-file-hooks
-                  (lambda () (untabify (point-min) (point-max))))))
-
   (set (make-local-variable 'skeleton-further-elements)
        '((< '(backward-delete-char-untabify
               (min ada-indent (current-column))))))
@@ -2483,7 +2477,7 @@ and the offset."
             (list (progn (back-to-indentation) (point)) 'ada-indent))
         (save-excursion
           (ada-goto-stmt-start)
-          (if (looking-at "\\<package\\|procedure\\|function\\>")
+          (if (looking-at "\\<overriding\\|package\\|procedure\\|function\\>")
               (list (progn (back-to-indentation) (point)) 0)
             (list (progn (back-to-indentation) (point)) 'ada-indent)))))
 
@@ -2632,20 +2626,23 @@ and the offset."
            (looking-at "\\<\\(package\\|function\\|procedure\\)\\>"))
       (save-excursion
         ;;  Go up until we find either a generic section, or the end of the
-        ;;  previous subprogram/package
+        ;;  previous subprogram/package, or 'overriding' for this function/procedure
         (let (found)
           (while (and (not found)
                       (ada-search-ignore-string-comment
-             "\\<\\(generic\\|end\\|begin\\|package\\|procedure\\|function\\)\\>" t))
+             "\\<\\(generic\\|end\\|begin\\|overriding\\|package\\|procedure\\|function\\)\\>" t))
 
             ;;  avoid "with procedure"... in generic parts
             (save-excursion
               (forward-word -1)
               (setq found (not (looking-at "with"))))))
 
-        (if (looking-at "generic")
-            (list (progn (back-to-indentation) (point)) 0)
-          (ada-indent-on-previous-lines nil orgpoint orgpoint))))
+        (cond
+         ((looking-at "\\<generic\\|overriding\\>")
+          (list (progn (back-to-indentation) (point)) 0))
+
+         (t
+          (ada-indent-on-previous-lines nil orgpoint orgpoint)))))
 
      ;;---------------------------------
      ;; label
@@ -4571,6 +4568,8 @@ Moves to 'begin' if in a declarative part."
 
   (define-key ada-mode-extra-map "u"  'ada-prj-edit)
 
+  (define-key ada-mode-map "\C-xnd" 'ada-narrow-to-defun); override narrow-to-defun
+
   ;;  The templates, defined in ada-stmt.el
 
   (let ((map (make-sparse-keymap)))
@@ -5063,7 +5062,7 @@ Since the search can be long, the results are cached."
 
           ;; Get the function name, but not the properties, or this changes
           ;; the face in the modeline on Emacs 21
-          (setq func-name (match-string-no-properties 2))
+          (setq func-name (match-string-no-properties 3))
           (if (and (not (ada-in-comment-p))
                    (not (save-excursion
                           (goto-char (match-end 0))
diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el
index 91058890d46..103bc093bdb 100644
--- a/lisp/progmodes/ada-stmt.el
+++ b/lisp/progmodes/ada-stmt.el
@@ -187,7 +187,7 @@ Indent for the first line of code."
 
 
 (define-skeleton ada-if
-  "Insert skeleton if statment, prompting for a boolean-expression."
+  "Insert skeleton if statement, prompting for a boolean-expression."
   "[condition]: "
   "if " str " then" \n
   > _ \n
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index dd54736ef0b..bf836b20eee 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -755,7 +755,7 @@ is non-nil, prompt the user to select one.  If none are found, return
   (let ((file (buffer-file-name nil)))
     (list
      ;; variable name alphabetical order
-     'ada_project_path  ""
+     'ada_project_path (or (getenv "ADA_PROJECT_PATH") "")
      'ada_project_path_sep  ada-prj-ada-project-path-sep
      'bind_opt        ada-prj-default-bind-opt
      'build_dir       default-directory
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index e642cf360a1..de0cd896b8e 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -1010,7 +1010,7 @@ MODE is either a mode symbol or a list of mode symbols."
          `(c-clear-char-property-fun ,pos ',property))))
 
 (defmacro c-clear-char-properties (from to property)
-  ;; Remove all the occurences of the given property in the given
+  ;; Remove all the occurrences of the given property in the given
   ;; region that has been put with `c-put-char-property'.  PROPERTY is
   ;; assumed to be constant.
   ;;
@@ -1035,7 +1035,7 @@ which have the value VALUE, as tested by `equal'.  These
 properties are assumed to be over individual characters, having
 been put there by c-put-char-property.  POINT remains unchanged."
   (let ((place from) end-place)
-    (while                        ; loop round occurrances of (PROPERTY VALUE)
+    (while                        ; loop round occurrences of (PROPERTY VALUE)
         (progn
           (while           ; loop round changes in PROPERTY till we find VALUE
               (and
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index f1e6bf98ece..0e6358aeee1 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -447,7 +447,7 @@ comment at the start of cc-engine.el for more info."
   (c-put-char-property pos 'c-type value))
 
 (defun c-clear-c-type-property (from to value)
-  ;; Remove all occurences of the c-type property that has the given
+  ;; Remove all occurrences of the c-type property that has the given
   ;; value in the region between FROM and TO.  VALUE is assumed to not
   ;; be nil.
   ;;
@@ -555,7 +555,7 @@ the previous one if already at the beginning of one.  Only
 statements/declarations on the same level are considered, i.e. don't
 move into or out of sexps (not even normal expression parentheses).
 
-If point is already at the earliest statment within braces or parens,
+If point is already at the earliest statement within braces or parens,
 this function doesn't move back into any whitespace preceding it; it
 returns 'same in this case.
 
@@ -605,7 +605,7 @@ comment at the start of cc-engine.el for more info."
   ;; The bulk of this function is a pushdown automaton that looks at statement
   ;; boundaries and the tokens (such as "while") in c-opt-block-stmt-key.  Its
   ;; purpose is to keep track of nested statements, ensuring that such
-  ;; statments are skipped over in their entirety (somewhat akin to what C-M-p
+  ;; statements are skipped over in their entirety (somewhat akin to what C-M-p
   ;; does with nested braces/brackets/parentheses).
   ;;
   ;; Note: The position of a boundary is the following token.
@@ -4394,7 +4394,7 @@ comment at the start of cc-engine.el for more info."
   ;;    `c-decl-prefix-or-start-re' when that submatch matches.
   ;; o  The start of each `c-decl-prefix-or-start-re' match when
   ;;    submatch 1 doesn't match.
-  ;; o  The first token after the end of each occurence of the
+  ;; o  The first token after the end of each occurrence of the
   ;;    `c-type' text property with the value `c-decl-end', provided
   ;;    `c-type-decl-end-used' is set.
   ;;
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 7763a5d9283..907c308daca 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1327,7 +1327,7 @@ on level 2 only and so aren't combined with `c-complex-decl-matchers'."
       ,@(when (c-lang-const c-recognize-<>-arglists)
           `(c-font-lock-<>-arglists))
 
-      ;; The first two rules here mostly find occurences that
+      ;; The first two rules here mostly find occurrences that
       ;; `c-font-lock-declarations' has found already, but not
       ;; declarations containing blocks in the type (see note below).
       ;; It's also useful to fontify these everywhere to show e.g. when
@@ -2117,7 +2117,7 @@ need for `pike-font-lock-extra-types'.")
 
 (defun c-find-invalid-doc-markup (regexp limit)
   ;; Used to fontify invalid markup in doc comments after the correct
-  ;; ones have been fontified: Find the first occurence of REGEXP
+  ;; ones have been fontified: Find the first occurrence of REGEXP
   ;; between the point and LIMIT that only is fontified with
   ;; `c-doc-face-name'.  If a match is found then submatch 0 surrounds
   ;; the first char and t is returned, otherwise nil is returned.
diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index ff92329f8be..1e5f1f506b3 100644
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -1370,7 +1370,7 @@ non-delphi buffer. Set to nil in a delphi buffer.  To override, just do:
                      ;; Indent in from the expression.
                      (delphi-indent-of last-token delphi-indent-level))
 
-                    ;; No enclosing expression; use the previous statment's
+                    ;; No enclosing expression; use the previous statement's
                     ;; indent.
                     ((delphi-previous-indent-of token)))))
 
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 865cd153be1..4af331c5c29 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -643,7 +643,7 @@ It's flymake process filter."
             (flymake-report-status "" "")       ; PASSED
           (if (not flymake-check-was-interrupted)
               (flymake-report-fatal-status "CFGERR"
-                                           (format "Configuration error has occured while running %s" command))
+                                           (format "Configuration error has occurred while running %s" command))
             (flymake-report-status nil ""))) ; "STOPPED"
       (flymake-report-status (format "%d/%d" err-count warn-count) ""))))
 
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 9b1f1066d28..4be5cc4511e 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1814,7 +1814,7 @@ happens to be appropriate."
 Field names are wrapped in double quotes and equal signs are
 replaced with semicolons.
 
-If FIX-KEY is non-nil, strip all \"FIX-KEY=\" occurences from
+If FIX-KEY is non-nil, strip all \"FIX-KEY=\" occurrences from
 partial output.  This is used to get rid of useless keys in lists
 in MI messages, e.g.: [key=.., key=..].  -stack-list-frames and
 -break-info are examples of MI commands which issue such
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 6cdd0503757..e6228286a19 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -4607,7 +4607,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
 
 
 (defun idlwave-shorten-syntax (syntax name &optional class)
-  ;; From a list of syntax statments, shorten with %s and group with "or"
+  ;; From a list of syntax statements, shorten with %s and group with "or"
   (let ((case-fold-search t))
     (mapconcat
      (lambda (x)
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 629328dff75..21be4ee85d0 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1197,7 +1197,7 @@ as returned by `x-server-vendor'."
 ;; We keep track of the last text selected here, so we can check the
 ;; current selection against it, and avoid passing back our own text
 ;; from x-cut-buffer-or-selection-value.  We track all three
-;; seperately in case another X application only sets one of them
+;; separately in case another X application only sets one of them
 ;; (say the cut buffer) we aren't fooled by the PRIMARY or
 ;; CLIPBOARD selection staying the same.
 (defvar x-last-selected-text-clipboard nil
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 8ad11049ba0..ac7a2e48a15 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -2181,7 +2181,7 @@ Formats current entry according to variable `bibtex-entry-format'."
               (if (memq 'realign format)
                   (bibtex-fill-entry)))))
 
-      ;; Unwindform: move point to location where error occured if possible
+      ;; Unwindform: move point to location where error occurred if possible
       (if error-field-name
           (let (bounds)
             (when (save-excursion
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 9775f26de64..e35148ac038 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -407,7 +407,7 @@ Always stores Fcc copy of message when nil."
   (if (memq system-type '(windows-nt ms-dos)) "-Ei" "-i")
   "String of options to use when running the program in `ispell-grep-command'.
 Should probably be \"-i\" or \"-e\".
-Some machines (like the NeXT) don't support \"-i\""
+Some machines (like the NeXT) don't support \"-i\"."
   :type 'string
   :group 'ispell)
 
@@ -729,7 +729,7 @@ can be encoded as \\\"a, a\\\", \"a, ...)  Defaults are ~tex and ~nroff
 in English.  This has the same effect as the command-line `-T' option.
 The buffer Major Mode controls Ispell's parsing in tex or nroff mode,
 but the dictionary can control the extended character mode.
-Both defaults can be overruled in a buffer-local fashion. See
+Both defaults can be overruled in a buffer-local fashion.  See
 `ispell-parsing-keyword' for details on this.
 
 CHARACTER-SET used for languages with multibyte characters.
@@ -744,7 +744,7 @@ LANGUAGE.aff file \(e.g., english.aff\).")
   "Command line option prefix to select UTF-8 if supported, nil otherwise.
 If UTF-8 if supported by spellchecker and is selectable from the command line
 this variable will contain \"--encoding=\" for aspell and \"-i \" for hunspell,
-so UTF-8 or other mime charsets can be selected. That will be set for hunspell
+so UTF-8 or other mime charsets can be selected.  That will be set for hunspell
 >=1.1.6 or aspell >= 0.60 in `ispell-check-version'.
 
 For aspell non-nil means to try to automatically find aspell dictionaries.
@@ -752,9 +752,9 @@ Earlier aspell versions do not consistently support UTF-8.  Handling
 this would require some extra guessing in `ispell-aspell-find-dictionary'.")
 
 (defvar ispell-aspell-supports-utf8 nil
-  "Non nil if aspell has consistent command line UTF-8 support. Obsolete.
+  "Non nil if aspell has consistent command line UTF-8 support.  Obsolete.
 ispell.el and flyspell.el will use for this purpose the more generic
-variable `ispell-encoding8-command' for both aspell and hunspell. Is left
+variable `ispell-encoding8-command' for both aspell and hunspell.  Is left
 here just for backwards compatibility.")
 
 (make-obsolete-variable 'ispell-aspell-supports-utf8
@@ -1048,7 +1048,7 @@ Return the new dictionary alist."
 ;; Set params according to the selected spellchecker
 
 (defvar ispell-last-program-name nil
-  "Last value of `ispell-program-name'. Internal use.")
+  "Last value of `ispell-program-name'.  Internal use.")
 
 (defvar ispell-initialize-spellchecker-hook nil
   "Normal hook run on spellchecker initialization.
@@ -1956,7 +1956,7 @@ Global `ispell-quit' set to start location to continue spell session."
                     ;; If the user types C-g, or generates some other
                     ;; non-character event (such as a frame switch
                     ;; event), stop ispell.  As a special exception,
-                    ;; ignore mouse events occuring in the same frame.
+                    ;; ignore mouse events occurring in the same frame.
                     (while (and input-valid (not (characterp char)))
                       (setq char (read-key))
                       (setq input-valid
@@ -2184,7 +2184,7 @@ SPC:   Accept word this time.
 `a':   Accept word for this session.
 `A':   Accept word and place in `buffer-local dictionary'.
 `r':   Replace word with typed-in value.  Rechecked.
-`R':   Replace word with typed-in value. Query-replaced in buffer. Rechecked.
+`R':   Replace word with typed-in value.  Query-replaced in buffer.  Rechecked.
 `?':   Show these commands.
 `x':   Exit spelling buffer.  Move cursor to original point.
 `X':   Exit spelling buffer.  Leaves cursor at the current point, and permits
@@ -2216,7 +2216,7 @@ SPC:   Accept word this time.
 `a':   Accept word for this session.
 `A':   Accept word and place in `buffer-local dictionary'.
 `r':   Replace word with typed-in value.  Rechecked.
-`R':   Replace word with typed-in value. Query-replaced in buffer. Rechecked.
+`R':   Replace word with typed-in value.  Query-replaced in buffer.  Rechecked.
 `?':   Show these commands.
 `x':   Exit spelling buffer.  Move cursor to original point.
 `X':   Exit spelling buffer.  Leaves cursor at the current point, and permits
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index 84218911090..b99c3de6875 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -213,7 +213,7 @@ Only the value `maybe' can be trusted :-(."
         'names))))
 
 (defun vc-arch-root (file)
-  "Return the root directory of a Arch project, if any."
+  "Return the root directory of an Arch project, if any."
   (or (vc-file-getprop file 'arch-root)
       ;; Check the =tagging-method, in case someone naively manually
       ;; creates a {arch} directory somewhere.
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 0f2216079bd..658d4528f68 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -487,13 +487,13 @@ or svn+ssh://."
                        ;; subsequent commits.  At least that's what the
                        ;; vc-cvs.el code does.
                        "-rHEAD:0"))
-                    (when limit (list "-l" (format "%s" limit))))))
+                    (when limit (list "--limit" (format "%s" limit))))))
         ;; Dump log for the entire directory.
         (apply 'vc-svn-command buffer 0 nil "log"
                (append
                 (list
                  (if start-revision (format "-r%s" start-revision) "-rHEAD:0"))
-                (when limit (list "-l" (format "%s" limit)))))))))
+                (when limit (list "--limit" (format "%s" limit)))))))))
 
 (defun vc-svn-diff (files &optional oldvers newvers buffer)
   "Get a difference report using SVN between two revisions of fileset FILES."
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 52a8ad51dab..a087f17a900 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -875,7 +875,8 @@ button end points."
     (define-key map [(control ?m)] 'widget-button-press)
     map)
   "Keymap containing useful binding for buffers containing widgets.
-Recommended as a parent keymap for modes using widgets.")
+Recommended as a parent keymap for modes using widgets.
+Note that such modes will need to require wid-edit.")
 
 (defvar widget-global-map global-map
   "Keymap used for events a widget does not handle itself.")
diff --git a/lisp/window.el b/lisp/window.el
index ac4203a7991..41a5d17321f 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -77,9 +77,9 @@ WINDOW defaults to the selected window.
 
 The return value does not include the mode line or the header
 line, if any.  If a line at the bottom of the window is only
-partially visible, that line is included in the return value.  If
-you do not want to include a partially visible bottom line in the
-return value, use `window-text-height' instead."
+partially visible, that line is included in the return value.
+If you do not want to include a partially visible bottom line
+in the return value, use `window-text-height' instead."
   (or window (setq window (selected-window)))
   (if (window-minibuffer-p window)
       (window-height window)
@@ -785,7 +785,7 @@ selected rather than \(as usual\) some other window.  See
 
 (defcustom pop-up-frames nil
   "Whether `display-buffer' should make a separate frame.
-If nil, never make a seperate frame.
+If nil, never make a separate frame.
 If the value is `graphic-only', make a separate frame
 on graphic displays only.
 Any other non-nil value means always make a separate frame."
@@ -1006,7 +1006,7 @@ is higher than WINDOW."
              (not (eq window (selected-window)))
              ;; Don't resize minibuffer windows.
              (not (window-minibuffer-p (selected-window)))
-             (> (window-height (selected-window)) (window-height window)) 
+             (> (window-height (selected-window)) (window-height window))
              (eq (window-frame window) (window-frame (selected-window)))
              (let ((sel-edges (window-edges (selected-window)))
                    (win-edges (window-edges window)))
diff --git a/src/ChangeLog b/src/ChangeLog
index 91db3a3dbae..72552a34d30 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,12 @@
 
         * xdisp.c (CHAR_COMPOSED_P): New arg END_CHARPOS.  Callers changed.
 
+2010-01-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nsterm.m (Qnone): Define.
+
+        * nsfns.m (Qnone): Move definition to nsterm.m.
+
 2010-01-14  Kenichi Handa  <handa@m17n.org>
 
         * coding.c (detect_coding_iso_2022): Fix handling of euc-xx coding
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index cf5dbd53697..fbe3f752aed 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -4776,7 +4776,7 @@
         New struct face with associated typedef FACE declared, along with
         accessing macros.
 
-        * scroll.c (do_scrolling): Don't bcopy non-existant `nruns' or
+        * scroll.c (do_scrolling): Don't bcopy non-existent `nruns' or
         `face_list' elements.  Do copy new `max_ascent' frame element.
 
         * dispnew.c (scroll_frame_lines): All references to frame elements
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index fcdf3b9bf34..de162cb39bc 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -11848,7 +11848,7 @@
 
         * w32fns.c (w32_strict_fontnames): New variable.
         (Fx_create_frame): Formatting fix.
-        (w32_load_system_font): Keep trying to load non-existant font
+        (w32_load_system_font): Keep trying to load non-existent font
         if w32_strict_fontnames is nil.  Formatting fix.
         (syms_of_w32fns): Add w32-strict-fontnames.
 
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index e4bf486aaff..b161a21eb72 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -834,7 +834,7 @@
 2001-10-02  Miles Bader  <miles@gnu.org>
 
         * textprop.c (Fnext_char_property_change)
-        (Fprevious_char_property_change): Remove reference to non-existant
+        (Fprevious_char_property_change): Remove reference to non-existent
         argument OBJECT from doc-string.
 
 2001-10-01  Gerd Moellmann  <gerd@gnu.org>
diff --git a/src/nsfns.m b/src/nsfns.m
index 9fdcaa47c8c..357222bb18a 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -80,8 +80,8 @@ extern Lisp_Object Qface_set_after_frame_default;
 extern Lisp_Object Qunderline, Qundefined;
 extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth;
 extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
+extern Lisp_Object Qnone;
 
-Lisp_Object Qnone;
 Lisp_Object Qbuffered;
 Lisp_Object Qfontsize;
 
@@ -2606,8 +2606,6 @@ syms_of_nsfns ()
 {
   int i;
 
-  Qnone = intern ("none");
-  staticpro (&Qnone);
   Qfontsize = intern ("fontsize");
   staticpro (&Qfontsize);
 
diff --git a/src/nsterm.m b/src/nsterm.m
index 69cece47b0e..a102267920c 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -141,8 +141,7 @@ Lisp_Object ns_input_color, ns_input_text, ns_working_text;
 Lisp_Object ns_input_spi_name, ns_input_spi_arg;
 Lisp_Object Vx_toolkit_scroll_bars;
 static Lisp_Object Qmodifier_value;
-/* TODO: unsure why these defined in term files, anyway we need in keymap.c */
-Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper;
+Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper, Qnone;
 extern Lisp_Object Qcursor_color, Qcursor_type, Qns;
 
 /* Specifies which emacs modifier should be generated when NS receives
@@ -6151,6 +6150,7 @@ syms_of_nsterm ()
   DEFSYM (Qmeta, "meta");
   DEFSYM (Qsuper, "super");
   DEFSYM (Qcontrol, "control");
+  DEFSYM (Qnone, "none");
   Fput (Qalt, Qmodifier_value, make_number (alt_modifier));
   Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier));
   Fput (Qmeta, Qmodifier_value, make_number (meta_modifier));
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index cb05cd49807..f2bd0f44b50 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -22,7 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    Windows 2000, though most users of older systems will have it
    since it installs with Internet Explorer 5.0 and other software.
    We only enable the feature if it is available, so there is no chance
-   of calling non-existant functions.  */
+   of calling non-existent functions.  */
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x500
 #include <windows.h>
diff --git a/test/ChangeLog b/test/ChangeLog
index c5d2b7efeed..e52559399e5 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * cedet/cedet-utests.el (cedet-utest-log-shutdown, pulse-test):
+        * cedet/semantic-ia-utest.el (semantic-ia-utest-error-log-list)
+        (semantic-ia-utest-buffer-refs): Fix typos in docstrings.
+
 2009-12-18  Ulf Jasper  <ulf.jasper@web.de>
 
         * icalendar-testsuite.el
diff --git a/test/cedet/cedet-utests.el b/test/cedet/cedet-utests.el
index 12f81488031..aab07d49472 100644
--- a/test/cedet/cedet-utests.el
+++ b/test/cedet/cedet-utests.el
@@ -236,7 +236,7 @@ Argument START and END bound the time being calculated."
 (defun cedet-utest-log-shutdown (title &optional errorcondition)
   "Shut-down a larger test suite.
 TITLE is the section that is done.
-ERRORCONDITION is some error that may have occured durinig testing."
+ERRORCONDITION is some error that may have occurred during testing."
   (let ((endtime (current-time))
         )
     (cedet-utest-log-shutdown-msg title cedet-utest-log-timer endtime)
@@ -466,7 +466,7 @@ converted into.")
 
 (defun pulse-test (&optional no-error)
   "Test the lightening function for pulsing a line.
-When optional NO-ERROR Don't throw an error if we can't run tests."
+When optional NO-ERROR don't throw an error if we can't run tests."
   (interactive)
   (if (or (not pulse-flag) (not (pulse-available-p)))
       (if no-error
diff --git a/test/cedet/semantic-ia-utest.el b/test/cedet/semantic-ia-utest.el
index 99477402de6..8e2aa43bd27 100644
--- a/test/cedet/semantic-ia-utest.el
+++ b/test/cedet/semantic-ia-utest.el
@@ -54,7 +54,7 @@
   "List of files with analyzer completion test points.")
 
 (defvar semantic-ia-utest-error-log-list nil
-  "List of errors occuring during a run.")
+  "List of errors occurring during a run.")
 
 ;;;###autoload
 (defun semantic-ia-utest (&optional arg)
@@ -211,7 +211,7 @@ Argument ARG specifies which set of tests to run.
     ))
 
 (defun semantic-ia-utest-buffer-refs ()
-  "Run a analyze-refs unit-test pass in the current buffer."
+  "Run an analyze-refs unit-test pass in the current buffer."
 
   (let* ((idx 1)
          (regex-p nil)