Merged from miles@gnu.org--gnu-2005 (patch 438-440)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
   Rename vertical-divider face to vertical-border

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-439
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-440
   Change escape-glyph color on dark backgrounds back to cyan

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

53 files changed, 358 insertions, 225 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 03bedbdb6dc..0d4e0083686 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -67,17 +67,6 @@ I think in the near future we will see more of this problem, so it might be
 time to make anfe-ftp more intelligent.
 
 
-* REDISPLAY RELATED BUGS
-
-** Avoid unbreakable loops in redisplay.
-
-Redisplay may loop if there is an error in some display property, e.g.
-     (space 'left-margin)
-
-A fix would be to somehow disable handling of display properties if an error
-is encountered.
-
-
 * DOCUMENTATION
 
 ** Document Custom Themes.
diff --git a/etc/NEWS b/etc/NEWS
index 477bf23c524..40582c2ca97 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1982,7 +1982,7 @@ exceptions are M-a (c-beginning-of-statement) and M-e
 
 The notion of "defun" has been augmented to include AWK pattern-action
 pairs.  C-M-a (c-awk-beginning-of-defun) and C-M-e (c-awk-end-of-defun)
-recognise these pattern-action pairs, as well as user defined
+recognize these pattern-action pairs, as well as user defined
 functions.
 
 **** Auto-newline Insertion and Clean-ups
@@ -2019,7 +2019,7 @@ cells.  E.g. a line that previously had the syntactic analysis
 
 ((inclass . 11) (topmost-intro . 13))
 
-is now analysed as
+is now analyzed as
 
 ((inclass 11) (topmost-intro 13))
 
@@ -2542,7 +2542,7 @@ per line.  Lines beginning with space or tab are ignored.
 
 Previously, only the `template' and `class' keywords had this effect.
 
-**** The GCC __attribute__ keyword is now recognised and ignored.
+**** The GCC __attribute__ keyword is now recognized and ignored.
 
 **** New language HTML.
 
@@ -3942,7 +3942,7 @@ function is still supported, but new code should use the new
 functions.
 
 *** Function `signal-process' now accepts a process object or process
-name in addition to a process id to identify the signalled process.
+name in addition to a process id to identify the signaled process.
 
 *** Processes now have an associated property list where programs can
 maintain process state and other per-process related information.
@@ -13309,10 +13309,10 @@ not by default.  Use --members to turn this feature on.
 *** C++ member functions are now recognized as tags.
 
 *** Java is tagged like C++.  In addition, "extends" and "implements"
-constructs are tagged.  Files are recognised by the extension .java.
+constructs are tagged.  Files are recognized by the extension .java.
 
 *** Etags can now handle programs written in Postscript.  Files are
-recognised by the extensions .ps and .pdb (Postscript with C syntax).
+recognized by the extensions .ps and .pdb (Postscript with C syntax).
 In Postscript, tags are lines that start with a slash.
 
 *** Etags now handles Objective C and Objective C++ code.  The usual C and
@@ -13320,7 +13320,7 @@ C++ tags are recognized in these languages; in addition, etags
 recognizes special Objective C syntax for classes, class categories,
 methods and protocols.
 
-*** Etags also handles Cobol.  Files are recognised by the extension
+*** Etags also handles Cobol.  Files are recognized by the extension
 .cobol.  The tagged lines are those containing a word that begins in
 column 8 and ends in a full stop, i.e. anything that could be a
 paragraph name.
diff --git a/etc/TODO b/etc/TODO
index ddfbad2b65f..6e174cd38a1 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -9,6 +9,9 @@ to the FSF.
 
 * Small but important fixes needed in existing features:
 
+** Make occur correctly handle matches that span more than one line,
+   as well as overlapping matches.
+
 ** Fix the kill/yank treatment of invisible text.  At the moment,
   invisible text is placed in the kill-ring, so that the contents of
   the ring may not correspond to the text as displayed to the user.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45d7ccdca02..1079129698e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,47 @@
+2005-06-22  Miles Bader  <miles@gnu.org>
+
+        * faces.el (vertical-border): Renamed from `vertical-divider'.
+        (escape-glyph): Change dark-background color back to `cyan'.
+
+2005-06-21  Juri Linkov  <juri@jurta.org>
+
+        * faces.el (face-user-default-spec): Try getting `customized-face'
+        prior to `saved-face'.
+        (frame-background-mode): Refill docstring.
+
+        * emacs-lisp/lisp-mode.el (eval-defun-1):
+        * emacs-lisp/edebug.el (edebug-eval-defun):
+        Set `saved-face' temporarily to nil before calling form.
+        Set `customized-face' to the new spec after that.
+
+2005-06-21  Juanma Barranquero  <lekktu@gmail.com>
+
+        * subr.el (1value, lambda, key-substitution-in-progress):
+        Doc fixes.
+
+        * autoinsert.el (auto-insert-alist):
+        * ses.el (ses-call-printer):
+        * subr.el (noreturn):
+        * emacs-lisp/lisp.el (check-parens):
+        * emacs-lisp/byte-opt.el (byte-optimize-pure-func):
+        * net/browse-url.el (browse-url-mosaic):
+        * progmodes/cc-defs.el (c-safe-scan-lists):
+        * progmodes/ebnf-abn.el (ebnf-abn-lex):
+        * progmodes/ebnf-bnf.el (ebnf-bnf-lex):
+        * progmodes/ebnf-dtd.el (ebnf-dtd-lex):
+        * progmodes/ebnf-ebx.el (ebnf-ebx-lex):
+        * progmodes/ebnf-iso.el (ebnf-iso-lex):
+        * progmodes/ebnf-yac.el (ebnf-yac-lex): Fix spellings.
+
+2005-06-21  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * pcvs-defs.el (cvs-menu): Add cvs-mode-mark and cvs-mode-unmark.
+
+2005-06-21  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+        * calendar/appt.el (appt-make-list): Activate the package, if
+        not already active (for backwards compatibility).
+
 2005-06-20  Kim F. Storm  <storm@cua.dk>
 
         * subr.el (add-to-ordered-list): Test membership with eq.  Simplify.
@@ -536,6 +580,7 @@
         variables, unless either `gtk' is boundp or this isn't a
         `windows-nt' build.
 
+>>>>>>> 1.7817
 2005-06-13  Lute Kamstra  <lute@gnu.org>
 
         * abbrev.el (edit-abbrevs-mode): Use kill-all-local-variables and
@@ -1443,6 +1488,7 @@
 
         * simple.el (filter-buffer-substring): Fix typo in docstring.
 
+>>>>>>> 1.7768
 2005-05-31  Richard M. Stallman  <rms@gnu.org>
 
         * progmodes/vhdl-mode.el (vhdl-fill-region): Test ARG, not INTERACTIVE.
@@ -1479,6 +1525,7 @@
         * textmodes/tex-mode.el (tex-compile-commands, tex-compile)
         (tex-start-tex): Undo all but the last part of the 2005-05-28 change.
 
+>>>>>>> 1.7646
 2005-05-30  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
         * calendar/diary-lib.el (mark-included-diary-files): Only kill
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 27f5555bb04..04bdb17efca 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -140,7 +140,7 @@ If this contains a %s, that will be replaced by the matching rule."
      (getenv "ORGANIZATION") | (progn user-full-name)
      "
 .\\\" You may distribute this file under the terms of the GNU Free
-.\\\" Documentation Licence.
+.\\\" Documentation License.
 .TH " (file-name-sans-extension (file-name-nondirectory (buffer-file-name)))
      " " (file-name-extension (buffer-file-name))
      " " (format-time-string "%Y-%m-%d ")
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index ce0da11ecaa..643465f8478 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -1,4 +1,4 @@
-;;; calc-misc.el --- miscellaenous functions for Calc
+;;; calc-misc.el --- miscellaneous functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
 
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index c3f29e3d371..a66ef9cec6e 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -534,88 +534,93 @@ NUMBER hold the arguments that `list-diary-entries' received.
 They specify the range of dates that the diary is being processed for.
 
 Any appointments made with `appt-add' are not affected by this
-function."
-
-  ;; We have something to do if the range of dates that the diary is
-  ;; considering includes the current date.
-  (if (and (not (calendar-date-compare
-                 (list (calendar-current-date))
-                 (list original-date)))
-           (calendar-date-compare
-            (list (calendar-current-date))
-            (list (calendar-gregorian-from-absolute
-                   (+ (calendar-absolute-from-gregorian original-date)
-                      number)))))
-      (save-excursion
-        ;; Clear the appointments list, then fill it in from the diary.
-        (dolist (elt appt-time-msg-list)
-          ;; Delete any entries that were not made with appt-add.
-          (unless (nth 2 elt)
-            (setq appt-time-msg-list
-                  (delq elt appt-time-msg-list))))
-        (if diary-entries-list
-
-            ;; Cycle through the entry-list (diary-entries-list)
-            ;; looking for entries beginning with a time. If
-            ;; the entry begins with a time, add it to the
-            ;; appt-time-msg-list. Then sort the list.
-
-            (let ((entry-list diary-entries-list)
-                  (new-time-string ""))
-              ;; Skip diary entries for dates before today.
-              (while (and entry-list
-                          (calendar-date-compare
-                           (car entry-list) (list (calendar-current-date))))
-                (setq entry-list (cdr entry-list)))
-              ;; Parse the entries for today.
-              (while (and entry-list
-                          (calendar-date-equal
-                           (calendar-current-date) (car (car entry-list))))
-                (let ((time-string (cadr (car entry-list))))
-                  (while (string-match
-                          "\\([0-9]?[0-9][:.][0-9][0-9]\\(am\\|pm\\)?\\).*"
-                          time-string)
-                    (let* ((beg (match-beginning 0))
-                           ;; Get just the time for this appointment.
-                           (only-time (match-string 1 time-string))
-                           ;; Find the end of this appointment
-                           ;; (the start of the next).
-                           (end (string-match
-                                 "^[ \t]*[0-9]?[0-9][:.][0-9][0-9]\\(am\\|pm\\)?"
-                                 time-string
-                                 (match-end 0)))
-                           ;; Get the whole string for this appointment.
-                           (appt-time-string
-                            (substring time-string beg (if end (1- end)))))
-
-                      ;; Add this appointment to appt-time-msg-list.
-                      (let* ((appt-time (list (appt-convert-time only-time)))
-                             (time-msg (list appt-time appt-time-string)))
-                        (setq appt-time-msg-list
-                              (nconc appt-time-msg-list (list time-msg))))
-
-                      ;; Discard this appointment from the string.
-                      (setq time-string
-                            (if end (substring time-string end) "")))))
-                (setq entry-list (cdr entry-list)))))
-        (setq appt-time-msg-list (appt-sort-list appt-time-msg-list))
-
-        ;; Get the current time and convert it to minutes
-        ;; from midnight. ie. 12:01am = 1, midnight = 0,
-        ;; so that the elements in the list
-        ;; that are earlier than the present time can
-        ;; be removed.
-
-        (let* ((now (decode-time))
-               (cur-hour (nth 2 now))
-               (cur-min (nth 1 now))
-               (cur-comp-time (+ (* cur-hour 60) cur-min))
-               (appt-comp-time (car (caar appt-time-msg-list))))
-
-          (while (and appt-time-msg-list (< appt-comp-time cur-comp-time))
-            (setq appt-time-msg-list (cdr appt-time-msg-list))
-            (if appt-time-msg-list
-                (setq appt-comp-time (car (caar appt-time-msg-list)))))))))
+function.
+
+For backwards compatibility, this function activates the
+appointment package (if it is not already active)."
+  ;; See comments above appt-activate defun.
+  (if (not appt-timer)
+      (appt-activate 1)
+    ;; We have something to do if the range of dates that the diary is
+    ;; considering includes the current date.
+    (if (and (not (calendar-date-compare
+                   (list (calendar-current-date))
+                   (list original-date)))
+             (calendar-date-compare
+              (list (calendar-current-date))
+              (list (calendar-gregorian-from-absolute
+                     (+ (calendar-absolute-from-gregorian original-date)
+                        number)))))
+        (save-excursion
+          ;; Clear the appointments list, then fill it in from the diary.
+          (dolist (elt appt-time-msg-list)
+            ;; Delete any entries that were not made with appt-add.
+            (unless (nth 2 elt)
+              (setq appt-time-msg-list
+                    (delq elt appt-time-msg-list))))
+          (if diary-entries-list
+
+              ;; Cycle through the entry-list (diary-entries-list)
+              ;; looking for entries beginning with a time. If
+              ;; the entry begins with a time, add it to the
+              ;; appt-time-msg-list. Then sort the list.
+
+              (let ((entry-list diary-entries-list)
+                    (new-time-string ""))
+                ;; Skip diary entries for dates before today.
+                (while (and entry-list
+                            (calendar-date-compare
+                             (car entry-list) (list (calendar-current-date))))
+                  (setq entry-list (cdr entry-list)))
+                ;; Parse the entries for today.
+                (while (and entry-list
+                            (calendar-date-equal
+                             (calendar-current-date) (car (car entry-list))))
+                  (let ((time-string (cadr (car entry-list))))
+                    (while (string-match
+                            "\\([0-9]?[0-9][:.][0-9][0-9]\\(am\\|pm\\)?\\).*"
+                            time-string)
+                      (let* ((beg (match-beginning 0))
+                             ;; Get just the time for this appointment.
+                             (only-time (match-string 1 time-string))
+                             ;; Find the end of this appointment
+                             ;; (the start of the next).
+                             (end (string-match
+                                   "^[ \t]*[0-9]?[0-9][:.][0-9][0-9]\\(am\\|pm\\)?"
+                                   time-string
+                                   (match-end 0)))
+                             ;; Get the whole string for this appointment.
+                             (appt-time-string
+                              (substring time-string beg (if end (1- end)))))
+
+                        ;; Add this appointment to appt-time-msg-list.
+                        (let* ((appt-time (list (appt-convert-time only-time)))
+                               (time-msg (list appt-time appt-time-string)))
+                          (setq appt-time-msg-list
+                                (nconc appt-time-msg-list (list time-msg))))
+
+                        ;; Discard this appointment from the string.
+                        (setq time-string
+                              (if end (substring time-string end) "")))))
+                  (setq entry-list (cdr entry-list)))))
+          (setq appt-time-msg-list (appt-sort-list appt-time-msg-list))
+
+          ;; Get the current time and convert it to minutes
+          ;; from midnight. ie. 12:01am = 1, midnight = 0,
+          ;; so that the elements in the list
+          ;; that are earlier than the present time can
+          ;; be removed.
+
+          (let* ((now (decode-time))
+                 (cur-hour (nth 2 now))
+                 (cur-min (nth 1 now))
+                 (cur-comp-time (+ (* cur-hour 60) cur-min))
+                 (appt-comp-time (car (caar appt-time-msg-list))))
+
+            (while (and appt-time-msg-list (< appt-comp-time cur-comp-time))
+              (setq appt-time-msg-list (cdr appt-time-msg-list))
+              (if appt-time-msg-list
+                  (setq appt-comp-time (car (caar appt-time-msg-list))))))))))
 
 
 (defun appt-sort-list (appt-list)
@@ -665,6 +670,30 @@ This function is intended for use with `write-file-functions'."
   nil)
 
 
+;; In Emacs-21.3, the manual documented the following procedure to
+;; activate this package:
+;;     (display-time)
+;;     (add-hook 'diary-hook 'appt-make-list)
+;;     (diary 0)
+;; The display-time call was not necessary, AFAICS.
+;; What was really needed was to add the hook and load this file.
+;; Calling (diary 0) once the hook had been added was in some sense a
+;; roundabout way of loading this file. This file used to have code at
+;; the top-level that set up the appt-timer and global-mode-string.
+;; One way to maintain backwards compatibility would be to call
+;; (appt-activate 1) at top-level. However, this goes against the
+;; convention that just loading an Emacs package should not activate
+;; it. Instead, we make appt-make-list activate the package (after a
+;; suggestion from rms). This means that one has to call diary in
+;; order to get it to work, but that is in line with the old (weird,
+;; IMO) documented behavior for activating the package.
+;; Actually, since (diary 0) does not run diary-hook, I don't think
+;; the documented behavior in Emacs-21.3 would ever have worked.
+;; Oh well, at least with the changes to appt-make-list it will now
+;; work as well as it ever did.
+;; The new method is just to use (appt-activate 1).
+;; -- gmorris
+
 ;;;###autoload
 (defun appt-activate (&optional arg)
 "Toggle checking of appointments.
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index acb882dd9a3..e1aacdd51e9 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -152,11 +152,11 @@
 ;; ;; Associative math should recognize subcalls to identical function:
 ;; (disassemble (lambda (x) (+ (+ (foo) 1) (+ (bar) 2))))
 ;; ;; This should generate the same as (1+ x) and (1- x)
-   
+
 ;; (disassemble (lambda (x) (cons (+ x 1) (- x 1))))
 ;; ;; An awful lot of functions always return a non-nil value.  If they're
 ;; ;; error free also they may act as true-constants.
-   
+
 ;; (disassemble (lambda (x) (and (point) (foo))))
 ;; ;; When
 ;; ;;   - all but one arguments to a function are constant
@@ -165,19 +165,19 @@
 ;; ;; condition is side-effect-free [assignment-free] then the other
 ;; ;; arguments may be any expressions.  Since, however, the code size
 ;; ;; can increase this way they should be "simple".  Compare:
-   
+
 ;; (disassemble (lambda (x) (eq (if (point) 'a 'b) 'c)))
 ;; (disassemble (lambda (x) (if (point) (eq 'a 'c) (eq 'b 'c))))
-   
+
 ;; ;; (car (cons A B)) -> (prog1 A B)
 ;; (disassemble (lambda (x) (car (cons (foo) 42))))
-   
+
 ;; ;; (cdr (cons A B)) -> (progn A B)
 ;; (disassemble (lambda (x) (cdr (cons 42 (foo)))))
-   
+
 ;; ;; (car (list A B ...)) -> (prog1 A B ...)
 ;; (disassemble (lambda (x) (car (list (foo) 42 (bar)))))
-   
+
 ;; ;; (cdr (list A B ...)) -> (progn A (list B ...))
 ;; (disassemble (lambda (x) (cdr (list 42 (foo) (bar)))))
 
@@ -1126,7 +1126,7 @@
 This assumes that the function will not have any side-effects and that
 its return value depends solely on its arguments.
 If the function can signal an error, this might change the semantics
-of FORM by signalling the error at compile-time."
+of FORM by signaling the error at compile-time."
   (let ((args (cdr form))
         (constant t))
     (while (and args constant)
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index e9c767961cd..ebe375088a3 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -511,9 +511,16 @@ the minibuffer."
            (set-default (nth 1 form) (eval (nth 2 form))))
           ((eq (car form) 'defface)
            ;; Reset the face.
-           (put (nth 1 form) 'face-defface-spec nil)
            (setq face-new-frame-defaults
-                 (assq-delete-all (nth 1 form) face-new-frame-defaults))))
+                 (assq-delete-all (nth 1 form) face-new-frame-defaults))
+           (put (nth 1 form) 'face-defface-spec nil)
+           ;; See comments in `eval-defun-1' for purpose of code below
+           (setq form (prog1 `(prog1 ,form
+                                (put ',(nth 1 form) 'saved-face
+                                     ',(get (nth 1 form) 'saved-face))
+                                (put ',(nth 1 form) 'customized-face
+                                     ',(nth 2 form)))
+                        (put (nth 1 form) 'saved-face nil)))))
     (setq edebug-result (eval form))
     (if (not edebugging)
         (princ edebug-result)
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 72924417109..1ffc33835e9 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -617,10 +617,23 @@ Reinitialize the face according to the `defface' specification."
         ;; `defface' is macroexpanded to `custom-declare-face'.
         ((eq (car form) 'custom-declare-face)
          ;; Reset the face.
-         (put (eval (nth 1 form)) 'face-defface-spec nil)
          (setq face-new-frame-defaults
                (assq-delete-all (eval (nth 1 form)) face-new-frame-defaults))
-         form)
+         (put (eval (nth 1 form)) 'face-defface-spec nil)
+         ;; Setting `customized-face' to the new spec after calling
+         ;; the form, but preserving the old saved spec in `saved-face',
+         ;; imitates the situation when the new face spec is set
+         ;; temporarily for the current session in the customize
+         ;; buffer, thus allowing `face-user-default-spec' to use the
+         ;; new customized spec instead of the saved spec.
+         ;; Resetting `saved-face' temporarily to nil is needed to let
+         ;; `defface' change the spec, regardless of a saved spec.
+         (prog1 `(prog1 ,form
+                   (put ',(eval (nth 1 form)) 'saved-face
+                        ',(get (eval (nth 1 form)) 'saved-face))
+                   (put ',(eval (nth 1 form)) 'customized-face
+                        ',(eval (nth 2 form))))
+           (put (eval (nth 1 form)) 'saved-face nil)))
         ((eq (car form) 'progn)
          (cons 'progn (mapcar 'eval-defun-1 (cdr form))))
         (t form)))
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 955bc4499bc..a14c4815374 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -489,7 +489,7 @@ More accurately, check the narrowed part of the buffer for unbalanced
 expressions (\"sexps\") in general.  This is done according to the
 current syntax table and will find unbalanced brackets or quotes as
 appropriate.  (See Info node `(emacs)Parentheses'.)  If imbalance is
-found, an error is signalled and point is left at the first unbalanced
+found, an error is signaled and point is left at the first unbalanced
 character."
   (interactive)
   (condition-case data
diff --git a/lisp/faces.el b/lisp/faces.el
index 279eda8c7b3..20dbee74517 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1477,7 +1477,8 @@ If there is no default for FACE, return nil."
 (defsubst face-user-default-spec (face)
   "Return the user's customized face-spec for FACE, or the default if none.
 If there is neither a user setting nor a default for FACE, return nil."
-  (or (get face 'saved-face)
+  (or (get face 'customized-face)
+      (get face 'saved-face)
       (face-default-spec face)))
 
 
@@ -1549,9 +1550,9 @@ If omitted or nil, that stands for the selected frame's display."
 
 (defcustom frame-background-mode nil
   "*The brightness of the background.
-Set this to the symbol `dark' if your background color is dark, `light' if
-your background is light, or nil (default) if you want Emacs to
-examine the brightness for you.  Don't set this variable with `setq';
+Set this to the symbol `dark' if your background color is dark,
+`light' if your background is light, or nil (default) if you want Emacs
+to examine the brightness for you.  Don't set this variable with `setq';
 this won't have the expected effect."
   :group 'faces
   :set #'(lambda (var value)
@@ -1900,7 +1901,7 @@ created."
   :group 'modeline
   :group 'basic-faces)
 
-(defface vertical-divider
+(defface vertical-border
   '((default :inherit mode-line-inactive))
   "Face used for vertical window dividers on ttys."
   :version "22.1"
@@ -2136,7 +2137,7 @@ Note: Other faces cannot inherit from the cursor face."
   :group 'basic-faces)
 
 (defface escape-glyph
-  '((((background dark)) :foreground "pink2")
+  '((((background dark)) :foreground "cyan")
     ;; See the comment in minibuffer-prompt for
     ;; the reason not to use blue on MS-DOS.
     (((type pc)) :foreground "magenta")
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index eca1fc26ce9..dec81e0b696 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-21  Juanma Barranquero  <lekktu@gmail.com>
+
+        * nnimap.el (nnimap-split-download-body): Fix spellings.
+
 2005-06-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * gnus-art.el (gnus-article-encrypt-body):
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 31d96cdd375..b09f5d19111 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -205,7 +205,7 @@ RFC2060 section 6.4.4."
   "Whether to download entire articles during splitting.
 This is generally not required, and will slow things down considerably.
 You may need it if you want to use an advanced splitting function that
-analyses the body before splitting the article.
+analyzes the body before splitting the article.
 If this variable is nil, bodies will not be downloaded; if this
 variable is the symbol `default' the default behaviour is
 used (which currently is nil, unless you use a statistical
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 70388e56ab7..cd5c2d41f98 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1216,11 +1216,11 @@ used instead of `browse-url-new-window-flag'."
           (save-buffer)
           (kill-buffer nil)
           ;; Send signal SIGUSR to Mosaic
-          (message "Signalling Mosaic...")
+          (message "Signaling Mosaic...")
           (signal-process pid 'SIGUSR1)
           ;; Or you could try:
           ;; (call-process "kill" nil 0 nil "-USR1" (int-to-string pid))
-          (message "Signalling Mosaic...done")
+          (message "Signaling Mosaic...done")
           )
       ;; Mosaic not running - start it
       (message "Starting %s..." browse-url-mosaic-program)
diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index 62c0d62d161..394c3580945 100644
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -421,9 +421,11 @@ This variable is buffer local and only used in the *cvs* buffer.")
     ["Ignore"                   cvs-mode-ignore         (cvs-enabledp 'ignore)]
     ["Add ChangeLog"            cvs-mode-add-change-log-entry-other-window t]
     "----"
+    ["Mark"                     cvs-mode-mark t]
     ["Mark all"                 cvs-mode-mark-all-files t]
     ["Mark by regexp..."        cvs-mode-mark-matching-files t]
     ["Mark by state..."         cvs-mode-mark-on-state t]
+    ["Unmark"                   cvs-mode-unmark t]
     ["Unmark all"               cvs-mode-unmark-all-files t]
     ["Hide handled"             cvs-mode-remove-handled t]
     "----"
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index d9caca90666..f197a60c6a4 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -417,7 +417,7 @@ This function does not do any hidden buffer changes."
   `(c-forward-sexp ,(if (numberp count) (- count) `(- ,count))))
 
 (defmacro c-safe-scan-lists (from count depth)
-  "Like `scan-lists' but returns nil instead of signalling errors.
+  "Like `scan-lists' but returns nil instead of signaling errors.
 
 This function does not do any hidden buffer changes."
   (if (featurep 'xemacs)
diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el
index 5bb0dd03913..d4d3399dc09 100644
--- a/lisp/progmodes/ebnf-abn.el
+++ b/lisp/progmodes/ebnf-abn.el
@@ -485,7 +485,7 @@
 
 
 (defun ebnf-abn-lex ()
-  "Lexical analyser for ABNF.
+  "Lexical analyzer for ABNF.
 
 Return a lexical token.
 
diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el
index 09db8f8865d..4ea7d5e0404 100644
--- a/lisp/progmodes/ebnf-bnf.el
+++ b/lisp/progmodes/ebnf-bnf.el
@@ -109,7 +109,7 @@
 ;;    ;; 8-bit accentuated characters) except `"', as `"' is used to delimit a
 ;;    ;; terminal.  Also, accepts escaped characters, that is, a character
 ;;    ;; pair starting with `\' followed by a printable character, for
-;;    ;; example: \", \\. 
+;;    ;; example: \", \\.
 ;;
 ;;    special = "[^?\\000-\\010\\012-\\037\\177-\\237]*".
 ;;    ;; that is, a valid special accepts any printable character (including
@@ -429,7 +429,7 @@
 
 
 (defun ebnf-bnf-lex ()
-  "Lexical analyser for EBNF.
+  "Lexical analyzer for EBNF.
 
 Return a lexical token.
 
diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el
index 621cf424463..2f1d6412d38 100644
--- a/lisp/progmodes/ebnf-dtd.el
+++ b/lisp/progmodes/ebnf-dtd.el
@@ -1152,7 +1152,7 @@
 
 
 (defun ebnf-dtd-lex ()
-  "Lexical analyser for DTD.
+  "Lexical analyzer for DTD.
 
 Return a lexical token.
 
diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el
index 45ccb956af8..25e6c72d584 100644
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@@ -295,7 +295,7 @@
           (cons (car except)
                 (ebnf-make-except (cdr term) (cdr except))))
       term)))
-          
+
 
 
 ;;; term ::= factor ('*' | '+' | '?')?
@@ -416,7 +416,7 @@
 
 
 (defun ebnf-ebx-lex ()
-  "Lexical analyser for EBNFX.
+  "Lexical analyzer for EBNFX.
 
 Return a lexical token.
 
@@ -503,7 +503,7 @@ See documentation for variable `ebnf-ebx-lex'."
       (error "Missing end of constraint `]'"))
   (forward-char)
   t)
-  
+
 
 
 (defun ebnf-ebx-skip-end-of-rule ()
diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el
index ba28dfb5af9..8be521052eb 100644
--- a/lisp/progmodes/ebnf-iso.el
+++ b/lisp/progmodes/ebnf-iso.el
@@ -389,7 +389,7 @@
 
 
 (defun ebnf-iso-lex ()
-  "Lexical analyser for ISO EBNF.
+  "Lexical analyzer for ISO EBNF.
 
 Return a lexical token.
 
diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el
index 58f422b1714..cc1c8c451dd 100644
--- a/lisp/progmodes/ebnf-yac.el
+++ b/lisp/progmodes/ebnf-yac.el
@@ -312,7 +312,7 @@
 
 
 (defun ebnf-yac-lex ()
-  "Lexical analyser for Yacc/Bison.
+  "Lexical analyzer for Yacc/Bison.
 
 Return a lexical token.
 
diff --git a/lisp/ses.el b/lisp/ses.el
index 1107f21d510..09f7809752b 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -878,7 +878,7 @@ preceding cell has spilled over."
 lambda of one argument) on VALUE.  Result is the the printed cell as a
 string.  The variable `ses-call-printer-return' is set to t if the printer
 used parenthesis to request left-justification, or the error-signal if the
-printer signalled one (and \"%s\" is used as the default printer), else nil."
+printer signaled one (and \"%s\" is used as the default printer), else nil."
   (setq ses-call-printer-return nil)
   (unless value
     (setq value ""))
diff --git a/lisp/subr.el b/lisp/subr.el
index 2b0af2f95a0..f43f84fd7d7 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -44,12 +44,12 @@ Each element of this list holds the arguments to one call to `defcustom'.")
 (defmacro noreturn (form)
   "Evaluates FORM, with the expectation that the evaluation will signal an error
 instead of returning to its caller.  If FORM does return, an error is
-signalled."
+signaled."
   `(prog1 ,form
      (error "Form marked with `noreturn' did return")))
 
 (defmacro 1value (form)
-  "Evaluates FORM, with the expectation that all the same value will be returned
+  "Evaluates FORM, with the expectation that the same value will be returned
 from all evaluations of FORM.  This is the global do-nothing
 version of `1value'.  There is also `testcover-1value' that
 complains if FORM ever does return differing values."
@@ -61,7 +61,7 @@ A call of the form (lambda ARGS DOCSTRING INTERACTIVE BODY) is
 self-quoting; the result of evaluating the lambda expression is the
 expression itself.  The lambda expression may then be treated as a
 function, i.e., stored as the function value of a symbol, passed to
-funcall or mapcar, etc.
+`funcall' or `mapcar', etc.
 
 ARGS should take the same form as an argument list for a `defun'.
 DOCSTRING is an optional documentation string.
@@ -347,7 +347,7 @@ but optional second arg NODIGITS non-nil treats them like other chars."
           (setq loop (1+ loop))))))
 
 (defvar key-substitution-in-progress nil
- "Used internally by substitute-key-definition.")
+ "Used internally by `substitute-key-definition'.")
 
 (defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix)
   "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF.
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 5718346b89b..5470a822a51 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-21  Juanma Barranquero  <lekktu@gmail.com>
+
+        * url-gw.el (url-open-stream):
+        * url-vars.el (url-gateway-unplugged): Fix spellings.
+
 2005-06-14  Juanma Barranquero  <lekktu@gmail.com>
 
         * url-history.el (url-completion-function): Follow error
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index b5701668f83..153d146b608 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -212,7 +212,7 @@ linked Emacs under SunOS 4.x"
 (defun url-open-stream (name buffer host service)
   "Open a stream to HOST, possibly via a gateway.
 Args per `open-network-stream'.
-Will not make a connexion if `url-gateway-unplugged' is non-nil."
+Will not make a connection if `url-gateway-unplugged' is non-nil."
   (unless url-gateway-unplugged
     (let ((gw-method (if (and url-gateway-local-host-regexp
                               (not (eq 'tls url-gateway-method))
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index c3e17365242..53b144f0f98 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -388,7 +388,7 @@ Currently supported methods:
 (defconst url-working-buffer " *url-work")
 
 (defvar url-gateway-unplugged nil
-  "Non-nil means don't open new network connexions.
+  "Non-nil means don't open new network connections.
 This should be set, e.g. by mail user agents rendering HTML to avoid
 `bugs' which call home.")
 
diff --git a/lispintro/emacs-lisp-intro.texi b/lispintro/emacs-lisp-intro.texi
index 3714e010d18..cb2396975dc 100644
--- a/lispintro/emacs-lisp-intro.texi
+++ b/lispintro/emacs-lisp-intro.texi
@@ -7319,7 +7319,7 @@ this:
 
 The part within quotation marks, @code{"*p\ncZap to char:@: "}, specifies
 three different things.  First, and most simply, the asterisk, @samp{*},
-causes an error to be signalled if the buffer is read-only.  This means that
+causes an error to be signaled if the buffer is read-only.  This means that
 if you try @code{zap-to-char} in a read-only buffer you will not be able to
 remove text, and you will receive a message that says ``Buffer is
 read-only''; your terminal may beep at you as well.
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index e84463292e5..24d00a90f3a 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,19 @@
+2005-06-21  Richard M. Stallman  <rms@gnu.org>
+
+        * anti.texi (Antinews): Texinfo usage fix.
+
+2005-06-21  Karl Berry  <karl@gnu.org>
+
+        * elisp.texi: Use @copying.
+
+        * elisp.texi: Put @summarycontents and @contents before the Top
+        node, instead of the end of the file, so that the contents appear
+        in the right place in the dvi/pdf output.
+
+2005-06-21  Juri Linkov  <juri@jurta.org>
+
+        * display.texi (Defining Faces): Add `customized-face'.
+
 2005-06-20  Kim F. Storm  <storm@cua.dk>
 
         * variables.texi (Setting Variables): Any type of element can be
diff --git a/lispref/anti.texi b/lispref/anti.texi
index c7a72f04df8..2c3d6414c1c 100644
--- a/lispref/anti.texi
+++ b/lispref/anti.texi
@@ -386,7 +386,7 @@ previously autoloaded.
 @item
 There is a new variable, @code{recursive-load-depth-limit}, which
 specifies how many times files can recursively load themselves; it is
-50 by default, and nil means infinity.  Previously, Emacs signalled an
+50 by default, and @code{nil} means infinity.  Previously, Emacs signaled an
 error after just 3 recursive loads, which was boring.
 
 @item
diff --git a/lispref/backups.texi b/lispref/backups.texi
index 1ba7ed1b931..24c617510bf 100644
--- a/lispref/backups.texi
+++ b/lispref/backups.texi
@@ -153,7 +153,7 @@ ignored.
 @tindex make-backup-file-name-function
 This variable's value is a function to use for making backups instead
 of the default @code{make-backup-file-name}.  A value of @code{nil}
-gives the default @code{make-backup-file-name} behaviour.
+gives the default @code{make-backup-file-name} behavior.
 @xref{Backup Names,, Naming Backup Files}.
 
 This could be buffer-local to do something special for specific
diff --git a/lispref/control.texi b/lispref/control.texi
index 760e7bb82de..573a32b1cde 100644
--- a/lispref/control.texi
+++ b/lispref/control.texi
@@ -733,7 +733,7 @@ instead.  @xref{Catch and Throw}.
 @subsubsection How to Signal an Error
 @cindex signaling errors
 
-   @dfn{Signalling} an error means beginning error processing.  Error
+   @dfn{Signaling} an error means beginning error processing.  Error
 processing normally aborts all or part of the running program and
 returns to a point that is set up to handle the error
 (@pxref{Processing of Errors}).  Here we describe how to signal an
diff --git a/lispref/display.texi b/lispref/display.texi
index 930f8aa31bc..2243a1e6899 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -1907,8 +1907,9 @@ frame must match one of the @var{value}s specified for it in
   Internally, @code{defface} uses the symbol property
 @code{face-defface-spec} to record the face attributes specified in
 @code{defface}, @code{saved-face} for the attributes saved by the user
-with the customization buffer, and @code{face-documentation} for the
-documentation string.
+with the customization buffer, @code{customized-face} for the
+attributes customized by the user for the current session, but not
+saved, and @code{face-documentation} for the documentation string.
 
 @defopt frame-background-mode
 This option, if non-@code{nil}, specifies the background type to use for
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index 0a4849c236b..9e52b39223e 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -26,29 +26,27 @@
 @c We use the "type index" to index new functions and variables.
 @c @syncodeindex tp fn
 
-@ifnottex
-This Info file contains edition @value{VERSION} of the GNU Emacs Lisp
+@copying
+This is edition @value{VERSION} of the GNU Emacs Lisp
 Reference Manual, corresponding to Emacs version @value{EMACSVER}.
 
-Published by the Free Software Foundation
-59 Temple Place, Suite 330
-Boston, MA  02111-1307  USA
-
-Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, @*
+Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
               2000, 2002, 2003, 2004, 2005, Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with the
-Invariant Sections being ``GNU General Public License'', with the Front-Cover texts being
-``A GNU Manual'', and with the Back-Cover Texts as in (a) below.  A copy
-of the license is included in the section entitled ``GNU Free
-Documentation License''.
+Invariant Sections being ``GNU General Public License'', with the
+Front-Cover texts being ``A GNU Manual'', and with the Back-Cover
+Texts as in (a) below.  A copy of the license is included in the
+section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
 this GNU Manual, like GNU software.  Copies published by the Free
 Software Foundation raise funds for GNU development.''
-@end ifnottex
+@end quotation
+@end copying
 
 @titlepage
 @title GNU Emacs Lisp Reference Manual
@@ -59,36 +57,24 @@ Software Foundation raise funds for GNU development.''
 @author and the GNU Manual Group
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,@*
-1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-@sp 2
-Edition @value{VERSION} @*
-Revised for Emacs Version @value{EMACSVER},@*
-January 2002.@*
-@sp 2
-ISBN 1-882114-73-6
+@insertcopying
 
-@sp 2
+@sp 1
 Published by the Free Software Foundation @*
-59 Temple Place, Suite 330@*
-Boston, MA  02111-1307  USA
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``Copying'', with the Front-Cover texts being
-``A GNU Manual'', and with the Back-Cover Texts as in (a) below.  A copy
-of the license is included in the section entitled ``GNU Free
-Documentation License''.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+51 Franklin St, Fifth Floor @*
+Boston, MA 02110-1301 @*
+USA @*
+ISBN 1-882114-73-6
 
+@sp 1
 Cover art by Etienne Suvasa.
 @end titlepage
-@page
+
+
+@c Print the tables of contents
+@summarycontents
+@contents
+
 
 @ifnottex
 @node Top, Introduction, (dir), (dir)
@@ -1150,11 +1136,6 @@ Object Internals
 
 @printindex tp
 
-@c Print the tables of contents
-@summarycontents
-@contents
-@c That's all
-
 @bye
 
 
diff --git a/lispref/frames.texi b/lispref/frames.texi
index 10035b76f9f..13921c0b6fc 100644
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -1990,7 +1990,7 @@ quickly.
 @tindex display-planes
 This function returns the number of planes the display supports.
 This is typically the number of bits per pixel.
-For a tty display, it is log to base two of the number of colours supported.
+For a tty display, it is log to base two of the number of colors supported.
 @end defun
 
 @defun display-visual-class &optional display
diff --git a/lispref/text.texi b/lispref/text.texi
index 5a4d743ab75..3d668738250 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -3529,7 +3529,7 @@ buffer.
 graphical applications use @key{Mouse-1} for following links.  For
 compatibility, @key{Mouse-1} follows links in Emacs too, when you
 click on a link quickly without moving the mouse.  The user can
-customize this behaviour through the variable
+customize this behavior through the variable
 @code{mouse-1-click-follows-link}.
 
   To define text as a link at the Lisp level, you should bind the
diff --git a/man/ChangeLog b/man/ChangeLog
index 33541408e4b..1289ebb6a55 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-22  Miles Bader  <miles@gnu.org>
+
+        * display.texi (Faces): Change `vertical-divider' to `vertical-border'.
+
 2005-06-20  Miles Bader  <miles@gnu.org>
 
         * display.texi (Faces): Add `vertical-divider'.
diff --git a/man/cc-mode.texi b/man/cc-mode.texi
index 6ac86e986a9..b9113088d44 100644
--- a/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@ -2363,7 +2363,7 @@ returns a non-@code{nil} value succeeds and the evaluation stops.  If
 none of the list elements return a non-@code{nil} value, then an offset
 of 0 (zero) is used@footnote{There is however a variable
 @code{c-strict-syntax-p} that, when set to non-@code{nil}, will cause an
-error to be signalled in that case.  It's now considered obsolete since
+error to be signaled in that case.  It's now considered obsolete since
 it doesn't work well with some of the alignment functions that now
 returns @code{nil} instead of zero to be more usable in lists.  You
 should therefore leave @code{c-strict-syntax-p} set to @code{nil}.}.
diff --git a/man/display.texi b/man/display.texi
index 858a33f9ffe..473f1e65e4b 100644
--- a/man/display.texi
+++ b/man/display.texi
@@ -113,7 +113,7 @@ in that face affect mode lines in all windows.
 @item header-line
 Similar to @code{mode-line} for a window's header line.  Most modes
 don't use the header line, but the Info mode does.
-@item vertical-divider
+@item vertical-border
 This face is used for the vertical divider between windows on
 character terminals.  By default this face inherits from the
 @code{mode-line-inactive} face.
diff --git a/man/gnus.texi b/man/gnus.texi
index 7db03996984..dd736cd8162 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -16497,7 +16497,7 @@ Nnmail equivalent: @code{nnmail-split-fancy}.
 Set to non-@code{nil} to download entire articles during splitting.
 This is generally not required, and will slow things down
 considerably.  You may need it if you want to use an advanced
-splitting function that analyses the body to split the article.
+splitting function that analyzes the body to split the article.
 
 @end table
 
diff --git a/man/message.texi b/man/message.texi
index 01b3f9105d0..20a89debcc5 100644
--- a/man/message.texi
+++ b/man/message.texi
@@ -419,7 +419,7 @@ This is how you would do it.
 
 @vindex message-subscribed-address-file
 @item message-subscribed-address-file
-You might be one organised human freak and have a list of addresses of
+You might be one organized human freak and have a list of addresses of
 all subscribed mailing lists in a separate file!  Then you can just
 set this variable to the name of the file and life would be good.
 
diff --git a/man/ses.texi b/man/ses.texi
index 9b0137d2002..9667161f673 100644
--- a/man/ses.texi
+++ b/man/ses.texi
@@ -638,7 +638,7 @@ Special cell values:
 @item nil prints the same as "", but allows previous cell to spill over.
 @item '*skip* replaces nil when the previous cell actually does spill over;
 nothing is printed for it.
-@item '*error* indicates that the formula signalled an error instead of
+@item '*error* indicates that the formula signaled an error instead of
 producing a value: the print cell is filled with hash marks (#).
 @end itemize
 
diff --git a/man/tramp.texi b/man/tramp.texi
index 854dbba5919..5b406cb1662 100644
--- a/man/tramp.texi
+++ b/man/tramp.texi
@@ -99,7 +99,7 @@ If you want to read the info pages for @value{emacsothername}, you
 should read in @ref{Installation} how to create them.
 @end ifinfo
 @ifhtml
-If you're using the other Emacs flavour, you should read the
+If you're using the other Emacs flavor, you should read the
 @uref{@value{emacsotherfilename}, @value{emacsothername}} pages.
 @end ifhtml
 @end ifset
diff --git a/man/url.texi b/man/url.texi
index 0380b833ed8..cccd79a0e7e 100644
--- a/man/url.texi
+++ b/man/url.texi
@@ -850,22 +850,22 @@ initialized from the environment as above.
 The library provides a general gateway layer through which all
 networking passes.  It can both control access to the network and
 provide access through gateways in firewalls.  This may make direct
-connexions in some cases and pass through some sort of gateway in
+connections in some cases and pass through some sort of gateway in
 others.@footnote{Proxies (which only operate over HTTP) are
 implemented using this.}  The library's basic function responsible for
-making connexions is @code{url-open-stream}.
+making connections is @code{url-open-stream}.
 
 @defun url-open-stream name buffer host service
 @cindex opening a stream
 @cindex stream, opening
 Open a stream to @var{host}, possibly via a gateway.  The other
 arguments are as for @code{open-network-stream}.  This will not make a
-connexion if @code{url-gateway-unplugged} is non-@code{nil}.
+connection if @code{url-gateway-unplugged} is non-@code{nil}.
 @end defun
 
 @defvar url-gateway-local-host-regexp
 This is a regular expression that matches local hosts that do not
-require the use of a gateway.  If @code{nil}, all connexions are made
+require the use of a gateway.  If @code{nil}, all connections are made
 through the gateway.
 @end defvar
 
@@ -987,26 +987,26 @@ This the @samp{nslookup} program.  It is @code{"nslookup"} by default.
 @end defopt
 
 @menu
-* Suppressing network connexions::
+* Suppressing network connections::
 @end menu
 @c * Broken hostname resolution::
 
-@node Suppressing network connexions
-@subsection Suppressing Network Connexions
+@node Suppressing network connections
+@subsection Suppressing Network Connections
 
-@cindex network connexions, suppressing
-@cindex suppressing network connexions
+@cindex network connections, suppressing
+@cindex suppressing network connections
 @cindex bugs, HTML
 @cindex HTML `bugs'
 In some circumstances it is desirable to suppress making network
-connexions.  A typical case is when rendering HTML in a mail user
+connections.  A typical case is when rendering HTML in a mail user
 agent, when external URLs should not be activated, particularly to
 avoid `bugs' which `call home' by fetch single-pixel images and the
 like.  To arrange this, bind the following variable for the duration
 of such processing.
 
 @defvar url-gateway-unplugged
-If this variable is non-@code{nil} new network connexions are never
+If this variable is non-@code{nil} new network connections are never
 opened by the URL library.
 @end defvar
 
@@ -1152,7 +1152,7 @@ only if an affirmative answer is given.
 @end defopt
 @defopt url-gateway-method
 @c fixme: describe gatewaying
-A symbol specifying the type of gateway support to use fro connexions
+A symbol specifying the type of gateway support to use for connections
 from the local machine.  The supported methods are:
 
 @table @code
diff --git a/src/ChangeLog b/src/ChangeLog
index a6532912246..659f1066efc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2005-06-22  Miles Bader  <miles@gnu.org>
+
+        * xfaces.c (Qvertical_border): Renamed from `Qvertical_divider'.
+        (realize_basic_faces, syms_of_xfaces): Update references to it.
+        * dispextern.h (enum face_id): Rename `VERTICAL_DIVIDER_FACE_ID'
+        to `VERTICAL_BORDER_FACE_ID'.
+        * dispnew.c (build_frame_matrix_from_leaf_window): Update references.
+
+2005-06-21  Juri Linkov  <juri@jurta.org>
+
+        * dispextern.h: Add extern Qframe_set_background_mode.
+
+        * xfaces.c: Rename obsolete function Qframe_update_face_colors to
+        Qframe_set_background_mode.
+
+        * frame.c (Fmodify_frame_parameters):
+        Call frame-set-background-mode after changing the background color
+        on non-window non-dos branch.
+
+2005-06-21  Juanma Barranquero  <lekktu@gmail.com>
+
+        * fns.c (Fchar_table_range):
+        * process.c (Fmake_network_process): Fix spellings.
+
 2005-06-20  Kim F. Storm  <storm@cua.dk>
 
         * fns.c (Fsort): Doc fix.
diff --git a/src/dispextern.h b/src/dispextern.h
index 5219a6e924f..3fb4f76a61f 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1588,7 +1588,7 @@ enum face_id
   CURSOR_FACE_ID,
   MOUSE_FACE_ID,
   MENU_FACE_ID,
-  VERTICAL_DIVIDER_FACE_ID,
+  VERTICAL_BORDER_FACE_ID,
   BASIC_FACE_ID_SENTINEL
 };
 
@@ -2786,6 +2786,7 @@ int merge_faces P_ ((struct frame *, Lisp_Object, int, int));
 int compute_char_face P_ ((struct frame *, int, Lisp_Object));
 void free_all_realized_faces P_ ((Lisp_Object));
 extern Lisp_Object Qforeground_color, Qbackground_color;
+extern Lisp_Object Qframe_set_background_mode;
 extern char unspecified_fg[], unspecified_bg[];
 void free_realized_multibyte_face P_ ((struct frame *, int));
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 307e3c5f010..c5256142588 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -2716,7 +2716,7 @@ build_frame_matrix_from_leaf_window (frame_matrix, w)
 
           if (FAST_GLYPH_FACE (right_border_glyph) <= 0)
             right_border_glyph
-              = FAST_MAKE_GLYPH (right_border_glyph, VERTICAL_DIVIDER_FACE_ID);
+              = FAST_MAKE_GLYPH (right_border_glyph, VERTICAL_BORDER_FACE_ID);
         }
     }
   else
diff --git a/src/fns.c b/src/fns.c
index 792f94189d1..7365aa05e79 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2546,7 +2546,7 @@ RANGE should be nil (for the default value),
 a vector which identifies a character set or a row of a character set,
 a character set name, or a character code.
 If the characters in the specified range have different values,
-an error is signalled.
+an error is signaled.
 
 Note that this function doesn't check the parent of CHAR-TABLE.  */)
      (char_table, range)
diff --git a/src/frame.c b/src/frame.c
index 10318ba7110..62dba4d4d15 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2548,6 +2548,12 @@ enabled such bindings for that variable with `make-variable-frame-local'.  */)
           prop = parms[i];
           val = values[i];
           store_frame_param (f, prop, val);
+
+          /* Changing the background color might change the background
+             mode, so that we have to load new defface specs.
+             Call frame-set-background-mode to do that.  */
+          if (EQ (prop, Qbackground_color))
+            call1 (Qframe_set_background_mode, frame);
         }
     }
 
diff --git a/src/process.c b/src/process.c
index dd13138e273..46808674a0d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2552,7 +2552,7 @@ DEFUN ("make-network-process", Fmake_network_process, Smake_network_process,
 In Emacs, network connections are represented by process objects, so
 input and output work as for subprocesses and `delete-process' closes
 a network connection.  However, a network process has no process id,
-it cannot be signalled, and the status codes are different from normal
+it cannot be signaled, and the status codes are different from normal
 processes.
 
 Arguments are specified as keyword/argument pairs.  The following
diff --git a/src/window.c b/src/window.c
index 5bfff27f976..df284420ddf 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4182,7 +4182,7 @@ enlarge_window (window, delta, widthflag, preserve_before)
 
              The number of children n equals the number of resizable
              children of this window + 1 because we know window itself
-             is resizable (otherwise we would have signalled an error.  */
+             is resizable (otherwise we would have signalled an error).  */
 
           struct window *w = XWINDOW (window);
           Lisp_Object s;
diff --git a/src/xfaces.c b/src/xfaces.c
index 2494e1e1837..78dc41116e4 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -319,15 +319,15 @@ Lisp_Object Qunspecified;
 char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg";
 
 /* The name of the function to call when the background of the frame
-   has changed, frame_update_face_colors.  */
+   has changed, frame_set_background_mode.  */
 
-Lisp_Object Qframe_update_face_colors;
+Lisp_Object Qframe_set_background_mode;
 
 /* Names of basic faces.  */
 
 Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe;
 Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu;
-Lisp_Object Qmode_line_inactive, Qvertical_divider;
+Lisp_Object Qmode_line_inactive, Qvertical_border;
 extern Lisp_Object Qmode_line;
 
 /* The symbol `face-alias'.  A symbols having that property is an
@@ -4526,10 +4526,10 @@ update_face_from_frame_parameter (f, param, new_value)
       Lisp_Object frame;
 
       /* Changing the background color might change the background
-         mode, so that we have to load new defface specs.  Call
-         frame-update-face-colors to do that.  */
+         mode, so that we have to load new defface specs.
+         Call frame-set-background-mode to do that.  */
       XSETFRAME (frame, f);
-      call1 (Qframe_update_face_colors, frame);
+      call1 (Qframe_set_background_mode, frame);
 
       face = Qdefault;
       lface = lface_from_face_name (f, face, 1);
@@ -6899,7 +6899,7 @@ realize_basic_faces (f)
       realize_named_face (f, Qcursor, CURSOR_FACE_ID);
       realize_named_face (f, Qmouse, MOUSE_FACE_ID);
       realize_named_face (f, Qmenu, MENU_FACE_ID);
-      realize_named_face (f, Qvertical_divider, VERTICAL_DIVIDER_FACE_ID);
+      realize_named_face (f, Qvertical_border, VERTICAL_BORDER_FACE_ID);
 
       /* Reflect changes in the `menu' face in menu bars.  */
       if (FRAME_FACE_CACHE (f)->menu_face_changed_p)
@@ -7910,8 +7910,8 @@ syms_of_xfaces ()
   staticpro (&Qface_no_inherit);
   Qbitmap_spec_p = intern ("bitmap-spec-p");
   staticpro (&Qbitmap_spec_p);
-  Qframe_update_face_colors = intern ("frame-update-face-colors");
-  staticpro (&Qframe_update_face_colors);
+  Qframe_set_background_mode = intern ("frame-set-background-mode");
+  staticpro (&Qframe_set_background_mode);
 
   /* Lisp face attribute keywords.  */
   QCfamily = intern (":family");
@@ -8035,8 +8035,8 @@ syms_of_xfaces ()
   staticpro (&Qmouse);
   Qmode_line_inactive = intern ("mode-line-inactive");
   staticpro (&Qmode_line_inactive);
-  Qvertical_divider = intern ("vertical-divider");
-  staticpro (&Qvertical_divider);
+  Qvertical_border = intern ("vertical-border");
+  staticpro (&Qvertical_border);
   Qtty_color_desc = intern ("tty-color-desc");
   staticpro (&Qtty_color_desc);
   Qtty_color_standard_values = intern ("tty-color-standard-values");