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

3 files changed, 14 insertions, 14 deletions

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)