Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.

45 files changed, 135 insertions, 89 deletions

diff --git a/ChangeLog b/ChangeLog
index 16bda0ecd2e..f7bef44ef55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7634,7 +7634,7 @@
 
         * Makefile.in (lib-src/Makefile, src/Makefile, oldXMenu/Makefile):
         Depend on vpath.sed.
-        Replace sed comand for VPATH with @vpath_sed@.
+        Replace sed command for VPATH with @vpath_sed@.
 
         * configure.in: Substitute variable `vpath_sed'.
         If not in $srcdir and $srcdir is configured,
@@ -8975,7 +8975,7 @@
         there, and then copy it in, to make sure we get a real file.
 
         * make-dist: Don't try to distribute *.defns files any more.  The
-        only such file was for simula.el, which has been superceded by a
+        only such file was for simula.el, which has been superseded by a
         version which doesn't have a separate .defns file.
 
 1992-05-28  Ken Raeburn  (Raeburn@Cygnus.COM)
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f113a7987c1..7a9c3ae3a47 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * search.texi (Regexp Search): Move index entries about regexps to the
+        "Regexps" node.  Add index entries for regexp search.  (Bug#8096)
+
 2011-02-19  Glenn Morris  <rgm@gnu.org>
 
         * dired.texi (Dired): Dired-X version number was dropped.
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index df0579ab9ea..e3c0445e189 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -468,8 +468,8 @@ apply to the lazy highlight, which always matches whole words.
 
 @node Regexp Search
 @section Regular Expression Search
-@cindex regular expression
-@cindex regexp
+@cindex regexp search
+@cindex search for a regular expression
 
   A @dfn{regular expression} (or @dfn{regexp} for short) is a pattern
 that denotes a class of alternative strings to match.  GNU Emacs
@@ -543,6 +543,8 @@ Search}.
 @node Regexps
 @section Syntax of Regular Expressions
 @cindex syntax of regexps
+@cindex regular expression
+@cindex regexp
 
   This manual describes regular expression features that users
 typically use.  @xref{Regular Expressions,,, elisp, The Emacs Lisp
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e0df108f8b6..c8925715f74 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-28  Glenn Morris  <rgm@gnu.org>
+
+        * variables.texi (Directory Local Variables): Mention the optional
+        mtime argument of dir-locals-set-directory-class.  (Bug#3577)
+
 2011-02-27  Chong Yidong  <cyd@stupidchicken.com>
 
         * minibuf.texi (Minibuffer History): Clarify discussion of
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 0cdcaa84d58..c6af304416c 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1757,12 +1757,19 @@ recursively by following the above rules; @var{list} should be of one
 of the two forms accepted by this function in @var{variables}.
 @end defun
 
-@defun dir-locals-set-directory-class directory class
+@defun dir-locals-set-directory-class directory class &optional mtime
 This function assigns @var{class} to all the files in @code{directory}
 and its subdirectories.  Thereafter, all the variable settings
 specified for @var{class} will be applied to any visited file in
 @var{directory} and its children.  @var{class} must have been already
-defined by @code{dir-locals-set-class-variables}
+defined by @code{dir-locals-set-class-variables}.
+
+Emacs uses this function internally when it loads directory variables
+from a @code{.dir-locals.el} file.  In that case, the optional
+argument @var{mtime} holds the file modification time (as returned by
+@code{file-attributes}).  Emacs uses this time to check stored
+local variables are still valid.  If you are assigning a class
+directly, not via a file, this argument should be @code{nil}.
 @end defun
 
 @defvar dir-locals-class-alist
@@ -1772,8 +1779,9 @@ settings.  It is updated by @code{dir-locals-set-class-variables}.
 
 @defvar dir-locals-directory-cache
 This alist holds directory names, their assigned class names, and
-modification times of the associated directory local variables file.
-It is updated by @code{dir-locals-set-directory-class}.
+modification times of the associated directory local variables file
+(if there is one).  The function @code{dir-locals-set-directory-class}
+updates this list.
 @end defvar
 
 @node Frame-Local Variables
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6f4f86978da..0e6726b08ba 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-28  Glenn Morris  <rgm@gnu.org>
+
+        * dbus.texi (Type Conversion): Grammar fix.
+
 2011-02-23  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index ad202f963aa..e6fb00d3482 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -893,10 +893,10 @@ applied, when the corresponding D-Bus message is created:
 @end example
 
 Other Lisp objects, like symbols or hash tables, are not accepted as
-input parameter.
+input parameters.
 
 If it is necessary to use another D-Bus type, a corresponding type
-symbol can be preceeded to the corresponding Lisp object. Basic D-Bus
+symbol can be prepended to the corresponding Lisp object.  Basic D-Bus
 types are represented by the type symbols @code{:byte},
 @code{:boolean}, @code{:int16}, @code{:uint16}, @code{:int32},
 @code{:uint32}, @code{:int64}, @code{:uint64}, @code{:double},
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index 52434f4a6e4..f3f11d29f17 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -64,7 +64,7 @@ developing GNU and promoting software freedom.''
 @macro obsolete{old,new}
 @sp 1
 @strong{Compatibility}:
-@code{\new\} introduced in @semantic{} version 2.0 supercedes
+@code{\new\} introduced in @semantic{} version 2.0 supersedes
 @code{\old\} which is now obsolete.
 @end macro
 
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 6b6cbe48328..181548e98d6 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -1746,7 +1746,7 @@ directories in which `ffap-rfc' will first search for RFCs.
 *** hide-ifdef-mode allows shadowing ifdef-blocks instead of hiding them.
 See option `hide-ifdef-shadow' and function `hide-ifdef-toggle-shadowing'.
 
-*** `icomplete-prospects-height' now supercedes `icomplete-prospects-length'.
+*** `icomplete-prospects-height' now supersedes `icomplete-prospects-length'.
 
 *** Info displays breadcrumbs in the header of the page.
 See Info-breadcrumbs-depth to control it.
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 6f55095aac7..7334fa991c9 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * quail/ethiopic.el ("ethiopic"): Fix tpo in docstring.
+
 2011-01-28  Paul Eggert  <eggert@cs.ucla.edu>
 
         Redo spelling of Makefile variables to conform to POSIX.
@@ -27,8 +31,8 @@
 
 2010-08-28  Kenichi Handa  <handa@m17n.org>
 
-        * quail/japanese.el (quail-japanese-update-translation): Fix
-        handling of invalid key.
+        * quail/japanese.el (quail-japanese-update-translation):
+        Fix handling of invalid key.
 
 2010-08-15  Andreas Schwab  <schwab@linux-m68k.org>
 
@@ -46,8 +50,7 @@
 
 2010-08-13  Kenichi Handa  <handa@m17n.org>
 
-        * quail/greek.el ("greek-postfix"): Add rules for Greek style
-        quotes.
+        * quail/greek.el ("greek-postfix"): Add rules for Greek style quotes.
 
 2010-08-09  Kenichi Handa  <handa@m17n.org>
 
diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 7eaaab4aebc..824048534e0 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -39,7 +39,7 @@
 ;; This was `cyrillic-jcuken'.  Alexander Mikhailian
 ;; <mikhailian@altern.org> says:  "cyrillic-jcuken" is actually
 ;; russian.  It is ok but a bit outdated.  This layout has been used
-;; in typewriters for ages but it has been superceeded on desktops by
+;; in typewriters for ages but it has been superseded on desktops by
 ;; a variation of this layout, implemented in M$ Windows software.
 ;; The Windows layout is greatly preferred because of the comma and
 ;; period being placed more conviniently and, of course, because of
diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el
index bdbb214723e..210aeea7e62 100644
--- a/leim/quail/ethiopic.el
+++ b/leim/quail/ethiopic.el
@@ -62,7 +62,7 @@ S-SPC or `M-x ethio-insert-ethio-space'
 
 C-' or `M-x ethio-gemination'
   Compose the character before the point with the Ethiopic gemination mark.
-  If the characater is already composed, decompose it and remove the
+  If the character is already composed, decompose it and remove the
   gemination mark."
 
  ;; The following keys should work as defined in lisp/language/ethio-util,
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94ff6303901..feed514cdee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/mule-cmds.el (set-default-coding-systems): Use the
+        -unix variant of encoding in default-keyboard-coding-system.
+        (Bug#8122)
+
 2011-02-27  Chong Yidong  <cyd@stupidchicken.com>
 
         * facemenu.el (list-colors-display): Use with-help-window (Bug#8048).
@@ -4670,7 +4676,7 @@
 
 2010-10-24  Michael McNamara  <mac@mail.brushroad.com>
 
-        * verilog-mode.el (verilog-directive-re): Make this variable
+        * progmodes/verilog-mode.el (verilog-directive-re): Make this variable
         auto-built for efficiency of execution and updating.
         (verilog-extended-complete-re): Support 'pure' fucntion & task
         declarations (these have no bodies).
@@ -4704,7 +4710,7 @@
 
 2010-10-24  Wilson Snyder  <wsnyder@wsnyder.org>
 
-        * verilog-mode.el (verilog-auto-inst, verilog-gate-ios)
+        * progmodes/verilog-mode.el (verilog-auto-inst, verilog-gate-ios)
         (verilog-gate-keywords, verilog-read-sub-decls)
         (verilog-read-sub-decls-gate, verilog-read-sub-decls-gate-ios)
         (verilog-read-sub-decls-line, verilog-read-sub-decls-sig): Support
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 83ee20fa497..1c2f2b5b015 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -20591,7 +20591,7 @@
 
         * viper-cmd.el (viper-change-state): Got rid of make-local-hook.
         (viper-special-read-and-insert-char): Make C-m work right in the r
-        comand.
+        command.
         (viper-buffer-search-enable): Fixed format string.
 
         * viper-ex.el (ex-token-alist): Use ex-set-visited-file-name
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index d2f7cab27f0..70c2a45acc9 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -11678,7 +11678,7 @@
         make underlining work for wide characters.
         (org-goto-map, org-agenda-mode-map, org-mode-map): Explicitly bind
         TAB to `org-cycle', to make sure that no binding in
-        `outline-mode-map' can supercede it.
+        `outline-mode-map' can supersede it.
 
 2006-03-14  Ken Manheimer  <ken.manheimer@gmail.com>
 
@@ -19139,7 +19139,7 @@
         * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to
         pgg-decrypt-region.
         (pgg-pending-timers): A new hash for tracking the passphrase cache
-        timers, so that new ones supercede old ones.
+        timers, so that new ones supersede old ones.
         (pgg-add-passphrase-to-cache): Rename from
         `pgg-add-passphrase-cache' to reduce confusion (all callers
         changed).  Modified to cancel old timers when new ones are added.
@@ -19225,7 +19225,7 @@
         * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to
         pgg-decrypt-region.
         (pgg-pending-timers): A new hash for tracking the passphrase cache
-        timers, so that new ones supercede old ones.
+        timers, so that new ones supersede old ones.
         (pgg-add-passphrase-to-cache): Rename from
         `pgg-add-passphrase-cache' to reduce confusion (all callers
         changed).  Modified to cancel old timers when new ones are added.
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index b54580ff0bc..8cafac2c0c4 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -4906,7 +4906,7 @@
         * two-column.el: Doc fixes.
 
         * loaddefs.el (function-keymap): Definition deleted; this has been
-        superceded by function-key-map.
+        superseded by function-key-map.
 
         * gomoku.el (gomoku-mode-map): Use function key symbols, instead
         of the keypad.el facilities.
@@ -6056,7 +6056,7 @@
         and `fill-column'.  Code now actually sets `left-margin' and
         `fill-column', as advertised.
         * text-mode.el (change-log-mode): Function deleted, since it's
-        been superceded by the one in add-log.el.
+        been superseded by the one in add-log.el.
 
 1992-06-14  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
 
@@ -6070,7 +6070,7 @@
 
 1992-06-12  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
 
-        * isearch-mode.el: New package, which will probably supercede
+        * isearch-mode.el: New package, which will probably supersede
         isearch.el.
         (isearch-mode-map, isearch-mode-meta-map): When initializing
         these, remember that vectors are no longer keymaps.
@@ -10009,7 +10009,7 @@
         display-time-string.
         (rmail-pop-up): Default display-time-hook to automatically retrieve
         new mail if the variable rmail-pop-up is non-nil.
-        (add-clock-handler): Removed; superceded by timer.el.
+        (add-clock-handler): Removed; superseded by timer.el.
 
         * loaddefs.el: Removed add-clock-handler.
 
@@ -10032,7 +10032,7 @@
 
         * loaddefs.el: Autoload for diff.
 
-        * files.el (diff): Superceded by diff.el.
+        * files.el (diff): Superseded by diff.el.
         (diff-switches-function): Still needs to be merged into diff.el.
 
         * diff.el: New file.
diff --git a/lisp/allout.el b/lisp/allout.el
index d881e1177fa..ca72806b7d9 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -339,7 +339,7 @@ The types of elements in the layout specification are:
          -- positive numbers open to the relative depth indicated by the
             number, but do not force already opened subtopics to be closed.
          -- 0 means to close topic -- hide all subitems.
- :   -- repeat spec -- apply the preceeding element to all siblings at
+ :   -- repeat spec -- apply the preceding element to all siblings at
         current level, *up to* those siblings that would be covered by specs
         following the `:' on the list.  Ie, apply to all topics at level but
         trailing ones accounted for by trailing specs.  (Only the first of
@@ -3125,7 +3125,7 @@ situation."
                  nil)
         ;; rationale: if any intervening items were at a lower depth, we
         ;; would now be on the first offspring at the target depth -- ie,
-        ;; the preceeding item (per the search direction) must be at a
+        ;; the preceding item (per the search direction) must be at a
         ;; lesser depth.  that's all we need to check.
         (if backward (allout-next-heading) (allout-previous-heading))
         (if (< allout-recent-depth target-depth)
@@ -4246,7 +4246,7 @@ With a negative argument, the item is shifted out using
 
 With an argument greater than one, shift-in the item but not its
 offspring, making the item into a sibling of its former children,
-and a child of sibling that formerly preceeded it.
+and a child of sibling that formerly preceded it.
 
 You are not allowed to shift the first offspring of a topic
 inwards, because that would yield a \"containment
@@ -5364,7 +5364,7 @@ header and body.  The elements of that list are:
 
       (goto-char start)
       (beginning-of-line)
-      ;; Goto initial topic, and register preceeding stuff, if any:
+      ;; Goto initial topic, and register preceding stuff, if any:
       (if (> (allout-goto-prefix-doublechecked) start)
           ;; First topic follows beginning point -- register preliminary stuff:
           (setq result
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 8a0fbd5cc37..5cdd1577a6e 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -100,7 +100,7 @@ Usually bound to the dimension of a single symbol or command.")
            :type list
            :documentation "List of tags defining local text.
 This can be nil, or a list where the last element can be a string
-representing text that may be incomplete.  Preceeding elements
+representing text that may be incomplete.  Preceding elements
 must be semantic tags representing variables or functions
 called in a dereference sequence.")
    (prefixclass :initarg :prefixclass
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 31e92724a00..47cb722e005 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1264,7 +1264,7 @@ inserted into the current context.")
 ;; generated by a collector.  This format is in semanticdb search
 ;; form.  This vaguely standard form is a bit challenging to navigate
 ;; because the tags do not contain buffer info, but the file associated
-;; with the tags preceed the tag in the list.
+;; with the tags precedes the tag in the list.
 ;;
 ;; Basic displayors don't care, and can strip the results.
 ;; Advanced highlighting displayors need to know when they need
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index ef206fd3122..7f7e82a95c2 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -426,7 +426,7 @@ See `semantic-edits-change-leaf-tag' for details on parents."
             ;; confirmed as the lineage of `overlapped-tags'
             ;; which must have a value by now.
 
-            ;; Loop over the search list to find the preceeding CDR.
+            ;; Loop over the search list to find the preceding CDR.
             ;; Fortunatly, (car overlapped-tags) happens to be
             ;; the first tag positionally.
             (let ((tokstart (semantic-tag-start (car overlapped-tags))))
@@ -874,7 +874,7 @@ pre-positioned to a convenient location."
             ))
       (message "To Remove Middle Tag: (%s)"
                (semantic-format-tag-name first)))
-    ;; Find in the cache the preceeding tag
+    ;; Find in the cache the preceding tag
     (while (and cachestart (not (eq first (car (cdr cachestart)))))
       (setq cachestart (cdr cachestart)))
     ;; Find the last tag
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index ecd03ccec73..fa6e7517624 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -296,7 +296,7 @@ local definitions."
 
 (define-overloadable-function semantic-format-tag-canonical-name (tag &optional parent color)
   "Return a canonical name for TAG.
-A canonical name includes the names of any parents or namespaces preceeding
+A canonical name includes the names of any parents or namespaces preceding
 the tag.
 Optional argument PARENT is the parent type if TAG is a detail.
 Optional argument COLOR means highlight the prototype with font-lock colors.")
diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el
index 4489d0ffae5..71a205386db 100644
--- a/lisp/cedet/semantic/java.el
+++ b/lisp/cedet/semantic/java.el
@@ -256,7 +256,7 @@ Optional argument COLOR indicates that color should be mixed in."
 (define-mode-local-override semantic-documentation-for-tag
   java-mode (&optional tag nosnarf)
   "Find documentation from TAG and return it as a clean string.
-Java have documentation set in a comment preceeding TAG's definition.
+Java has documentation set in a comment preceding TAG's definition.
 Attempt to strip out comment syntactic sugar, unless optional argument
 NOSNARF is non-nil.
 If NOSNARF is 'lex, then return the semantic lex token."
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index fae249da9d3..d9b79ccd317 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -2375,7 +2375,7 @@ problems."
     (if (eq viper-intermediate-command 'viper-repeat)
         (viper-change-subr (mark t) (point))
       (viper-change (mark t) (point)))
-    ;; com is set to ?r when we repeat this comand with dot
+    ;; com is set to ?r when we repeat this command with dot
     (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil))
     ))
 
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index 962acd5bfc6..4016586abc7 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -584,9 +584,9 @@
 
         * debian/maint/conffiles.in: new file
 
-        * debian/maint/conffiles: superceded by conffiles.in
+        * debian/maint/conffiles: superseded by conffiles.in
 
-        * debian/scripts/startup: superceded by startup.erc
+        * debian/scripts/startup: superseded by startup.erc
 
 2001-10-25  Mario Lang  <mlang@delysid.org>
 
@@ -609,7 +609,7 @@
 
         * debian/maint/postinst, debian/maint/prerm, debian/scripts/install, 
           debian/scripts/remove:
-        removed, superceded by it's .in counterpart
+        removed, superseded by its .in counterpart
 
 2001-10-25  Mario Lang  <mlang@delysid.org>
 
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 204d63d37e4..989488c0995 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -441,7 +441,7 @@ manipulated as follows:
                      (setf (gnus-agent-cat-groups old-category)
                            (delete group (gnus-agent-cat-groups
                                           old-category))))))
-               ;; Purge cache as preceeding loop invalidated it.
+               ;; Purge cache as preceding loop invalidated it.
                (setq gnus-category-group-cache nil))
 
              (setcdr (or (assq 'agent-groups category)
@@ -1195,7 +1195,7 @@ downloadable."
             (mapc #'gnus-summary-remove-process-mark
                   (gnus-sorted-ndifference gnus-newsgroup-processable gnus-newsgroup-undownloaded))
 
-            ;; The preceeding call to (gnus-agent-summary-fetch-group)
+            ;; The preceding call to (gnus-agent-summary-fetch-group)
             ;; updated the temporary gnus-newsgroup-downloadable to
             ;; remove each article successfully fetched.  Now, I
             ;; update the real gnus-newsgroup-downloadable to only
@@ -1520,14 +1520,14 @@ downloaded into the agent."
            header-number)
       ;; Check each article
       (while (setq article (pop articles))
-        ;; Skip alist entries preceeding this article
+        ;; Skip alist entries preceding this article
         (while (> article (or (caar alist) (1+ article)))
           (setq alist (cdr alist)))
 
         ;; Prune off articles that we have already fetched.
         (unless (and (eq article (caar alist))
                      (cdar alist))
-          ;; Skip headers preceeding this article
+          ;; Skip headers preceding this article
           (while (> article
                     (setq header-number
                           (let* ((header (car headers)))
@@ -3437,7 +3437,7 @@ missing NOV entry.  Run gnus-agent-regenerate-group to restore it.")))
 
                    ;; If considering all articles is set, I can only
                    ;; expire article IDs that are no longer in the
-                   ;; active range (That is, articles that preceed the
+                   ;; active range (That is, articles that precede the
                    ;; first article in the new alist).
                    (if (and gnus-agent-consider-all-articles
                             (>= article-number (car active)))
@@ -3715,7 +3715,7 @@ has been fetched."
                    (gnus-agent-append-to-list tail-uncached v1))
                  (setq arts (cdr arts))
                  (setq ref (cdr ref)))
-                (t ; reference article (v2) preceeds the list being filtered
+                (t ; reference article (v2) precedes the list being filtered
                  (setq ref (cdr ref))))))
       (while arts
         (gnus-agent-append-to-list tail-uncached (pop arts)))
@@ -4020,7 +4020,7 @@ If REREAD is not nil, downloaded articles are marked as unread."
         ;; article (with the exception of the last ID in the list - it's
         ;; special) that no longer appears in the overview.  In this
         ;; situtation, the last article ID in the list implies that it,
-        ;; and every article ID preceeding it, have been fetched from the
+        ;; and every article ID preceding it, have been fetched from the
         ;; server.
 
         (if gnus-agent-consider-all-articles
diff --git a/lisp/gnus/gnus-range.el b/lisp/gnus/gnus-range.el
index 794d1642cdd..ce5a837eaef 100644
--- a/lisp/gnus/gnus-range.el
+++ b/lisp/gnus/gnus-range.el
@@ -116,10 +116,10 @@ Both ranges must be in ascending order."
                ;; All done with range2
                (setq r nil))
               ((< max1 min2)
-               ;; No overlap: range1 preceeds range2
+               ;; No overlap: range1 precedes range2
                (pop r))
               ((< max2 min1)
-               ;; No overlap: range2 preceeds range1
+               ;; No overlap: range2 precedes range1
                (pop range2))
               ((and (<= min2 min1) (<= max1 max2))
                ;; Complete overlap: range1 removed
@@ -232,10 +232,10 @@ RANGE1 and RANGE2 have to be sorted over <."
     (setq range1 (cdr range1)
           range2 (cdr range2))
     (while (and min1 min2)
-      (cond ((< max1 min2)              ; range1 preceeds range2
+      (cond ((< max1 min2)              ; range1 precedes range2
              (setq range1 (cdr range1)
                    min1 nil))
-            ((< max2 min1)              ; range2 preceeds range1
+            ((< max2 min1)              ; range2 precedes range1
              (setq range2 (cdr range2)
                    min2 nil))
             (t                     ; some sort of overlap is occurring
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index d1ed23f79b3..ebfa53f841e 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1513,7 +1513,7 @@ If SCAN, request a scan of that group as well."
            (num 0))
 
       ;; These checks are present in gnus-activate-group but skipped
-      ;; due to setting dont-check in the preceeding call.
+      ;; due to setting dont-check in the preceding call.
 
       ;; If a cache is present, we may have to alter the active info.
       (when (and gnus-use-cache info)
@@ -1887,7 +1887,7 @@ If SCAN, request a scan of that group as well."
                             ;; OK - I'm done
                             (setq articles nil))
                            ((< range article)
-                            ;; this range preceeds the article. Leave the range unmodified.
+                            ;; this range precedes the article. Leave the range unmodified.
                             (pop ranges)
                             ranges)
                            ((= range article)
@@ -1910,11 +1910,11 @@ If SCAN, request a scan of that group as well."
                             (setcar ranges min)
                             ranges)
                            ((< max article)
-                            ;; this range preceeds the article. Leave the range unmodified.
+                            ;; this range precedes the article. Leave the range unmodified.
                             (pop ranges)
                             ranges)
                            ((< article min)
-                            ;; this article preceeds the range.  Return null to move to the
+                            ;; this article precedes the range.  Return null to move to the
                             ;; next article
                             nil)
                            (t
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 09ecfb8f6b7..66a6365cb3b 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1672,7 +1672,7 @@ password contained in '~/.nntp-authinfo'."
 
         ;; Some nntp servers seem to have an extension to the XOVER
         ;; extension.  On these servers, requesting an article range
-        ;; preceeding the active range does not return an error as
+        ;; preceding the active range does not return an error as
         ;; specified in the RFC.  What we instead get is the NOV entry
         ;; for the first available article.  Obviously, a client can
         ;; use that entry to avoid making unnecessary requests.  The
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 8672fca3a85..5f4d3ea849e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -366,7 +366,9 @@ This also sets the following values:
                  (coding-system-get coding-system 'ascii-compatible-p)))
         (setq default-file-name-coding-system coding-system)))
   (setq default-terminal-coding-system coding-system)
-  (setq default-keyboard-coding-system coding-system)
+  ;; Prevent default-terminal-coding-system from converting ^M to ^J.
+  (setq default-keyboard-coding-system
+        (coding-system-change-eol-conversion coding-system 'unix))
   ;; Preserve eol-type from existing default-process-coding-systems.
   ;; On non-unix-like systems in particular, these may have been set
   ;; carefully by the user, or by the startup code, to deal with the
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index d5ff0e12c0f..9a892f493d7 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -503,7 +503,7 @@ FIELD is the plain text name of a field in the message, such as
 \"subject\" or \"from\".  A FIELD of \"to\" will automatically include
 all text from the \"cc\" field as well.
 
-REGEXP is an expression to match in the preceeding specified FIELD.
+REGEXP is an expression to match in the preceding specified FIELD.
 FIELD/REGEXP pairs continue in the list.
 
 examples:
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 57cc54935dc..b3278dc312d 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -142,7 +142,7 @@
       (add-to-list 'tramp-methods (cons elt nil)))))
 
 (defconst tramp-gvfs-path-tramp (concat dbus-path-emacs "/Tramp")
-  "The preceeding object path for own objects.")
+  "The preceding object path for own objects.")
 
 (defconst tramp-gvfs-service-daemon "org.gtk.vfs.Daemon"
   "The well known name of the GVFS daemon.")
diff --git a/lisp/obsolete/sym-comp.el b/lisp/obsolete/sym-comp.el
index 6365a1075e0..7e9a460ea14 100644
--- a/lisp/obsolete/sym-comp.el
+++ b/lisp/obsolete/sym-comp.el
@@ -51,7 +51,7 @@ Uses `current-word' with the buffer narrowed to the part before
 point."
   (save-restriction
     ;; Narrow in case point is in the middle of a symbol -- we want
-    ;; just the preceeding part.
+    ;; just the preceding part.
     (narrow-to-region (point-min) (point))
     (current-word)))
 
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 5f0908e11c6..68d957584c6 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,14 @@
+2011-02-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org.el (org-maybe-keyword-time-regexp):
+        * org-icalendar.el (org-icalendar-store-UID):
+        * org-agenda.el (org-agenda-scheduled-leaders)
+        (org-agenda-deadline-leaders, org-agenda-filter-preset):
+        * org-table.el (org-table-current-line-types)
+        (org-table-current-begin-line, org-table-current-begin-pos):
+        (org-table-current-field-formula):
+        Fix typos in docstrings.
+
 2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * org-remember.el (org-remember-mode-map):
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 7c634d14e6a..f6d497569ba 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -2769,7 +2769,7 @@ Will not look before LIM."
                   (goto-char (cperl-beginning-of-property p look-prop))
                   (beginning-of-line)
                   (setq pre-indent-point (point)))))
-          (goto-char pre-indent-point)  ; Orig line skipping preceeding pod/etc
+          (goto-char pre-indent-point)  ; Orig line skipping preceding pod/etc
           (let* ((case-fold-search nil)
                  (s-s (cperl-get-state (car parse-data) (nth 1 parse-data)))
                  (start (or (nth 2 parse-data) ; last complete sexp terminated
@@ -2796,8 +2796,8 @@ Will not look before LIM."
                           (cperl-1+ char-after-pos) 'indentable)
                          p (1+ (cperl-beginning-of-property
                                 (point) 'indentable))
-                         is-block       ; misused for: preceeding line in REx
-                         (save-excursion ; Find preceeding line
+                         is-block       ; misused for: preceding line in REx
+                         (save-excursion ; Find preceding line
                            (cperl-backward-to-noncomment p)
                            (beginning-of-line)
                            (if (<= (point) p)
@@ -2813,10 +2813,10 @@ Will not look before LIM."
                          prop (parse-partial-sexp p char-after-pos))
                    (cond ((not delim)   ; End the REx, ignore is-block
                           (vector 'indentable 'terminator p is-block))
-                         (is-block      ; Indent w.r.t. preceeding line
+                         (is-block      ; Indent w.r.t. preceding line
                           (vector 'indentable 'cont-line char-after-pos
                                   is-block char-after p))
-                         (t             ; No preceeding line...
+                         (t             ; No preceding line...
                           (vector 'indentable 'first-line p))))
                   ((get-text-property char-after-pos 'REx-part2)
                    (vector 'REx-part2 (point)))
@@ -2897,7 +2897,7 @@ Will not look before LIM."
                          (cperl-backward-to-start-of-continued-exp containing-sexp))
                      (beginning-of-line)
                      (cperl-backward-to-noncomment containing-sexp))
-                   ;; Now we get non-label preceeding the indent point
+                   ;; Now we get non-label preceding the indent point
                    (if (not (or (eq (1- (point)) containing-sexp)
                                 (memq (preceding-char)
                                       (append (if is-block " ;{" " ,;{") '(nil)))
@@ -4835,7 +4835,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 ;;; Moreover, one takes positive approach (looks for else,grep etc)
 ;;; another negative (looks for bless,tr etc)
 (defun cperl-after-block-p (lim &optional pre-block)
-  "Return true if the preceeding } (if PRE-BLOCK, following {) delimits a block.
+  "Return true if the preceding } (if PRE-BLOCK, following {) delimits a block.
 Would not look before LIM.  Assumes that LIM is a good place to begin a
 statement.  The kind of block we treat here is one after which a new
 statement would start; thus the block in ${func()} does not count."
@@ -4864,7 +4864,7 @@ statement would start; thus the block in ${func()} does not count."
                                (progn
                                  (forward-sexp -1)
                                  (looking-at "sub[ \t\n\f#]"))))))
-                ;; What preceeds is not word...  XXXX Last statement in sub???
+                ;; What precedes is not word...  XXXX Last statement in sub???
                 (cperl-after-expr-p lim))))
       (error nil))))
 
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 30d9fc21867..5b7e07a5aad 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -428,7 +428,7 @@ path \(the value of !PATH).  However, under Windows and MacOS
 variable can be set to specify the paths where IDLWAVE can find PRO
 files.  The shell will only be asked for a list of paths when this
 variable is nil.  The value is a list of directories.  A directory
-preceeded by a `+' will be searched recursively.  If you set this
+preceded by a `+' will be searched recursively.  If you set this
 variable on a UNIX system, the shell will not be queried.  See also
 `idlwave-system-directory'."
   :group 'idlwave-routine-info
@@ -1197,7 +1197,7 @@ As a user, you should not set this to t.")
           (2 font-lock-function-name-face)))
 
        ;; Keyword parameters, like /xlog or ,xrange=[]
-       ;; This is anchored to the comma preceeding the keyword.
+       ;; This is anchored to the comma preceding the keyword.
        ;; Treats continuation lines, works only during whole buffer
        ;; fontification.  Slow, use it only in fancy fontification.
        (keyword-parameters
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index cb1d3c24a94..75b706b74ec 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -1775,7 +1775,7 @@ NOTE: Activate the new setting by restarting Emacs.
 
 (defcustom vhdl-intelligent-tab t
   "*Non-nil means `TAB' does indentation, word completion and tab insertion.
-That is, if preceeding character is part of a word then complete word,
+That is, if preceding character is part of a word then complete word,
 else if not at beginning of line then insert tab,
 else if last command was a `TAB' or `RET' then dedent one step,
 else indent current line (i.e. `TAB' is bound to `vhdl-electric-tab').
@@ -6946,7 +6946,7 @@ only-lines."
 ;; Indentation commands
 
 (defun vhdl-electric-tab (&optional prefix-arg)
-  "If preceeding character is part of a word or a paren then hippie-expand,
+  "If preceding character is part of a word or a paren then hippie-expand,
 else if right of non whitespace on line then insert tab,
 else if last command was a tab or return then dedent one step or if a comment
 toggle between normal indent and inline comment indent,
@@ -10396,7 +10396,7 @@ with double-quotes is to be inserted.  DEFAULT specifies a default string."
   (if vhdl-upper-case-keywords (upcase-word num) (downcase-word num)))
 
 (defun vhdl-minibuffer-tab (&optional prefix-arg)
-  "If preceeding character is part of a word or a paren then hippie-expand,
+  "If preceding character is part of a word or a paren then hippie-expand,
 else insert tab (used for word completion in VHDL minibuffer)."
   (interactive "P")
   (cond
@@ -13056,7 +13056,7 @@ hierarchy otherwise.")
 ;; Scan functions
 
 (defun vhdl-scan-context-clause ()
-  "Scan the context clause that preceeds a design unit."
+  "Scan the context clause that precedes a design unit."
   (let (lib-alist)
     (save-excursion
       (when (re-search-backward "^[ \t]*\\(architecture\\|configuration\\|entity\\|package\\)\\>" nil t)
diff --git a/lisp/replace.el b/lisp/replace.el
index 0f8adea2aca..928c3170c65 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1531,7 +1531,7 @@ N     (match-string N)           (where N is a string of digits)
 #&    (string-to-number (match-string 0))
 #     replace-count
 
-Note that these symbols must be preceeded by a backslash in order to
+Note that these symbols must be preceded by a backslash in order to
 type them using Lisp syntax."
   (while (consp n)
     (cond
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 70f11cf66dc..a0892b5ebba 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -43,7 +43,7 @@ only considered as a candidate to match `paragraph-start' or
 
 Prefix argument says to turn mode on if positive, off if negative.
 When the mode is turned on, if there are newlines in the buffer but no hard
-newlines, ask the user whether to mark as hard any newlines preceeding a
+newlines, ask the user whether to mark as hard any newlines preceding a
 `paragraph-start' line.  From a program, second arg INSERT specifies whether
 to do this; it can be `never' to change nothing, t or `always' to force
 marking, `guess' to try to do the right thing with no questions, nil
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 869ab5b07d8..6152b4c76af 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -20002,7 +20002,7 @@
 
         * w32reg.c (w32_get_rdb_resource): New function.
         (x_get_string_resource): Use it, so resources passed with -xrm
-        supercede the ones in the registry.
+        supersede the ones in the registry.
 
 2003-03-04  Jan Djärv  <jan.h.d@swipnet.se>
 
@@ -25474,7 +25474,7 @@
         recursive call unless that arg is non-nil.
         (where_is_internal): New argument no_remap.  Callers changed.
         Call recursively to find original key bindings for a remapped
-        comand unless that arg is non-nil.
+        command unless that arg is non-nil.
         (Fwhere_is_internal): New optional argument NO-REMAP.
         Doc updated.  Callers changed.  Pass arg to where_is_internal.
 
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index a361142faae..beb7a0a2ae1 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -7023,7 +7023,7 @@
         * fileio.c: There are two versions of Fexpand_file_name defined
         here; the latter is inside a `#if 0' clause.  Change its DEFUN to
         a DEAFUN, so that its docstring doesn't make it into the DOC file
-        and supercede the real docstring.
+        and supersede the real docstring.
 
         * callint.c (Fcall_interactively): For the 'K' interactive spec,
         set varies[i] to -1, indicating that the mouse click should be
@@ -11142,7 +11142,7 @@
         wait_reading_process_input, instead of just the first two.
 
         * process.c (wait_reading_process_input): Remove support for
-        only waiting for mouse input, since that has been superceded.
+        only waiting for mouse input, since that has been superseded.
         This removes X dependencies from process.c, and eliminates some
         references to code that should only exist when using X10.
 
@@ -11450,7 +11450,7 @@
 
         * minibuf.c (temp_echo_area_glyphs): Clear echo_area_glyphs and
         previous_echo_glyphs, so the message we're displaying will
-        supercede any existing message.
+        supersede any existing message.
 
         * keyboard.c: Removed external declaration of echo_area_glyphs,
         since it's declared in window.h.
diff --git a/src/character.c b/src/character.c
index f12c4f28d31..6f3312fec29 100644
--- a/src/character.c
+++ b/src/character.c
@@ -761,7 +761,7 @@ str_as_unibyte (unsigned char *str, EMACS_INT bytes)
    corresponding byte and store in DST.  CHARS is the number of
    characters in SRC.  The value is the number of bytes stored in DST.
    Usually, the value is the same as CHARS, but is less than it if SRC
-   contains a non-ASCII, non-eight-bit characater.  If ACCEPT_LATIN_1
+   contains a non-ASCII, non-eight-bit character.  If ACCEPT_LATIN_1
    is nonzero, a Latin-1 character is accepted and converted to a byte
    of that character code.
    Note: Currently the arg ACCEPT_LATIN_1 is not used.  */
diff --git a/src/editfns.c b/src/editfns.c
index 5d6189f2a3c..28690e7c76d 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3523,7 +3523,7 @@ usage: (format STRING &rest OBJECTS)  */)
   int maybe_combine_byte;
   char *this_format;
   /* Precision for each spec, or -1, a flag value meaning no precision
-     was given in that spec.  Element 0, corresonding to the format
+     was given in that spec.  Element 0, corresponding to the format
      string itself, will not be used.  Element NARGS, corresponding to
      no argument, *will* be assigned to in the case that a `%' and `.'
      occur after the final format specifier.  */
diff --git a/src/keymap.c b/src/keymap.c
index 0e4715e4b8b..1fbb40f1270 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2756,7 +2756,7 @@ remapped command in the returned list.  */)
       && !NILP (firstonly)
       && !NILP (tem = Fget (definition, QCadvertised_binding)))
     {
-      /* We have a list of advertized bindings.  */
+      /* We have a list of advertised bindings.  */
       while (CONSP (tem))
         if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition))
           return XCAR (tem);
diff --git a/src/w32proc.c b/src/w32proc.c
index 1c009c7f943..bb8b428ffe4 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -831,7 +831,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
 
      Note that using backslash to escape embedded quotes requires
      additional special handling if an embedded quote is already
-     preceeded by backslash, or if an arg requiring quoting ends with
+     preceded by backslash, or if an arg requiring quoting ends with
      backslash.  In such cases, the run of escape characters needs to be
      doubled.  For consistency, we apply this special handling as long
      as the escape character is not quote.
diff --git a/src/w32term.c b/src/w32term.c
index 692130b5140..67e853f21f0 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5941,7 +5941,7 @@ w32_initialize_display_info (Lisp_Object display_name)
 
 }
 
-/* Create an xrdb-style database of resources to supercede registry settings.
+/* Create an xrdb-style database of resources to supersede registry settings.
    The database is just a concatenation of C strings, finished by an additional
    \0.  The strings are submitted to some basic normalization, so