Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-592
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-593
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-594
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-595
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-596
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-597
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-598
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-186
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-187
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-188
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-189
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-190
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-191
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-593

3 files changed, 28 insertions, 20 deletions

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index b3c0a578649..6907b56d6c6 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -208,23 +208,31 @@ the evaluated constant value at compile time."
   ;; Some helper functions used when building the language constants.
 
   (defun c-filter-ops (ops opgroup-filter op-filter &optional xlate)
-    ;; Used to filter operators from the list OPS in a DWIM:ey way:
-    ;; OPS either has the structure of `c-operators', as a single
+    ;; Extract a subset of the operators in the list OPS in a DWIM:ey
+    ;; way.  The return value is a plain list of operators:  
+    ;; 
+    ;; OPS either has the structure of `c-operators', is a single
     ;; group in `c-operators', or is a plain list of operators.
-    ;; OPGROUP-FILTER is used filter out the operator groups.  It can
-    ;; be t to choose all groups, a list of the group type symbols to
-    ;; accept, or a function which will be called with the group
-    ;; symbol for each group and should return non-nil for those to
-    ;; include.  OP-FILTER filters the individual operators in each
-    ;; group.  It can be t to choose all operators, a regexp to test
-    ;; against each operator, or a function which will be called for
-    ;; each operator and should return non-nil for those to include.
+    ;; 
+    ;; OPGROUP-FILTER specifies how to select the operator groups.  It
+    ;; can be t to choose all groups, a list of group type symbols
+    ;; (such as 'prefix) to accept, or a function which will be called
+    ;; with the group symbol for each group and should return non-nil
+    ;; if that group is to be included.
+    ;;
+    ;; OP-FILTER filters the individual operators in each group.  It
+    ;; can be t to choose all operators, a regexp to test against each
+    ;; operator, or a function which will be called for each operator
+    ;; and should return non-nil for those to include.
+    ;;
     ;; If XLATE is given, it's a function which is called for each
     ;; matching operator and its return value is collected instead.
     ;; If it returns a list, the elements are spliced directly into
     ;; the final result, which is returned as a list with duplicates
-    ;; removed using `equal'.  `c-mode-syntax-table' for the current
-    ;; mode is in effect during the whole procedure.
+    ;; removed using `equal'.
+    ;;
+    ;; `c-mode-syntax-table' for the current mode is in effect during
+    ;; the whole procedure.
     (unless (listp (car-safe ops))
       (setq ops (list ops)))
     (cond ((eq opgroup-filter t)
@@ -719,11 +727,11 @@ expression."
 (c-lang-defconst c-operators
   "List describing all operators, along with their precedence and
 associativity.  The order in the list corresponds to the precedence of
-the operators: The operators in each element is a group with the same
+the operators: The operators in each element are a group with the same
 precedence, and the group has higher precedence than the groups in all
-following elements.  The car of each element describes the type of of
-the operator group, and the cdr is a list of the operator tokens in
-it.  The operator group types are:
+following elements.  The car of each element describes the type of the
+operator group, and the cdr is a list of the operator tokens in it.
+The operator group types are:
 
 'prefix         Unary prefix operators.
 'postfix        Unary postfix operators.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 04a5cf9cad7..c6876fb5d79 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -876,12 +876,12 @@ FMTS is a list of format specs for transforming the file name.
 Runs COMMAND, a shell command, in a separate process asynchronously
 with output going to the buffer `*compilation*'.
 
-If optional second arg COMINT is t the buffer will be in Comint mode with
-`compilation-shell-minor-mode'.
-
 You can then use the command \\[next-error] to find the next error message
 and move to the source code that caused it.
 
+If optional second arg COMINT is t the buffer will be in Comint mode with
+`compilation-shell-minor-mode'.
+
 Interactively, prompts for the command if `compilation-read-command' is
 non-nil; otherwise uses `compile-command'.  With prefix arg, always prompts.
 Additionally, with universal prefix arg, compilation buffer will be in
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 3bf4227a82f..cc58a09ec59 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -13851,7 +13851,7 @@ entity ENT-KEY."
             (vhdl-save-cache (car project-list))
             (setq project-list (cdr project-list)))
           (message "Saving hierarchy caches...done")))
-    (error (progn (vhdl-warning "ERROR:  An error occured while saving the hierarchy caches")
+    (error (progn (vhdl-warning "ERROR:  An error occurred while saving the hierarchy caches")
                   (sit-for 2)))))
 
 (defun vhdl-save-cache (key)