Merged in changes from CVS head

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-5
   Add =cvs-sync-make-log script

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-7
   Use absolute tla-tools filenames in =cvs-sync-make-log

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-8
   Use proper arch-tag: syntax for lispintro/texinfo.tex

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


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

46 files changed, 620 insertions, 212 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56587ae22ed..97539c809ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,192 @@
+2003-12-30  Eli Zaretskii  <eliz@elta.co.il>
+
+        * mail/rmail.el (rmail-convert-to-babyl-format): Fix off-by-one
+        error in arguments to base64-decode-region.  Remove ^M characters
+        after decoding base64.
+
+2003-12-30  Simon Josefsson  <jas@extundo.com>
+
+        * textmodes/texinfo.el: Change maintainer to FSF.  Suggested by
+        karl@freefriends.org (Karl Berry), since the Texinfo Elisp files
+        have only been distributed with Emacs for some years.
+        (texinfo-mode-hook): Customize.
+
+2003-12-30  Eli Zaretskii  <eliz@elta.co.il>
+
+        * mail/rmail.el (rmail-convert-to-babyl-format): Make the code
+        cleaner (suggested by Richard Stallman).
+
+        * progmodes/gud.el (gud-tool-bar-map): Modify names of icon files
+        for gud-next, gud-nexti, gud-step and gud-stepi to prevent
+        file-name clashes on 8+3 DOS filesystems.
+
+        * toolbar/gud-next.pbm, toolbar/gud-next.xpm
+        * toolbar/gud-nexti.pbm, toolbar/gud-nexti.xpm
+        * toolbar/gud-step.pbm, toolbar/gud-step.xpm
+        * toolbar/gud-stepi.pbm, toolbar/gud-stepi.xpm: Renamed to
+        gud-n.*, gud-ni.*, gud-s.*, and gud-si.*, respectively, to avoid
+        file-name clashes on 8+3 filesystems.
+
+        * emacs-lisp/tcover-unsafep.el, emacs-lisp/tcover-ses.el: Renamed
+        from testcover-unsafep.el and testcover-ses.el to avoid file-name
+        clashes on 8+3 DOS filesystems.
+
+2003-12-29  Richard M. Stallman  <rms@gnu.org>
+
+        * textmodes/flyspell.el (mail-mode-flyspell-verify):
+        Search for header separator alone on a line, literally,
+        and search for it backward, not forward.
+        (flyspell-abbrev-table): Always use global-abbrev-table
+        if there is no local one.
+
+        * progmodes/sh-script.el (sh-get-indent-info):
+        Don't move point back if at bob.
+
+        * progmodes/antlr-mode.el (save-buffer-state-x): Use with-no-warnings.
+
+        * play/handwrite.el (handwrite): Make the handwrite credit message
+        a comment rather than an output command.
+
+        * obsolete/sc.el: Display message that this file is obsolete.
+
+        * net/ange-ftp.el (ange-ftp-start-process): Copy the environment.
+
+        * mail/rfc822.el (rfc822-address-start): Declare variable.
+        Renamed from address-start.  All uses changed.
+
+        * term.el (term-exec): Set up sentinel.
+        (term-sentinel): New function.
+        (term-handle-exit): New function.
+
+        * subr.el (assoc-ignore-case, assoc-ignore-representation): 
+        Use assoc-string, and mark them obsolete.
+        (delay-mode-hooks): Mark as permanent local.
+
+        * simple.el (sendmail-user-agent-compose): Use assoc-string.
+
+        * register.el (copy-rectangle-to-register): Doc fix.
+
+        * info.el (Info-insert-dir): Use assoc-string.
+
+        * info-look.el (info-lookup): Use assoc-string.
+
+        * frame.el (pop-up-frame-function): Use quote, not `function'.
+        (frame-notice-user-settings): Calculate ADJUSTED-TOP
+        copying with lists as coordinate values.
+
+        * font-lock.el (font-lock-after-change-function): Bind inhibit-quit.
+
+        * find-dired.el (kill-find): New command.
+        (find-dired): Make buffer read-only.
+        Set up a keymap with C-c C-k running kill-find.
+        (find-dired-filter, find-dired-sentinel): Bind inhibit-read-only.
+
+        * files.el (backup-buffer-copy): If MODES is nil, don't set modes.
+
+        * filecache.el (file-cache-ignore-case): New variable.
+        (file-cache-assoc-function): Var deleted.  Use assoc-string instead.
+
+        * comint.el (comint-arguments): Set COUNT after ARGS is complete.
+        (comint-dynamic-complete-as-filename): Rename local vars.
+        (comint-dynamic-list-filename-completions): Likewise.
+
+        * comint.el (comint-dynamic-list-completions-config): New var.
+        (comint-dynamic-list-completions): Handle both SPC and TAB right.
+
+        * comint.el (comint-file-name-chars): Add [].
+        (comint-word): Use skip-chars-backward, not search.
+
+        * shell.el (shell-file-name-chars): Add [].
+
+        * shell.el (shell-dynamic-complete-as-command): Rename local vars.
+
+        * bookmark.el (bookmark-get-bookmark): Use assoc-string.
+
+        * generic.el (define-generic-mode): Doc fix.
+
+2003-12-29  Eli Zaretskii  <eliz@elta.co.il>
+
+        * files.el (kill-some-buffers): Doc fix.
+
+2003-12-29  David Herring <sdh6@ra.msstate.edu>  (tiny change)
+
+        * comint.el (comint-watch-for-password-prompt): Pass `string' as
+        arg to send-invisible
+        (send-invisible): Doc fix.  The argument is now a prompt, not the
+        string to send.
+        (comint-read-noecho): Doc fix.
+
+2003-12-29  Michael R. Wolf  <MichaelRWolf@att.net>  (tiny change)
+
+        * net/ange-ftp.el (ange-ftp-name-format): Allow USER to contain
+        "@", as required by some ISP hosting service.  Fix defcustom
+        argument syntax errors that prevented use of customization.
+
+2003-12-29  Eli Zaretskii  <eliz@elta.co.il>
+
+        * xml.el (xml-get-attribute-or-nil): Doc fix.
+
+2003-12-29  Peter 'Luna' Runestig <peter@runestig.com>
+
+        * net/zone-mode.el (zone-mode): Use write-file-functions, not
+        write-file-hooks.
+
+2003-12-29  Eric Hanchrow <offby1@blarg.net>  (tiny change)
+
+        * autorevert.el (auto-revert-interval): Doc fix.
+
+2003-12-29  Mark A. Hershberger <mah@everybody.org>
+
+        * xml.el (xml-get-attribute-or-nil): New function, like
+        xml-get-attribute, but returns nil if the attribute was not found.
+        (xml-get-attribute): Converted to defsubst, uses
+        xml-get-attribute-or-nil.
+
+2003-12-29  Eli Zaretskii  <eliz@elta.co.il>
+
+        * emacs-lisp/easymenu.el (easy-menu-define): Doc fix.
+
+2003-12-29  Alex Schroeder <alex@emacswiki.org>  (tiny change)
+
+        * custom.el (custom-declare-theme): Use `value' when putting
+        properties on `theme'.
+
+2003-12-29  Takaaki Ota <Takaaki.Ota@am.sony.com>
+
+        * subr.el (insert-for-yank): Call insert-for-yank-1 repetitively
+        for each yank-handler segment.
+        (insert-for-yank-1): New function, with the body of the previous
+        insert-for-yank.
+
+        * textmodes/table.el (table-yank-handler): New defcustom.
+        (table--put-cell-indicator-property): Put yank-handler property
+        that indicates the yank handler for the table cell.
+
+2003-12-29  Jesper Harder <harder@ifa.au.dk>  (tiny change)
+
+        * generic-x.el (etc-modules-conf-generic-mode): A more complete
+        set of keywords.
+
+2003-12-29  Eli Zaretskii  <eliz@elta.co.il>
+
+        * international/mule-cmds.el (reset-language-environment)
+        (set-language-environment): Don't invoke fontset-related functions
+        if fontset-list is not fboundp.
+
+2003-12-29  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule-cmds.el (reset-language-environment): Call
+        set-overriding-fontspec-internal with nil.
+        (set-language-environment): Call set-overriding-fontspec-internal
+        if the language environment specify `overriding-fontspec'.
+        (language-info-alist): Doc added.
+
+        * language/cyrillic.el (ccl-encode-koi8-font): Make it work for
+        characters of mule-unicode-0100-24ff.
+        (ccl-encode-windows-1251-font): New CCL program.
+        ("Bulgarian"): Specify overriding-fontspec.
+        ("Belarusian"): Likewise.
+
 2003-12-28  Sam Steingold  <sds@gnu.org>
 
         * net/ange-ftp.el (ange-ftp-file-attributes): Add new optional
@@ -46,6 +235,14 @@
 
         * ffap.el (ffap-read-file-or-url): Revert previous change.
 
+2003-12-25  Robert J. Chassell <bob@rattlesnake.com>
+
+        * textmodes/texnfo-upd.el (texinfo-multi-file-update): Create a
+        new list of included files called `files-with-node-lines', that
+        only have node lines.  This way @include commands can include any
+        file, such as version and update files without node lines, not
+        just files that are chapters.
+
 2003-12-25  Andreas Schwab  <schwab@suse.de>
 
         * jka-compr.el (jka-compr-insert-file-contents): Avoid error when
@@ -542,10 +739,18 @@
 
 2003-11-01  Mark A. Hershberger  <mah@everybody.org>
 
-        * xml.el: Allow comments following the top-level element.
-        Separate out namespace parsing into special functions.
-        Change namespace parsing to return ('ns-uri . "local-name")
-        instead of '{ns-uri}local-name.
+        * xml.el (xml-parse-region): Allow comments to appear after the
+        topmost element has closed.
+        (xml-ns-parse-ns-attrs, xml-ns-expand-el)
+        (xml-ns-expand-attr): New functions to do namespace handling.   
+        (xml-intern-attrlist): Back-compatible handling of attribute
+        names.
+        (xml-parse-tag): Move namespace handling to seperate functions.
+        Now produces elements in the form ((:ns . "element") (attr-list)
+        children) instead of ('ns:element (attr-list) children).
+        (xml-parse-attlist): Fix attribute parsing.
+        (xml-parse-dtd): Change parsing so that it produces strings
+        instead of interned symbols.
 
 2003-11-01  era@iki.fi  <era@iki.fi>  (tiny change)
 
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 9f254b54d69..7ac7a402c3a 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1995, 1997, 1998, 2003 Free Software Foundation, Inc.
 
-;; Author: Morten Welinder <terra@diku.dk>
+;; Author: Morten Welinder <terra@gnu.org>
 ;; Keywords: archives msdog editing major-mode
 ;; Favourite-brand-of-beer: None, I hate beer.
 
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index f366d5c7547..fac91332a5e 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -97,7 +97,10 @@ Never set this variable directly, use the command `auto-revert-mode' instead.")
 (put 'auto-revert-mode 'permanent-local t)
 
 (defcustom auto-revert-interval 5
-  "Time, in seconds, between Auto-Revert Mode file checks."
+  "Time, in seconds, between Auto-Revert Mode file checks.
+Setting this variable has no effect on buffers that are already in
+auto-revert-mode; it only affects buffers that are put into
+auto-revert-mode afterwards."
   :group 'auto-revert
   :type 'integer)
 
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 762de7323a2..67ae2c84865 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -335,10 +335,7 @@ through a file easier.")
   "Return the full entry for BOOKMARK in bookmark-alist.
 If BOOKMARK is not a string, return nil."
   (when (stringp bookmark)
-    (apply (if bookmark-completion-ignore-case
-               #'assoc-ignore-case
-             #'assoc)
-           (list bookmark bookmark-alist))))
+    (assoc-string bookmark bookmark-alist bookmark-completion-ignore-case)))
 
 
 (defun bookmark-get-bookmark-record (bookmark)
diff --git a/lisp/comint.el b/lisp/comint.el
index 5509e71d984..6bc40a01bd3 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1344,16 +1344,16 @@ Argument 0 is the command name."
             ;; Put the previous arg, if there was one, onto ARGS.
             (setq str (substring string beg pos)
                   args (if quotes (cons str args)
-                         (nconc (comint-delim-arg str) args))
-                  count (1+ count)))
+                         (nconc (comint-delim-arg str) args))))
+        (setq count (length args))
         (setq quotes (match-beginning 1))
         (setq beg (match-beginning 0))
         (setq pos (match-end 0))))
     (if beg
         (setq str (substring string beg pos)
               args (if quotes (cons str args)
-                     (nconc (comint-delim-arg str) args))
-              count (1+ count)))
+                     (nconc (comint-delim-arg str) args))))
+    (setq count (length args))
     (let ((n (or nth (1- count)))
           (m (if mth (1- (- count mth)) 0)))
       (mapconcat
@@ -1901,7 +1901,8 @@ RET, LFD, or ESC.  DEL or C-h rubs out.  C-u kills line.  C-g aborts (if
 filter and C-g is pressed, this function returns nil rather than a string).
 
 Note that the keystrokes comprising the text can still be recovered
-\(temporarily) with \\[view-lossage].  Some people find this worrysome.
+\(temporarily) with \\[view-lossage].  Some people find this worrysome (see,
+however, `clear-this-command-keys').
 Once the caller uses the password, it can erase the password
 by doing (clear-string STRING)."
   (let ((ans "")
@@ -1948,24 +1949,22 @@ by doing (clear-string STRING)."
       (message "")
       ans)))
 
-(defun send-invisible (str)
+(defun send-invisible (&optional prompt)
   "Read a string without echoing.
 Then send it to the process running in the current buffer.
 The string is sent using `comint-input-sender'.
 Security bug: your string can still be temporarily recovered with
-\\[view-lossage]."
+\\[view-lossage]; `clear-this-command-keys' can fix that."
   (interactive "P")                     ; Defeat snooping via C-x ESC ESC
   (let ((proc (get-buffer-process (current-buffer))))
-    (cond ((not proc)
-           (error "Current buffer has no process"))
-          ((stringp str)
-           (comint-snapshot-last-prompt)
-           (funcall comint-input-sender proc str))
-          (t
-           (let ((str (comint-read-noecho "Non-echoed text: " t)))
-             (if (stringp str)
-                 (send-invisible str)
-               (message "Warning: text will be echoed")))))))
+    (if proc
+        (let ((str (comint-read-noecho (or prompt "Non-echoed text: ") t)))
+          (if (stringp str)
+              (progn
+                (comint-snapshot-last-prompt)
+                (funcall comint-input-sender proc str))
+            (message "Warning: text will be echoed")))
+      (error "Current buffer has no process"))))
 
 (defun comint-watch-for-password-prompt (string)
   "Prompt in the minibuffer for password and send without echoing.
@@ -1977,8 +1976,7 @@ This function could be in the list `comint-output-filter-functions'."
   (when (string-match comint-password-prompt-regexp string)
     (when (string-match "^[ \n\r\t\v\f\b\a]+" string)
       (setq string (replace-match "" t t string)))
-    (let ((pw (comint-read-noecho string t)))
-      (send-invisible pw))))
+    (send-invisible string)))
 
 ;; Low-level process communication
 
@@ -2084,7 +2082,7 @@ between the process-mark and point."
   (comint-skip-input)
   (interrupt-process nil comint-ptyp)
 ;;  (process-send-string nil "\n")
-  )
+)
 
 (defun comint-kill-subjob ()
   "Send kill signal to the current subjob.
@@ -2553,7 +2551,7 @@ directory tracking functions.")
 (defvar comint-file-name-chars
   (if (memq system-type '(ms-dos windows-nt cygwin))
       "~/A-Za-z0-9_^$!#%&{}@`'.,:()-"
-    "~/A-Za-z0-9+@:_.$#%,={}-")
+    "[]~/A-Za-z0-9+@:_.$#%,={}-")
   "String of characters valid in a file name.
 Note that all non-ASCII characters are considered valid in a file name
 regardless of what this variable says.
@@ -2579,15 +2577,19 @@ Word constituents are considered to be those in WORD-CHARS, which is like the
 inside of a \"[...]\" (see `skip-chars-forward'),
 plus all non-ASCII characters."
   (save-excursion
-    (let ((non-word-chars (concat "[^\\\\" word-chars "]")) (here (point)))
-      (while (and (re-search-backward non-word-chars nil 'move)
-                  ;;(memq (char-after (point)) shell-file-name-quote-list)
-                  (or (>= (following-char) 128)
-                      (eq (preceding-char) ?\\)))
-        (backward-char 1))
-      ;; Don't go forward over a word-char (this can happen if we're at bob).
-      (when (or (not (bobp)) (looking-at non-word-chars))
-        (forward-char 1))
+    (let ((here (point))
+          giveup)
+      (while (not giveup)
+        (let ((startpoint (point)))
+          (skip-chars-backward (concat "\\\\" word-chars))
+          (if (and (> (- (point) 2) (point-min))
+                   (= (char-after (- (point) 2)) ?\\))
+              (forward-char -2))
+          (if (and (> (- (point) 1) (point-min))
+                   (>= (char-after (- (point) 1)) 128))
+              (forward-char -1))
+          (if (= (point) startpoint)
+              (setq giveup t))))
       ;; Set match-data to match the entire string.
       (when (< (point) here)
         (set-match-data (list (point) here))
@@ -2699,10 +2701,10 @@ See `comint-dynamic-complete-filename'.  Returns t if successful."
                            (t
                             (cdr comint-completion-addsuffix))))
          (filename (or (comint-match-partial-filename) ""))
-         (pathdir (file-name-directory filename))
-         (pathnondir (file-name-nondirectory filename))
-         (directory (if pathdir (comint-directory pathdir) default-directory))
-         (completion (file-name-completion pathnondir directory)))
+         (filedir (file-name-directory filename))
+         (filenondir (file-name-nondirectory filename))
+         (directory (if filedir (comint-directory filedir) default-directory))
+         (completion (file-name-completion filenondir directory)))
     (cond ((null completion)
            (message "No completions of %s" filename)
            (setq success nil))
@@ -2716,21 +2718,21 @@ See `comint-dynamic-complete-filename'.  Returns t if successful."
            (let ((file (concat (file-name-as-directory directory) completion)))
              (insert (comint-quote-filename
                       (substring (directory-file-name completion)
-                                 (length pathnondir))))
+                                 (length filenondir))))
              (cond ((symbolp (file-name-completion completion directory))
                     ;; We inserted a unique completion.
                     (insert (if (file-directory-p file) dirsuffix filesuffix))
                     (unless minibuffer-p
                       (message "Completed")))
                    ((and comint-completion-recexact comint-completion-addsuffix
-                         (string-equal pathnondir completion)
+                         (string-equal filenondir completion)
                          (file-exists-p file))
                     ;; It's not unique, but user wants shortest match.
                     (insert (if (file-directory-p file) dirsuffix filesuffix))
                     (unless minibuffer-p
                       (message "Completed shortest")))
                    ((or comint-completion-autolist
-                        (string-equal pathnondir completion))
+                        (string-equal filenondir completion))
                     ;; It's not unique, list possible completions.
                     (comint-dynamic-list-filename-completions))
                    (t
@@ -2814,10 +2816,10 @@ See also `comint-dynamic-complete-filename'."
          ;; but subsequent changes may have made this unnecessary.  sm.
          ;;(file-name-handler-alist nil)
          (filename (or (comint-match-partial-filename) ""))
-         (pathdir (file-name-directory filename))
-         (pathnondir (file-name-nondirectory filename))
-         (directory (if pathdir (comint-directory pathdir) default-directory))
-         (completions (file-name-all-completions pathnondir directory)))
+         (filedir (file-name-directory filename))
+         (filenondir (file-name-nondirectory filename))
+         (directory (if filedir (comint-directory filedir) default-directory))
+         (completions (file-name-all-completions filenondir directory)))
     (if (not completions)
         (message "No completions of %s" filename)
       (comint-dynamic-list-completions
@@ -2829,6 +2831,8 @@ See also `comint-dynamic-complete-filename'."
 ;; command is repeatedly used without the set of completions changing.
 (defvar comint-displayed-dynamic-completions nil)
 
+(defvar comint-dynamic-list-completions-config nil)
+
 (defun comint-dynamic-list-completions (completions)
   "List in help buffer sorted COMPLETIONS.
 Typing SPC flushes the help buffer."
@@ -2858,30 +2862,35 @@ Typing SPC flushes the help buffer."
               (select-window window)
               (scroll-up))))
 
-      (let ((conf (current-window-configuration)))
-        (with-output-to-temp-buffer "*Completions*"
-          (display-completion-list completions))
-        (message "Type space to flush; repeat completion command to scroll")
-        (let (key first)
-          (if (save-excursion
-                (set-buffer (get-buffer "*Completions*"))
-                (set (make-local-variable
-                      'comint-displayed-dynamic-completions)
-                     completions)
-                (setq key (read-key-sequence nil)
-                      first (aref key 0))
-                (and (consp first) (consp (event-start first))
-                     (eq (window-buffer (posn-window (event-start first)))
-                         (get-buffer "*Completions*"))
-                     (eq (key-binding key) 'mouse-choose-completion)))
-              ;; If the user does mouse-choose-completion with the mouse,
-              ;; execute the command, then delete the completion window.
-              (progn
-                (mouse-choose-completion first)
-                (set-window-configuration conf))
-            (if (eq first ?\ )
-                (set-window-configuration conf)
-              (setq unread-command-events (listify-key-sequence key)))))))))
+      ;; Display a completion list for the first time.
+      (setq comint-dynamic-list-completions-config
+            (current-window-configuration))
+      (with-output-to-temp-buffer "*Completions*"
+        (display-completion-list completions))
+      (message "Type space to flush; repeat completion command to scroll"))
+
+    ;; Read the next key, to process SPC.
+    (let (key first)
+      (if (save-excursion
+            (set-buffer (get-buffer "*Completions*"))
+            (set (make-local-variable
+                  'comint-displayed-dynamic-completions)
+                 completions)
+            (setq key (read-key-sequence nil)
+                  first (aref key 0))
+            (and (consp first) (consp (event-start first))
+                 (eq (window-buffer (posn-window (event-start first)))
+                     (get-buffer "*Completions*"))
+                 (eq (key-binding key) 'mouse-choose-completion)))
+          ;; If the user does mouse-choose-completion with the mouse,
+          ;; execute the command, then delete the completion window.
+          (progn
+            (mouse-choose-completion first)
+            (set-window-configuration comint-dynamic-list-completions-config))
+        (unless (eq first ?\ )
+          (setq unread-command-events (listify-key-sequence key)))
+        (unless (eq first ?\t)
+          (set-window-configuration comint-dynamic-list-completions-config))))))
 
 
 (defun comint-get-next-from-history ()
diff --git a/lisp/custom.el b/lisp/custom.el
index aa4d0d8353f..ea0567d3109 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -558,17 +558,17 @@ from THEME by `custom-make-theme-feature'."
           (error "Keyword %s is missing an argument" keyword))
         (setq args (cdr args))
         (cond ((eq keyword :short-description)
-               (put theme 'theme-short-description short-description))
+               (put theme 'theme-short-description value))
               ((eq keyword :immediate)
-               (put theme 'theme-immediate immediate))
+               (put theme 'theme-immediate value))
               ((eq keyword :variable-set-string)
-               (put theme 'theme-variable-set-string variable-set-string))
+               (put theme 'theme-variable-set-string value))
               ((eq keyword :variable-reset-string)
-               (put theme 'theme-variable-reset-string variable-reset-string))
+               (put theme 'theme-variable-reset-string value))
               ((eq keyword :face-set-string)
-               (put theme 'theme-face-set-string face-set-string))
+               (put theme 'theme-face-set-string value))
               ((eq keyword :face-reset-string)
-               (put theme 'theme-face-reset-string face-reset-string)))))))
+               (put theme 'theme-face-reset-string value)))))))
 
 (defmacro deftheme (theme &optional doc &rest args)
   "Declare custom theme THEME.
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index a5b35a7d018..5a2a33575e7 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -59,8 +59,8 @@ It may be followed by the following keyword argument pairs
 
    :filter FUNCTION
 
-FUNCTION is a function with one argument, the menu.  It returns the actual
-menu displayed.
+FUNCTION is a function with one argument, the rest of menu items.
+It returns the remaining items of the displayed menu.
 
    :visible INCLUDE
 
diff --git a/lisp/emacs-lisp/testcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index 48ec9fa64da..48ec9fa64da 100644
--- a/lisp/emacs-lisp/testcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
diff --git a/lisp/emacs-lisp/testcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el
index 4359209b4d4..4359209b4d4 100644
--- a/lisp/emacs-lisp/testcover-unsafep.el
+++ b/lisp/emacs-lisp/tcover-unsafep.el
diff --git a/lisp/filecache.el b/lisp/filecache.el
index d315a3b1c8b..71b67af355f 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -212,13 +212,10 @@ Defaults to the value of `case-fold-search'."
   :group 'file-cache
   )
 
-(defcustom file-cache-assoc-function
-  (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
-      'assoc-ignore-case
-    'assoc)
-  "Function to use to check completions in the file cache.
-Defaults to `assoc-ignore-case' on DOS and Windows, and `assoc' on
-other systems."
+(defcustom file-cache-ignore-case
+  (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
+  "Non-nil means ignore case when checking completions in the file cache.
+Defaults to nil on DOS and Windows, and t on other systems."
   :type 'sexp
   :group 'file-cache
   )
@@ -301,8 +298,9 @@ in each directory, not to the directory list itself."
       (message "File %s does not exist" file)
     (let* ((file-name (file-name-nondirectory file))
            (dir-name  (file-name-directory    file))
-           (the-entry (funcall file-cache-assoc-function
-                               file-name file-cache-alist))
+           (the-entry (assoc-string
+                       file-name file-cache-alist
+                       file-cache-ignore-case))
            )
       ;; Does the entry exist already?
       (if the-entry
@@ -402,7 +400,7 @@ or the optional REGEXP argument."
   (interactive
    (list (completing-read "Delete file from cache: " file-cache-alist)))
   (setq file-cache-alist
-        (delq (funcall file-cache-assoc-function file file-cache-alist)
+        (delq (assoc-string file file-cache-alist file-cache-ignore-case)
               file-cache-alist)))
 
 (defun file-cache-delete-file-list (file-list)
@@ -458,8 +456,9 @@ or the optional REGEXP argument."
 
 ;; Returns the name of a directory for a file in the cache
 (defun file-cache-directory-name  (file)
-  (let* ((directory-list (cdr (funcall file-cache-assoc-function
-                                       file file-cache-alist)))
+  (let* ((directory-list (cdr (assoc-string
+                               file file-cache-alist
+                               file-cache-ignore-case)))
          (len            (length directory-list))
          (directory)
          (num)
@@ -556,7 +555,8 @@ the name is considered already unique; only the second substitution
       ;; If we've already inserted a unique string, see if the user
       ;; wants to use that one
       (if (and (string= string completion-string)
-               (funcall file-cache-assoc-function string file-cache-alist))
+               (assoc-string string file-cache-alist
+                             file-cache-ignore-case))
           (if (and (eq last-command this-command)
                    (string= file-cache-last-completion completion-string))
               (progn
@@ -725,7 +725,8 @@ match REGEXP."
   "Debugging function."
   (interactive
    (list (completing-read "File Cache: " file-cache-alist)))
-  (message "%s" (funcall file-cache-assoc-function file file-cache-alist))
+  (message "%s" (assoc-string file file-cache-alist
+                              file-cache-ignore-case))
   )
 
 (defun file-cache-display  ()
diff --git a/lisp/files.el b/lisp/files.el
index 1dc6e5454df..4983b1287e8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2552,7 +2552,8 @@ BACKUPNAME is the backup file name, which is the old file renamed."
               (not (file-writable-p to-name)))
          (delete-file to-name))
      (copy-file from-name to-name t t)))
-  (set-file-modes to-name (logand modes #o1777)))
+  (and modes
+       (set-file-modes to-name (logand modes #o1777))))
 
 (defun file-name-sans-versions (name &optional keep-backup-version)
   "Return file NAME sans backup versions or strings.
@@ -3727,8 +3728,9 @@ This command is used in the special Dired buffer created by
       (kill-buffer buffer))))
 
 (defun kill-some-buffers (&optional list)
-  "For each buffer in LIST, ask whether to kill it.
-LIST defaults to all existing live buffers."
+  "Kill some buffers.  Asks the user whether to kill each one of them.
+Non-interactively, if optional argument LIST is non-`nil', it
+specifies the list of buffers to kill, asking for approval for each one."
   (interactive)
   (if (null list)
       (setq list (buffer-list)))
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index b1051acf7fd..9407afc3862 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -123,6 +123,10 @@ as the final argument."
                        (car find-ls-option)))
     ;; The next statement will bomb in classic dired (no optional arg allowed)
     (dired-mode dir (cdr find-ls-option))
+    (let ((map (make-sparse-keymap)))
+      (set-keymap-parent map (current-local-map))
+      (define-key map "\C-c\C-k" 'kill-find)
+      (use-local-map map))
     (make-local-variable 'dired-sort-inhibit)
     (setq dired-sort-inhibit t)
     (set (make-local-variable 'revert-buffer-function)
@@ -144,6 +148,7 @@ as the final argument."
     ;; Make second line a ``find'' line in analogy to the ``total'' or
     ;; ``wildcard'' line.
     (insert "  " args "\n")
+    (setq buffer-read-only t)
     ;; Start the find process.
     (let ((proc (start-process-shell-command find-dired-find-program (current-buffer) args)))
       (set-process-filter proc (function find-dired-filter))
@@ -152,6 +157,16 @@ as the final argument."
       (move-marker (process-mark proc) 1 (current-buffer)))
     (setq mode-line-process '(":%s"))))
 
+(defun kill-find ()
+  "Kill the `find' process running in the current buffer."
+  (interactive)
+  (let ((find (get-buffer-process (current-buffer))))
+    (and find (eq (process-status find) 'run)
+         (eq (process-filter find) (function find-dired-filter))
+         (condition-case nil
+             (delete-process find)
+           (error nil)))))
+
 ;;;###autoload
 (defun find-name-dired (dir pattern)
   "Search DIR recursively for files matching the globbing pattern PATTERN,
@@ -192,7 +207,8 @@ Thus ARG can also contain additional grep options."
 
 (defun find-dired-filter (proc string)
   ;; Filter for \\[find-dired] processes.
-  (let ((buf (process-buffer proc)))
+  (let ((buf (process-buffer proc))
+        (inhibit-read-only t))
     (if (buffer-name buf)               ; not killed?
         (save-excursion
           (set-buffer buf)
@@ -229,7 +245,8 @@ Thus ARG can also contain additional grep options."
 
 (defun find-dired-sentinel (proc state)
   ;; Sentinel for \\[find-dired] processes.
-  (let ((buf (process-buffer proc)))
+  (let ((buf (process-buffer proc))
+        (inhibit-read-only t))
     (if (buffer-name buf)
         (save-excursion
           (set-buffer buf)
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 1be0b724590..b76c818a517 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1031,7 +1031,8 @@ what properties to clear before refontifying a region.")
 
 ;; Called when any modification is made to buffer text.
 (defun font-lock-after-change-function (beg end old-len)
-  (let ((inhibit-point-motion-hooks t))
+  (let ((inhibit-point-motion-hooks t)
+        (inhibit-quit t))
     (save-excursion
       (save-match-data
         ;; Rescan between start of lines enclosing the region.
diff --git a/lisp/frame.el b/lisp/frame.el
index 1dbf8321bf3..96c9b596289 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -85,8 +85,9 @@ for pop-up frames."
   :group 'frames)
 
 (setq pop-up-frame-function
-      (function (lambda ()
-                  (make-frame pop-up-frame-alist))))
+      ;; Using `function' here caused some sort of problem.
+      '(lambda ()
+         (make-frame pop-up-frame-alist)))
 
 (defcustom special-display-frame-alist
   '((height . 14) (width . 80) (unsplittable . t))
@@ -335,10 +336,22 @@ React to settings of `default-frame-alist', `initial-frame-alist' there."
                                            frame-initial-geometry-arguments)))
                    (top (frame-parameter frame-initial-frame 'top)))
               (when (and (consp initial-top) (eq '- (car initial-top)))
-                (setq newparms
-                      (append newparms
-                              `((top . ,(+ top (* lines char-height))))
-                              nil)))
+                (let ((adjusted-top
+                       (cond ((and (consp top)
+                                   (eq '+ (car top)))
+                              (list '+
+                                    (+ (cadr top)
+                                       (* lines char-height))))
+                             ((and (consp top)
+                                   (eq '- (car top)))
+                              (list '-
+                                    (- (cadr top)
+                                       (* lines char-height))))
+                             (t (+ top (* lines char-height))))))
+                  (setq newparms
+                        (append newparms
+                                `((top . ,adjusted-top))
+                                nil))))
               (modify-frame-parameters frame-initial-frame newparms)
               (tool-bar-mode -1)))))
 
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index fcc84a4a1d6..88703af799f 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1868,7 +1868,38 @@ you must reload generic-x to enable the specified modes."
   ;;List of comment characters
   (list ?#)
   ;;List of keywords
-  (list "alias" "pre-install" "post-install" "options" "probeall")
+  (list
+   "above"
+   "alias"
+   "below"
+   "define"
+   "depfile"
+   "else"
+   "elseif"
+   "endif"
+   "if"
+   "include"
+   "insmod_opt"
+   "install"
+   "keep"
+   "options"
+   "path"
+   "generic_stringfile"
+   "pcimapfile"
+   "isapnpmapfile"
+   "usbmapfile"
+   "parportmapfile"
+   "ieee1394mapfile"
+   "pnpbiosmapfile"
+   "probe"
+   "probeall"
+   "prune"
+   "post-install"
+   "post-remove"
+   "pre-install"
+   "pre-remove"
+   "remove"
+   "persistdir")
   ;;List of additional font-lock-expressions
   nil
   ;;List of additional automode-alist expressions
diff --git a/lisp/generic.el b/lisp/generic.el
index 8f13dc375e7..bd6fa0608aa 100644
--- a/lisp/generic.el
+++ b/lisp/generic.el
@@ -54,7 +54,7 @@
 ;;
 ;; * Additional expressions to font-lock.  This should be a list of
 ;;   expressions, each of which should be of the same form
-;;   as those in `font-lock-defaults-alist'.
+;;   as those in `font-lock-keywords'.
 ;;
 ;; * List of regular expressions to be placed in auto-mode-alist.
 ;;
@@ -206,7 +206,7 @@ KEYWORD-LIST is a list of keywords to highlight with `font-lock-keyword-face'.
 Each keyword should be a string.
 
 FONT-LOCK-LIST is a list of additional expressions to highlight. Each entry
-in the list should have the same form as an entry in `font-lock-defaults-alist'
+in the list should have the same form as an entry in `font-lock-keywords'.
 
 AUTO-MODE-LIST is a list of regular expressions to add to `auto-mode-alist'.
 These regexps are added to `auto-mode-alist' as soon as `define-generic-mode'
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 21f265199dd..a184567ea9c 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -321,7 +321,7 @@ If optional argument QUERY is non-nil, query for the help mode."
   (let* ((completions (info-lookup->completions topic mode))
          (ignore-case (info-lookup->ignore-case topic mode))
          (entry (or (assoc (if ignore-case (downcase item) item) completions)
-                    (assoc-ignore-case item completions)
+                    (assoc-string item completions t)
                     (error "Not documented as a %s: %s" topic (or item ""))))
          (modes (info-lookup->all-modes topic mode))
          (window (selected-window))
diff --git a/lisp/info.el b/lisp/info.el
index 9616dbb1feb..3438320beb4 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -918,7 +918,7 @@ a case-insensitive match is tried."
                 (beginning-of-line)
                 (setq end (point))
                 (push (list nodename other beg end) this-buffer-nodes)))
-            (if (assoc-ignore-case "top" this-buffer-nodes)
+            (if (assoc-string "top" this-buffer-nodes t)
                 (setq nodes (nconc this-buffer-nodes nodes))
               (setq problems t)
               (message "No `top' node in %s" Info-dir-file-name)))))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 5e957d6b8ab..dca8b80744e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1006,6 +1006,12 @@ Meaningful values for KEY include
                         environment.
   features           value is a list of features requested in this
                         language environment.
+  ctext-non-standard-encodings
+                     value is a list of non-standard encoding
+                     names used in extended segments of CTEXT.
+                     See the variable
+                     `ctext-non-standard-encodings' for more
+                     detail.
 
 The following keys take effect only when multibyte characters are
 globally disabled, i.e. the value of `default-enable-multibyte-characters'
@@ -1685,7 +1691,12 @@ The default status is as follows:
   ;; (set-keyboard-coding-system-internal nil)
 
   (setq nonascii-translation-table nil
-        nonascii-insert-offset 0))
+        nonascii-insert-offset 0)
+
+  ;; Don't invoke fontset-related functions if fontsets aren't
+  ;; supported in this build of Emacs.
+  (and (fboundp 'fontset-list)
+       (set-overriding-fontspec-internal nil)))
 
 (reset-language-environment)
 
@@ -1791,6 +1802,15 @@ specifies the character set for the major languages of Western Europe."
     (while required-features
       (require (car required-features))
       (setq required-features (cdr required-features))))
+
+  ;; Don't invoke fontset-related functions if fontsets aren't
+  ;; supported in this build of Emacs.
+  (when (fboundp 'fontset-list)
+    (let ((overriding-fontspec (get-language-info language-name 
+                                                  'overriding-fontspec)))
+      (if overriding-fontspec
+          (set-overriding-fontspec-internal overriding-fontspec))))
+
   (let ((func (get-language-info language-name 'setup-function)))
     (if (functionp func)
         (funcall func)))
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 19ff671834b..60ebf52fe35 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -204,6 +204,9 @@ This works whether or not the table is Unicode-based or
 ;; The table is set up later to encode both Unicode and 8859-5.
 (define-ccl-program ccl-encode-koi8-font
   `(0
+    (if (r2 >= 0)
+        ((r1 <<= 7)
+         (r1 += r2)))
     (translate-character cyrillic-koi8-r-encode-table r0 r1))
   "CCL program to encode Cyrillic chars to KOI font.")
 
@@ -472,10 +475,25 @@ Support for Russian using koi8-r and the russian-computer input method.")
       (setcdr slot (cdr elt))
     (push elt ctext-non-standard-encodings-alist)))
 
+(define-ccl-program ccl-encode-windows-1251-font
+  '(0
+    ((r1 <<= 7)
+     (r1 += r2)
+     (translate-character encode-windows-1251 r0 r1)
+     )))
+
+(add-to-list 'font-ccl-encoder-alist
+             '("microsoft-cp1251" . ccl-encode-windows-1251-font))
+
 (set-language-info-alist
  "Bulgarian" `((coding-system windows-1251)
                (coding-priority windows-1251)
                (ctext-non-standard-encodings "microsoft-cp1251")
+               (overriding-fontspec
+                (,(get 'encode-windows-1251 'translation-table)
+                 . (nil . "microsoft-cp1251"))
+                (,(get 'cyrillic-koi8-r-encode-table 'translation-table)
+                 . (nil . "koi8-r")))
                (nonascii-translation
                 . ,(get 'decode-windows-1251 'translation-table))
                (input-method . "bulgarian-bds")
@@ -488,6 +506,11 @@ Support for Russian using koi8-r and the russian-computer input method.")
  "Belarusian" `((coding-system windows-1251)
                 (coding-priority windows-1251)
                 (ctext-non-standard-encodings "microsoft-cp1251")
+                (overriding-fontspec
+                 (,(get 'encode-windows-1251 'translation-table)
+                  . (nil . "microsoft-cp1251"))
+                 (,(get 'cyrillic-koi8-r-encode-table 'translation-table)
+                  . (nil . "koi8-r")))
                 (nonascii-translation
                  . ,(get 'decode-windows-1251 'translation-table))
                 (input-method . "belarusian")
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index 9b3d5c18d4c..1a5dfad67f8 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -30,11 +30,13 @@
 
 ;;; Code:
 
-;; uses address-start free, throws to address
+(defvar rfc822-address-start)
+
+;; uses rfc822-address-start free, throws to address
 (defun rfc822-bad-address (reason)
   (save-restriction
     (insert "_^_")
-    (narrow-to-region address-start
+    (narrow-to-region rfc822-address-start
                       (if (re-search-forward "[,;]" nil t)
                           (max (point-min) (1- (point)))
                         (point-max)))
@@ -52,7 +54,7 @@
                                     ": \"")
     (goto-char (point-max)) (insert "\")"))
   (rfc822-nuke-whitespace)
-  (throw 'address (buffer-substring address-start (point))))
+  (throw 'address (buffer-substring rfc822-address-start (point))))
 
 (defun rfc822-nuke-whitespace (&optional leave-space)
   (let (ch)
@@ -179,7 +181,7 @@
   ;;  domain-literal is  "[" *(dtext | quoted-pair) "]"
   ;;  dtext is "[^][\\n"
   ;;  domain-ref is atom
-  (let ((address-start (point))
+  (let ((rfc822-address-start (point))
         (n 0))
     (catch 'address
       ;; optimize common cases:
@@ -198,14 +200,14 @@
             (or (bobp) (/= (preceding-char) ?\ ) (delete-char -1))
             ;; relying on the fact that rfc822-looking-at <char>
             ;;  doesn't mung match-data
-            (throw 'address (buffer-substring address-start (match-end 0)))))
-      (goto-char address-start)
+            (throw 'address (buffer-substring rfc822-address-start (match-end 0)))))
+      (goto-char rfc822-address-start)
       (while t
         (cond ((and (= n 1) (rfc822-looking-at ?@))
                ;; local-part@domain
                (rfc822-snarf-domain)
                (throw 'address
-                 (buffer-substring address-start (point))))
+                 (buffer-substring rfc822-address-start (point))))
               ((rfc822-looking-at ?:)
                (cond ((not allow-groups)
                       (rfc822-bad-address "A group name may not appear here"))
@@ -261,7 +263,7 @@
                (throw 'address nil))
               ((= n 1) ; allow "foo" (losing unix seems to do this)
                (throw 'address
-                 (buffer-substring address-start (point))))
+                 (buffer-substring rfc822-address-start (point))))
               ((> n 1)
                (rfc822-bad-address "Missing comma between addresses or badly-formatted address"))
               ((or (eobp) (= (following-char) ?,))
@@ -289,12 +291,12 @@
             (replace-match "\\1 " t))
 
           (goto-char (point-min))
-          (rfc822-nuke-whitespace)
           (let ((list ())
                 tem
-                address-start); this is for rfc822-bad-address
+                rfc822-address-start); this is for rfc822-bad-address
+            (rfc822-nuke-whitespace)
             (while (not (eobp))
-              (setq address-start (point))
+              (setq rfc822-address-start (point))
               (setq tem
                     (catch 'address ; this is for rfc822-bad-address
                       (cond ((rfc822-looking-at ?\,)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index acc7e4839dd..6185fd12286 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1687,19 +1687,22 @@ It returns t if it got any new messages."
                          (delete-region (point) (search-backward ":"))
                          (insert ": 8bit")))
                    (if base64-header-field-end
-                       (condition-case nil
-                           (save-excursion
-                             (base64-decode-region (1+ header-end)
-                                                   (- (point) 2))
-                             ;; Change "base64" to "8bit", to reflect the
-                             ;; decoding we just did.
-                             (goto-char (1+ header-end))
-                             (while (search-forward "\r\n" (point-max) t)
-                               (replace-match "\n"))
-                             (goto-char base64-header-field-end)
-                             (delete-region (point) (search-backward ":"))
-                             (insert ": 8bit"))
-                         (error nil)))
+                       (save-excursion
+                         (when
+                             (condition-case nil
+                                 (progn
+                                   (base64-decode-region (1+ header-end)
+                                                         (- (point) 2))
+                                   t)
+                               (error nil))
+                           ;; Change "base64" to "8bit", to reflect the
+                           ;; decoding we just did.
+                           (goto-char (1+ header-end))
+                           (while (search-forward "\r\n" (point-max) t)
+                             (replace-match "\n"))
+                           (goto-char base64-header-field-end)
+                           (delete-region (point) (search-backward ":"))
+                           (insert ": 8bit"))))
                    (setq last-coding-system-used nil)
                    (or rmail-enable-mime
                        (not rmail-enable-multibyte)
@@ -1829,15 +1832,21 @@ It returns t if it got any new messages."
                        (delete-region (point) (search-backward ":"))
                        (insert ": 8bit")))
                  (if base64-header-field-end
-                     (condition-case nil
-                         (save-excursion
-                           (base64-decode-region header-end (point))
-                           ;; Change "base64" to "8bit", to reflect the
-                           ;; decoding we just did.
-                           (goto-char base64-header-field-end)
-                           (delete-region (point) (search-backward ":"))
-                           (insert ": 8bit"))
-                       (error nil))))
+                     (save-excursion
+                       (when
+                           (condition-case nil
+                               (progn
+                                 (base64-decode-region (1+ header-end) (point))
+                                 t)
+                             (error nil))
+                         (goto-char header-end)
+                         (while (search-forward "\r\n" (point-max) t)
+                           (replace-match "\n"))
+                         ;; Change "base64" to "8bit", to reflect the
+                         ;; decoding we just did.
+                         (goto-char base64-header-field-end)
+                         (delete-region (point) (search-backward ":"))
+                         (insert ": 8bit")))))
 
                (save-excursion
                  (save-restriction
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index b96e7f1a298..0277bd0aabc 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -686,7 +686,7 @@
   :prefix "ange-ftp-")
 
 (defcustom ange-ftp-name-format
-  '("^/\\(\\([^@/:]*\\)@\\)?\\([^@/:]*[^@/:.]\\):\\(.*\\)" . (3 2 4))
+  '("^/\\(\\([^/:]*\\)@\\)?\\([^@/:]*[^@/:.]\\):\\(.*\\)" . (3 2 4))
   "*Format of a fully expanded remote file name.
 
 This is a list of the form \(REGEXP HOST USER NAME\),
@@ -694,7 +694,7 @@ where REGEXP is a regular expression matching
 the full remote name, and HOST, USER, and NAME are the numbers of
 parenthesized expressions in REGEXP for the components (in that order)."
   :group 'ange-ftp
-  :type '(list regexp
+  :type '(list (regexp  :tag "Name regexp")
                (integer :tag "Host group")
                (integer :tag "User group")
                (integer :tag "Name group")))
@@ -1918,7 +1918,8 @@ on the gateway machine to do the ftp instead."
     ;; but that doesn't work: ftp never responds.
     ;; Can anyone find a fix for that?
     (let ((process-connection-type t)
-          (process-environment process-environment)
+          ;; Copy this so we don't alter it permanently.
+          (process-environment (copy-tree process-environment))
           (buffer (get-buffer-create name)))
       (save-excursion
         (set-buffer buffer)
diff --git a/lisp/net/zone-mode.el b/lisp/net/zone-mode.el
index 591deee3144..6b4d22f9b13 100644
--- a/lisp/net/zone-mode.el
+++ b/lisp/net/zone-mode.el
@@ -92,7 +92,7 @@ Zone-mode does two things:
 
         - fontification"
 
-  (add-hook 'write-file-hooks 'zone-mode-update-serial-hook nil t)
+  (add-hook 'write-file-functions 'zone-mode-update-serial-hook nil t)
 
   (if (null zone-mode-syntax-table)
       (zone-mode-load-time-setup)) ;; should have been run at load-time
diff --git a/lisp/obsolete/sc.el b/lisp/obsolete/sc.el
index e9798a0a253..26486577aa4 100644
--- a/lisp/obsolete/sc.el
+++ b/lisp/obsolete/sc.el
@@ -11,5 +11,7 @@
 (require 'supercite)
 (provide 'sc)
 
+(message "The name `sc' works but is obsolete; please use `supercite' instead")
+
 ;;; arch-tag: 31e8ae19-689e-4b7d-9161-6d7dd60c6ece
 ;;; sc.el ends here
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index 5c6aa8f3abf..11499444920 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -159,8 +159,7 @@ Variables: handwrite-linespace     (default 12)
     (setq next-line-add-newlines t)
     (switch-to-buffer ps-buf-name)
     (handwrite-insert-header buf-name)
-    (insert "\n(\\nCreated by GNU Emacs' handwrite version "
-            emacs-version  "\\n\\n)=print flush\n")
+    (insert "%%Creator: GNU Emacs' handwrite version " emacs-version  "\n")
     (handwrite-insert-preamble)
     (handwrite-insert-info)
     (handwrite-insert-font)
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index f3a540fc491..b7bf99efa2e 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -161,7 +161,7 @@
 ;; More compile-time-macros
 (eval-when-compile
   (defmacro save-buffer-state-x (&rest body) ; similar to EMACS/lazy-lock.el
-    (let ((modified (gensym "save-buffer-state-x-modified-")))
+    (let ((modified (with-no-warnings (gensym "save-buffer-state-x-modified-"))))
       `(let ((,modified (buffer-modified-p)))
          (unwind-protect
              (let ((buffer-undo-list t) (inhibit-read-only t)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 48a007aef27..76e00cc4438 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -162,11 +162,14 @@ Used to grey out relevant toolbar icons.")
                      (gud-run . "gud-run")
                      (gud-until . "gud-until")
                      (gud-cont . "gud-cont")
-                     (gud-step . "gud-step")
-                     (gud-next . "gud-next")
+                     ;; gud-s, gud-si etc. instead of gud-step,
+                     ;; gud-stepi, to avoid file-name clashes on DOS
+                     ;; 8+3 filesystems.
+                     (gud-step . "gud-s")
+                     (gud-next . "gud-n")
                      (gud-finish . "gud-finish")
-                     (gud-stepi . "gud-stepi")
-                     (gud-nexti . "gud-nexti")
+                     (gud-stepi . "gud-si")
+                     (gud-nexti . "gud-ni")
                      (gud-up . "gud-up")
                      (gud-down . "gud-down"))
                    map)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e63dda1c663..a23dc0a307e 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2052,7 +2052,8 @@ STRING	     This is ignored for the purposes of calculating
                     (progn
                       (setq result (append result val))
                       (setq align-point (point))))
-                (forward-char -1)
+                (or (bobp)
+                    (forward-char -1))
                 (skip-chars-forward "[a-z0-9]*?")
                 )
                ((string-match "[])}]" x)
diff --git a/lisp/register.el b/lisp/register.el
index 8185ae4bc44..0ba6a9addd6 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -304,8 +304,10 @@ START and END are buffer positions indicating what to prepend."
 
 (defun copy-rectangle-to-register (register start end &optional delete-flag)
   "Copy rectangular region into register REGISTER.
-With prefix arg, delete as well.
-Called from program, takes four args: REGISTER, START, END and DELETE-FLAG.
+With prefix arg, delete as well.  To insert this register
+in the buffer, use \\[insert-register].
+
+Called from a program, takes four args: REGISTER, START, END and DELETE-FLAG.
 START and END are buffer positions giving two corners of rectangle."
   (interactive "cCopy rectangle to register: \nr\nP")
   (set-register register
diff --git a/lisp/shell.el b/lisp/shell.el
index cc83dcf1429..1817a1fd3b4 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -167,7 +167,7 @@ This is a fine thing to set in your `.emacs' file.")
 (defvar shell-file-name-chars
   (if (memq system-type '(ms-dos windows-nt cygwin))
       "~/A-Za-z0-9_^$!#%&{}@`'.,:()-"
-    "~/A-Za-z0-9+@:_.$#%,={}-")
+    "[]~/A-Za-z0-9+@:_.$#%,={}-")
   "String of characters valid in a file name.
 This variable is used to initialize `comint-file-name-chars' in the
 shell buffer.  The value may depend on the operating system or shell.
@@ -941,36 +941,37 @@ Returns t if successful."
   "Dynamically complete at point as a command.
 See `shell-dynamic-complete-filename'.  Returns t if successful."
   (let* ((filename (or (comint-match-partial-filename) ""))
-         (pathnondir (file-name-nondirectory filename))
-         (paths (cdr (reverse exec-path)))
+         (filenondir (file-name-nondirectory filename))
+         (path-dirs (cdr (reverse exec-path)))
          (cwd (file-name-as-directory (expand-file-name default-directory)))
          (ignored-extensions
           (and comint-completion-fignore
                (mapconcat (function (lambda (x) (concat (regexp-quote x) "$")))
                           comint-completion-fignore "\\|")))
-         (path "") (comps-in-path ()) (file "") (filepath "") (completions ()))
-    ;; Go thru each path in the search path, finding completions.
-    (while paths
-      (setq path (file-name-as-directory (comint-directory (or (car paths) ".")))
-            comps-in-path (and (file-accessible-directory-p path)
-                               (file-name-all-completions pathnondir path)))
+         (dir "") (comps-in-dir ()) 
+         (file "") (abs-file-name "") (completions ()))
+    ;; Go thru each dir in the search path, finding completions.
+    (while path-dirs
+      (setq dir (file-name-as-directory (comint-directory (or (car path-dirs) ".")))
+            comps-in-dir (and (file-accessible-directory-p dir)
+                              (file-name-all-completions filenondir dir)))
       ;; Go thru each completion found, to see whether it should be used.
-      (while comps-in-path
-        (setq file (car comps-in-path)
-              filepath (concat path file))
+      (while comps-in-dir
+        (setq file (car comps-in-dir)
+              abs-file-name (concat dir file))
         (if (and (not (member file completions))
                  (not (and ignored-extensions
                            (string-match ignored-extensions file)))
-                 (or (string-equal path cwd)
-                     (not (file-directory-p filepath)))
+                 (or (string-equal dir cwd)
+                     (not (file-directory-p abs-file-name)))
                  (or (null shell-completion-execonly)
-                     (file-executable-p filepath)))
+                     (file-executable-p abs-file-name)))
             (setq completions (cons file completions)))
-        (setq comps-in-path (cdr comps-in-path)))
-      (setq paths (cdr paths)))
+        (setq comps-in-dir (cdr comps-in-dir)))
+      (setq path-dirs (cdr path-dirs)))
     ;; OK, we've got a list of completions.
     (let ((success (let ((comint-completion-addsuffix nil))
-                     (comint-dynamic-simple-complete pathnondir completions))))
+                     (comint-dynamic-simple-complete filenondir completions))))
       (if (and (memq success '(sole shortest)) comint-completion-addsuffix
                (not (file-directory-p (comint-match-partial-filename))))
           (insert " "))
diff --git a/lisp/simple.el b/lisp/simple.el
index ade177c5b8e..d23ed11c6c3 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3735,9 +3735,9 @@ See also `read-mail-command' concerning reading mail."
             (same-window-buffer-names nil)
             (same-window-regexps nil))
         (funcall switch-function "*mail*")))
-  (let ((cc (cdr (assoc-ignore-case "cc" other-headers)))
-        (in-reply-to (cdr (assoc-ignore-case "in-reply-to" other-headers)))
-        (body (cdr (assoc-ignore-case "body" other-headers))))
+  (let ((cc (cdr (assoc-string "cc" other-headers t)))
+        (in-reply-to (cdr (assoc-string "in-reply-to" other-headers t)))
+        (body (cdr (assoc-string "body" other-headers t))))
     (or (mail continue to subject in-reply-to cc yank-action send-actions)
         continue
         (error "Message aborted"))
diff --git a/lisp/subr.el b/lisp/subr.el
index 2996f2903e0..a2b09d6b63b 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -298,27 +298,19 @@ If TEST is omitted or nil, `equal' is used."
       (setq tail (cdr tail)))
     value))
 
+(make-obsolete 'assoc-ignore-case 'assoc-string)
 (defun assoc-ignore-case (key alist)
   "Like `assoc', but ignores differences in case and text representation.
 KEY must be a string.  Upper-case and lower-case letters are treated as equal.
 Unibyte strings are converted to multibyte for comparison."
-  (let (element)
-    (while (and alist (not element))
-      (if (eq t (compare-strings key 0 nil (car (car alist)) 0 nil t))
-          (setq element (car alist)))
-      (setq alist (cdr alist)))
-    element))
+  (assoc-string key alist t))
 
+(make-obsolete 'assoc-ignore-representation 'assoc-string)
 (defun assoc-ignore-representation (key alist)
   "Like `assoc', but ignores differences in text representation.
 KEY must be a string.
 Unibyte strings are converted to multibyte for comparison."
-  (let (element)
-    (while (and alist (not element))
-      (if (eq t (compare-strings key 0 nil (car (car alist)) 0 nil))
-          (setq element (car alist)))
-      (setq alist (cdr alist)))
-    element))
+  (assoc-string key alist nil))
 
 (defun member-ignore-case (elt list)
   "Like `member', but ignores differences in case and text representation.
@@ -1563,7 +1555,18 @@ Replaces `category' properties with their defined properties."
 (defvar yank-undo-function)
 
 (defun insert-for-yank (string)
+  "Calls `insert-for-yank-1' repetitively for each `yank-handler' segment.
+
+See `insert-for-yank-1' for more details."
+  (let (to)
+    (while (setq to (next-single-property-change 0 'yank-handler string))
+      (insert-for-yank-1 (substring string 0 to))
+      (setq string (substring string to))))
+  (insert-for-yank-1 string))
+
+(defun insert-for-yank-1 (string)
   "Insert STRING at point, stripping some text properties.
+
 Strip text properties from the inserted text according to
 `yank-excluded-properties'.  Otherwise just like (insert STRING).
 
@@ -1809,6 +1812,7 @@ in BODY."
 (defvar delayed-mode-hooks nil
   "List of delayed mode hooks waiting to be run.")
 (make-variable-buffer-local 'delayed-mode-hooks)
+(put 'delay-mode-hooks 'permanent-local t)
 
 (defun run-mode-hooks (&rest hooks)
   "Run mode hooks `delayed-mode-hooks' and HOOKS, or delay HOOKS.
diff --git a/lisp/term.el b/lisp/term.el
index d2088a29785..b329004c083 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1290,6 +1290,7 @@ buffer.  The hook term-exec-hook is run after each exec."
       (goto-char (point-max))
       (set-marker (process-mark proc) (point))
       (set-process-filter proc 'term-emulate-terminal)
+      (set-process-sentinel proc 'term-sentinel)
       ;; Feed it the startfile.
       (cond (startfile
              ;;This is guaranteed to wait long enough
@@ -1306,6 +1307,49 @@ buffer.  The hook term-exec-hook is run after each exec."
     (run-hooks 'term-exec-hook)
     buffer)))
 
+(defun term-sentinel  (proc msg)
+  "Sentinel for term buffers.
+The main purpose is to get rid of the local keymap."
+  (let ((buffer (process-buffer proc)))
+    (if (memq (process-status proc) '(signal exit))
+        (progn
+          (if (null (buffer-name buffer))
+              ;; buffer killed
+              (set-process-buffer proc nil)
+            (let ((obuf (current-buffer)))
+              ;; save-excursion isn't the right thing if
+              ;; process-buffer is current-buffer
+              (unwind-protect
+                  (progn
+                    ;; Write something in the compilation buffer
+                    ;; and hack its mode line.
+                    (set-buffer buffer)
+                    ;; Get rid of local keymap.
+                    (use-local-map nil)
+                    (term-handle-exit (process-name proc)
+                                      msg)
+                    ;; Since the buffer and mode line will show that the
+                    ;; process is dead, we can delete it now.  Otherwise it
+                    ;; will stay around until M-x list-processes.
+                    (delete-process proc))
+                (set-buffer obuf))))
+          ))))
+
+(defun term-handle-exit (process-name msg)
+  "Write process exit (or other change) message MSG in the current buffer."
+  (let ((buffer-read-only nil)
+        (omax (point-max))
+        (opoint (point)))
+    ;; Record where we put the message, so we can ignore it
+    ;; later on.
+    (goto-char omax)
+    (insert ?\n "Process " process-name " " msg)
+    ;; Force mode line redisplay soon.
+    (force-mode-line-update)
+    (if (and opoint (< opoint omax))
+        (goto-char opoint))))
+
+
 ;;; Name to use for TERM.
 ;;; Using "emacs" loses, because bash disables editing if TERM == emacs.
 (defvar term-term-name "eterm")
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index dc4f521c018..e71eb440c12 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -267,7 +267,9 @@ property of the major mode name.")
 (defun mail-mode-flyspell-verify ()
   "This function is used for `flyspell-generic-check-word-p' in Mail mode."
   (let ((in-headers (save-excursion
-                      (re-search-forward mail-header-separator nil t)))
+                      ;; When mail-header-separator is "",
+                      ;; it is likely to be found in both directions.
+                      (not (re-search-backward (concat "^" (regexp-quote mail-header-separator) "$") nil t))))
         (in-signature (save-excursion
                         (re-search-backward message-signature-separator nil t))))
     (cond (in-headers
@@ -1628,7 +1630,7 @@ misspelled words backwards."
 (defun flyspell-abbrev-table ()
   (if flyspell-use-global-abbrev-table-p
       global-abbrev-table
-    local-abbrev-table))
+    (or local-abbrev-table global-abbrev-table)))
 
 ;*---------------------------------------------------------------------*/
 ;*    flyspell-define-abbrev ...                                       */
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 44e82efc5b7..93ea3cc0c14 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -5,7 +5,7 @@
 ;; Keywords: wp, convenience
 ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
 ;; Created: Sat Jul 08 2000 13:28:45 (PST)
-;; Revised: jue jun 05 2003 22:00:02 (Hora de verano romance)
+;; Revised: Tue Dec 09 2003 14:36:50 (PST)
 
 ;; This file is part of GNU Emacs.
 
@@ -837,6 +837,9 @@ simply by any key input."
   :type 'hook
   :group 'table-hooks)
 
+(defcustom table-yank-handler '(nil nil t nil)
+  "*yank-handler for table.")
+
 (setplist 'table-disable-incompatibility-warning nil)
 
 (defvar table-disable-menu (null (and (locate-library "easymenu")
@@ -5228,7 +5231,8 @@ and the right cell border character."
 
 (defun table--put-cell-indicator-property (beg end &optional object)
   "Put cell property which indicates that the location is within a table cell."
-  (put-text-property beg end 'table-cell t object))
+  (put-text-property beg end 'table-cell t object)
+  (put-text-property beg end 'yank-handler table-yank-handler object))
 
 (defun table--put-cell-face-property (beg end &optional object)
   "Put cell face property."
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 1bead17e10c..25670e8c310 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -5,7 +5,7 @@
 
 ;; Author: Robert J. Chassell
 ;; Date:   [See date below for texinfo-version]
-;; Maintainer: bug-texinfo@gnu.org
+;; Maintainer: FSF
 ;; Keywords: maint, tex, docs
 
 ;; This file is part of GNU Emacs.
@@ -59,6 +59,12 @@
   :type 'string
   :group 'texinfo)
 
+(defcustom texinfo-mode-hook nil
+  "Normal hook run when entering Texinfo mode."
+  :type 'hook
+  :options '(turn-on-auto-fill flyspell-mode)
+  :group 'texinfo)
+
 
 ;;; Autoloads:
 
diff --git a/lisp/toolbar/gud-next.pbm b/lisp/toolbar/gud-n.pbm
index dc2a15323e3..dc2a15323e3 100644
--- a/lisp/toolbar/gud-next.pbm
+++ b/lisp/toolbar/gud-n.pbm
diff --git a/lisp/toolbar/gud-next.xpm b/lisp/toolbar/gud-n.xpm
index 0e631de18e1..0e631de18e1 100644
--- a/lisp/toolbar/gud-next.xpm
+++ b/lisp/toolbar/gud-n.xpm
diff --git a/lisp/toolbar/gud-nexti.pbm b/lisp/toolbar/gud-ni.pbm
index ecad2965b0d..ecad2965b0d 100644
--- a/lisp/toolbar/gud-nexti.pbm
+++ b/lisp/toolbar/gud-ni.pbm
diff --git a/lisp/toolbar/gud-nexti.xpm b/lisp/toolbar/gud-ni.xpm
index cdb8c38e8d4..cdb8c38e8d4 100644
--- a/lisp/toolbar/gud-nexti.xpm
+++ b/lisp/toolbar/gud-ni.xpm
diff --git a/lisp/toolbar/gud-step.pbm b/lisp/toolbar/gud-s.pbm
index de7caa50ed5..de7caa50ed5 100644
--- a/lisp/toolbar/gud-step.pbm
+++ b/lisp/toolbar/gud-s.pbm
diff --git a/lisp/toolbar/gud-step.xpm b/lisp/toolbar/gud-s.xpm
index 7b4eb876235..7b4eb876235 100644
--- a/lisp/toolbar/gud-step.xpm
+++ b/lisp/toolbar/gud-s.xpm
diff --git a/lisp/toolbar/gud-stepi.pbm b/lisp/toolbar/gud-si.pbm
index eed55cc4a33..eed55cc4a33 100644
--- a/lisp/toolbar/gud-stepi.pbm
+++ b/lisp/toolbar/gud-si.pbm
diff --git a/lisp/toolbar/gud-stepi.xpm b/lisp/toolbar/gud-si.xpm
index d2667fc70b6..d2667fc70b6 100644
--- a/lisp/toolbar/gud-stepi.xpm
+++ b/lisp/toolbar/gud-si.xpm
diff --git a/lisp/xml.el b/lisp/xml.el
index a6159554b3f..dbd991f5583 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -104,15 +104,22 @@ CHILD-NAME should be a lower case symbol."
               (push child match))))
     (nreverse match)))
 
-(defun xml-get-attribute (node attribute)
+(defun xml-get-attribute-or-nil (node attribute)
   "Get from NODE the value of ATTRIBUTE.
-An empty string is returned if the attribute was not found."
-  (if (xml-node-attributes node)
-      (let ((value (assoc attribute (xml-node-attributes node))))
-        (if value
-            (cdr value)
-          ""))
-    ""))
+Return `nil' if the attribute was not found.
+
+See also `xml-get-attribute'."
+  (when (xml-node-attributes node)
+    (let ((value (assoc attribute (xml-node-attributes node))))
+      (when value
+        (cdr value)))))
+
+(defsubst xml-get-attribute (node attribute)
+  "Get from NODE the value of ATTRIBUTE.
+An empty string is returned if the attribute was not found.
+
+See also `xml-get-attribute-or-nil'."
+  (or (xml-get-attribute-or-nil node attribute) ""))
 
 ;;*******************************************************************
 ;;**
@@ -286,7 +293,6 @@ If PARSE-NS is non-nil, then QNAMES are expanded."
    attr-list)
   attr-list)
 
-
 (defun xml-intern-attrlist (attr-list)
   "Convert attribute names to symbols for backward compatibility."
   (mapcar (lambda (attr)
@@ -349,12 +355,12 @@ Returns one of:
       (let* ((node-name (match-string 1))
              (attr-list (xml-parse-attlist))
              (children (if  (consp xml-ns) ;; take care of namespace parsing
-                            (progn 
+                            (progn
                               (setq xml-ns (xml-ns-parse-ns-attrs
                                             attr-list xml-ns))
-                              (list (xml-ns-expand-attr 
+                              (list (xml-ns-expand-attr
                                      attr-list xml-ns)
-                                    (xml-ns-expand-el 
+                                    (xml-ns-expand-el
                                      node-name xml-ns)))
                             (list (xml-intern-attrlist attr-list)
                                   (intern node-name))))