Merged in changes from CVS HEAD

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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


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

32 files changed, 491 insertions, 255 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b945703cb57..63081ea5261 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,18 +1,140 @@
+2004-03-05  Nick Roberts  <nick@nick.uklinux.net>
+
+        * gdb-ui.el (gdb-assembler-mode): Create a second overlay arrow
+        for the assembler buffer.
+        (gdb-assembler-custom): Position the overlay arrow.
+        (gdb-put-arrow, gdb-remove-arrow): Delete functions.
+
+2004-03-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mail/sendmail.el (mail-mode): Set comment-start-skip.
+
+        * newcomment.el (uncomment-region): Allow non-terminated comment.
+        (comment-normalize-vars): Check the user-specified comstart marker.
+
+2004-03-04  Jesper Harder  <harder@ifa.au.dk>
+
+        * sort.el (sort-columns): Don't use external 'sort' on ms-windows.
+        Otherwise, do use it if the region only contains font-lock text
+        properties.
+
+2004-03-04  Masatake YAMATO  <jet@gyve.org>
+
+        * hexl.el (hexl-mode): Set `hexl-print-current-point-info'
+        as the callback function for eldoc.
+        (hexl-print-current-point-info): New function.
+        (hexl-current-address): Print the address in both decimal
+        and hexadecimal format.
+
+2004-03-04  Richard M. Stallman  <rms@gnu.org>
+
+        * mail/rmail.el (rmail-convert-to-babyl-format):
+        Specify t for UNIBYTE when calling mail-unquote-printable-region.
+
+        * mail/mail-utils.el (mail-unquote-printable-region):
+        New arg UNIBYTE.
+
+        * startup.el (command-switch-alist): Doc fix.
+
+        * simple.el (undo): Temporarily set this-command to `undo-start',
+        then set it to `undo' once undo-start returns without error.
+
+        * simple.el (minibuffer-history-sexp-flag): Doc fix.
+
+        * simple.el (kill-line): Don't disregard trailing whitespace
+        in eol condition, if show-trailing-whitespace is set.
+
+        * mouse-sel.el (mouse-sel-has-been-enabled): New var.
+        (mouse-sel-mode): When enabling, set mouse-sel-has-been-enabled.
+        When disabling, restore old values only if mouse-sel-has-been-enabled.
+
+        * isearch.el (isearch-*-char): New arg WANT-BACKSLASH.
+        (isearch-{-char): New function.
+        (isearch-mode-map): Bind { to isearch-{-char.
+
+        * font-lock.el (lisp-font-lock-keywords-2):
+        Turn off the CL with-... and do-... general patterns.
+        Instead, recognize several specific with... and do... constructs.
+
+        * files.el (switch-to-buffer-other-window):
+        Bind same-window-buffer-names and same-window-regexps to nil.
+        (switch-to-buffer-other-frame): Likewise.
+
+2004-03-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/fill.el (fill-comment-paragraph): Be more careful when
+        recognizing leading comment on code line.
+
+2004-03-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/fill.el (fill-paragraph): Don't check comment-start-skip,
+        only comment-start (in case the mode hasn't set it).
+
+        * Makefile.in (AUTOGENEL): New var.
+        (bootstrap-prepare): Rename from bootstrap-clean.
+        Don't remove elc files.
+        (maintainer-clean): New target.
+
+        * xml.el (xml-get-attribute-or-nil): Simplify.
+
+2004-03-02  Juri Linkov  <juri@jurta.org>
+
+        * net/browse-url.el (browse-url-netscape, browse-url-mozilla)
+        (browse-url-galeon, browse-url-epiphany): Encode dollar signs in
+        URL to prevent their substitution with the environment variable
+        values by browsers.
+
+2004-03-03  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * ps-print.el: Doc fix.
+        (ps-print-version): New version number (6.6.3).
+        (ps-right-header, ps-right-footer, ps-left-header, ps-left-footer):
+        Docstring fix.
+        (ps-kill-emacs-check): Check if ps-print temporary buffer is killed
+        before printing.
+        (ps-time-stamp-yyyy-mm-dd): New fun.
+        (ps-time-stamp-iso8601): Alias for ps-time-stamp-yyyy-mm-dd.
+
+2004-03-02  Kim F. Storm  <storm@cua.dk>
+
+        * gdb-ui.el (gdb-mouse-toggle-breakpoint): Remove debug message.
+
+2004-03-01  Juanma Barranquero  <lektu@terra.es>
+
+        * allout.el (allout-rebullet-heading): Fix typo in docstring.
+
+        * desktop.el (desktop-file-version)
+        (desktop-after-read-hook): Fix typos.
+        (desktop-clear-preserve-buffers): Remove redundant info in
+        docstring already shown by the obsolescence message.
+        (desktop-truncate, desktop-internal-v2s)
+        (desktop-value-to-string): Change argument name to match docstring.
+
+        * emulation/tpu-edt.el (tpu-set-mark): Fix typo in docstring.
+
+        * eshell/em-smart.el (eshell-smart-maybe-jump-to-end): Fix typo in
+        docstring.
+
+2004-02-29  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * printing.el: Replace "As Is..." in PostScript file print/preview by
+        "No Preprocessing...".  Suggested by Colin Marquardt
+        <marquardt@zmd.de>.
+        (pr-insert-section-4): Adjust buffer interface.
+
 2004-02-29  Kai Grossjohann  <kai.grossjohann@gmx.net>
 
         Version 2.0.39 of Tramp released.
 
         * net/tramp.el (tramp-handle-file-local-copy)
-        (tramp-handle-write-region, tramp-open-connection-rsh): Variable
-        name typo.  Small change.  From Patrick Tullmann
+        (tramp-handle-write-region, tramp-open-connection-rsh):
+        Variable name typo.  Small change.  From Patrick Tullmann
         <tullmann@flux.utah.edu>.
         (tramp-process-connection-type): New variable.
         (tramp-maybe-open-connection): Use it.
-        (tramp-do-copy-or-rename-via-buffer): Handle KEEP-DATE arg, if
-        possible.
+        (tramp-do-copy-or-rename-via-buffer): Handle KEEP-DATE arg if possible.
         (tramp-touch): Set last-modified time of a remote file.
-        (tramp-handle-write-region): Say which function is used when
-        encoding.
+        (tramp-handle-write-region): Say which function is used when encoding.
 
 2004-02-29  Michael Albinus  <Michael.Albinus@alcatel.de>
 
@@ -28,7 +150,7 @@
         output.  If it was received chunkwise, there have been problems.
         Remove the "prompt not found" error message; it is obvious.
         Simplify algorithm.
-        (tramp-smb-process-running): Removed.  Since we acknowledge the
+        (tramp-smb-process-running): Remove.  Since we acknowledge the
         virtual prompt for shares, there's no need for distinction of
         reading shares (process ends afterwards) and interactive mode of
         smblient.
@@ -38,23 +160,21 @@
         (tramp-smb-maybe-open-connection): Set `process-connection-type'
         to 'pty.  Suggested by Piet van Oostrum <piet@cs.uu.nl>.
         (top-level): Setting default value in `tramp-default-method-alist'
-        corrected.  Order of USER and HOST have been wrong.  Nobody
-        claimed for months ...
-        (tramp-smb-maybe-open-connection): Use
-        `tramp-process-connection-type'.
-        (tramp-smb-open-connection): Clear password cache if login has
-        failed.
-
-        * net/tramp.el (tramp-completion-mode) Don't check for 'xemacs but
+        corrected.  Order of USER and HOST have been wrong.
+        Nobody complaimed for months ...
+        (tramp-smb-maybe-open-connection): Use `tramp-process-connection-type'.
+        (tramp-smb-open-connection): Clear password cache if login has failed.
+
+        * net/tramp.el (tramp-completion-mode) Don't check for 'xemacs' but
         `tramp-unified-filenames'.
         (tramp-completion-mode): Make test for XEmacs explicitely.
-        `event-to-character' can exists in Emacs packages too.  Reported
-        by Matt Swift <swift@alum.mit.edu>.
+        `event-to-character' can exists in Emacs packages too.
+        Reported by Matt Swift <swift@alum.mit.edu>.
         (tramp-buffer-name): Buffer name must contain the user if exists.
         Reported by Adrian Phillips <a.phillips@met.no>.
-        (tramp-do-copy-or-rename-file): Handle out-of-band methods.  Call
-        `tramp-do-copy-or-rename-file-out-of-band' this case.
-        (tramp-do-copy-or-rename-file-out-of-band): Renamed from
+        (tramp-do-copy-or-rename-file): Handle out-of-band methods.
+        Call `tramp-do-copy-or-rename-file-out-of-band' this case.
+        (tramp-do-copy-or-rename-file-out-of-band): Rename from
         `tramp-do-copy-or-rename-file-one-local', because it handles also
         the case both files use the same out-of-band method.
         Implementation added.
@@ -70,16 +190,16 @@
         (tramp-completion-function-alist): It's a defvar now, because we
         want to apply the optimized `tramp-set-completion-function'
         instead of a static list.
-        (tramp-set-completion-function): Implementation tuned.  Avoid
-        double entries, and entries where the function or the
+        (tramp-set-completion-function): Implementation tuned.
+        Avoid double entries, and entries where the function or the
         file/directory doesn't exist.
         (tramp-parse-shostkeys, tramp-parse-sknownhosts): New functions
         for SSH2.
         (tramp-file-name-handler-alist): Add `dired-compress-file' entry.
         (tramp-handle-dired-compress-file): New function.
         (tramp-async-proc): New variable.
-        (tramp-handle-shell-command): Adding asynchronous processes.  They
-        are far from being perfect, but it works at least for
+        (tramp-handle-shell-command): Adding asynchronous processes.
+        They are far from being perfect, but it works at least for
         `find-grep-dired' and `find-name-dired' in Emacs 21.4.
         (top-level): Require password.el if visible.  Should be mandatory
         once No Gnus has found its way into (X)Emacs.
@@ -87,8 +207,8 @@
         `read-passwd' otherwise. `ange-ftp-read-passwd' isn't used as
         fallback any longer.
         (tramp-clear-passwd): New function.
-        (tramp-process-actions, tramp-process-multi-actions): Clear
-        password cache if login has failed.
+        (tramp-process-actions, tramp-process-multi-actions):
+        Clear password cache if login has failed.
 
         * net/tramp-ftp.el (Commentary): Remove pointer to EFS.  It has
         its own module.
@@ -119,8 +239,7 @@
         relative directory names.
         (dired-at-point-prompter): Treat directories as a directory, get
         the directory component from files.
-        (ffap-string-at-point): Return string from region if region is
-        active.
+        (ffap-string-at-point): Return string from region if region is active.
         (ffap-file-at-point): Remove redundant code.
 
 2004-02-28  Kim F. Storm  <storm@cua.dk>
@@ -140,8 +259,8 @@
         (gdb-put-breakpoint-icon): New defun which displays a breakpoint
         icon in fringe (if available), or else as icon or text in display
         margin.  Creates necessary icons in breakpoint-bitmap,
-        breakpoint-enabled-icon, and/or breakpoint-disabled-icon.  Also
-        make left window margin if required.
+        breakpoint-enabled-icon, and/or breakpoint-disabled-icon.
+        Also make left window margin if required.
         (gdb-remove-breakpoint-icons): New defun to remove breakpoint
         icons inserted by gdb-put-breakpoint-icon.  Remove left margin if
         no longer needed.
@@ -152,7 +271,7 @@
 2004-02-27  Kevin Ryde  <user42@zip.com.au>
 
         * info-look.el: In scheme-mode symbol regexp, disallow backquote and
-        comma, so that it DTRT in macros.
+        comma, so that it DTRT in macros.
 
 2004-02-27  Markus Rost  <rost@mathematik.uni-bielefeld.de>
 
@@ -170,11 +289,10 @@
 
         * font-lock.el (font-lock-comment-face, font-lock-string-face)
         (font-lock-keyword-face, font-lock-function-name-face)
-        (font-lock-variable-name-face, font-lock-constant-face): Use
-        `min-colors'.
+        (font-lock-variable-name-face, font-lock-constant-face):
+        Use `min-colors'.
 
-        * isearch.el (isearch, isearch-lazy-highlight-face): Use
-        `min-colors'.
+        * isearch.el (isearch, isearch-lazy-highlight-face): Use `min-colors'.
 
 2004-02-25  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
@@ -191,8 +309,8 @@
         * ebnf-abn.el: New file, implements an ABNF parser.
 
         * ebnf2ps.el: Doc fix.  Accept ABNF (Augmented BNF).  New arrow shapes:
-        semi-up-hollow, semi-up-full, semi-down-hollow and semi-down-full.  Fix
-        a bug on productions like test = {"test"}* | ( "tt" ["test"] ).
+        semi-up-hollow, semi-up-full, semi-down-hollow and semi-down-full.
+        Fix a bug on productions like test = {"test"}* | ( "tt" ["test"] ).
         Reported by Markus Dreyer <mdreyer@ix.urz.uni-heidelberg.de>.
         (ebnf-version): New version number (4.0).
         (ebnf-print-directory, ebnf-print-file, ebnf-spool-directory)
@@ -238,10 +356,9 @@
         (gdb-var-delete): Make interactive (really).
         (gdb-edit-value): Make non-interactive.
 
-        * progmodes/gud.el (gud-install-speedbar-variables): Bind
-        gdb-var-delete to "D".
-        (gud-speedbar-menu-items): Add gdb-var-delete and, indirectly,
-        gdb-edit-value.
+        * progmodes/gud.el (gud-speedbar-menu-items):
+        Add gdb-var-delete and, indirectly, gdb-edit-value.
+        (gud-install-speedbar-variables): Bind gdb-var-delete to "D".
         (gud-speedbar-buttons): Remove gdb-var-delete from tag-line.
         (gud-gdb-marker-filter): Add comment for annotations.
 
@@ -260,8 +377,7 @@
 2004-02-21  Stephen Compall  <s11@member.fsf.org>
 
         * saveplace.el (save-place-forget-unreadable-files)
-        (save-place-save-skipped, save-place-skip-check-regexp): New
-        defcustoms.
+        (save-place-save-skipped, save-place-skip-check-regexp): New vars.
         (save-place-forget-unreadable-files): New function.
         (save-place-alist-to-file): Use it to filter out files that are
         no longer readable.
@@ -293,7 +409,7 @@
 
 2004-02-20  John Wiegley  <johnw@newartisans.com>
 
-        * eshell/em-pred.el (eshell-modifier-alist): Changed the "eval
+        * eshell/em-pred.el (eshell-modifier-alist): Change the "eval
         again" modifier from 'e' to 'E', since 'e' is also used by the
         "file extension" modifier.
 
@@ -312,8 +428,8 @@
 
         * gdb-ui.el (gdb-use-colon-colon-notation): Set default to nil for
         case of variables defined in compound statements.
-        (gdb-setup-windows, gdb-source-info, gdb-source-info): Simplify
-        constructions using switch-to-buffer.
+        (gdb-setup-windows, gdb-source-info, gdb-source-info):
+        Simplify constructions using switch-to-buffer.
 
 2004-02-19  Simon Josefsson  <jas@extundo.com>
 
@@ -401,7 +517,7 @@
         * rmail-spam-filter.el: (vm-use-spam-filter)
         (rsf-min-region-length-added-to-spam-list): New variables.
         (rsf-bbdb-auto-delete-spam-bbdb-entries): Rename from
-        rmail-bbdb-auto-delete-spam-entries.  Added cc: to recipients for
+        rmail-bbdb-auto-delete-spam-entries.  Add cc: to recipients for
         spam testing.  Don't delete spam message if automatic deletion
         after output via variable rmail-delete-after-output is turned on.
         (rsf-bbdb-dont-create-entries-for-deleted-messages): Rename from
@@ -571,6 +687,7 @@
         (diff, diff-backup): Use it.
         (diff): Clean up the args construction.  Use backquote.
         Use listp instead of consp to avoid putting a nil arg.
+        (diff): Add a revert-buffer function.
 
 2004-02-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
@@ -3061,7 +3178,7 @@
 
 2003-08-26  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
-        * mail/smtpmail.el Fix previous change:
+        * mail/smtpmail.el: Fix previous change.
         (smtpmail-send-queued-mail): Set smtpmail-mail-address before
         calling smtpmail-via-smtp.
         (smtpmail-via-smtp): Add fall-back values for envelope-from.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index fad13704c3c..e1c6b779db2 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,5 +1,5 @@
 # Maintenance productions for the Lisp directory
-# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2000, 01, 03, 2004  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -110,6 +110,13 @@ DONTCOMPILE = \
         $(lisp)/term/wyse50.el \
         $(lisp)/version.el
 
+# Elisp files auto-generated.
+AUTOGENEL = loaddefs.el \
+        cus-load.el \
+        finder-inf.el \
+        subdirs.el \
+        eshell/esh-groups.el
+
 # Files to compile before others during a bootstrap.  This is done to
 # speed up the bootstrap process.  The CC files are compiled first
 # because CC mode tweaks the compilation process, and requiring
@@ -131,14 +138,14 @@ emacs = EMACSLOADPATH=$(lisp) $(EMACS) $(EMACSOPT)
 
 setwins=subdirs=`find $$wd -type d -print`; \
         for file in $$subdirs; do \
-           case $$file in */Old | */RCS | */CVS | */CVS/* | */.arch-ids | */.arch-ids/* | */=* ) ;; \
+           case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* ) ;; \
                 *) wins="$$wins $$file" ;; \
            esac; \
         done
 
 setwins_almost=subdirs=`find $$wd -type d -print`; \
         for file in $$subdirs; do \
-           case $$file in */Old | */RCS | */CVS | */CVS/* | */=* | */obsolete | */term ) ;; \
+           case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* | */obsolete | */term ) ;; \
                 *) wins="$$wins $$file" ;; \
            esac; \
         done
@@ -294,11 +301,8 @@ $(lisp)/progmodes/cc-mode.elc: \
 # it's necessary for generating the binary (because loaddefs.el is an
 # automatically generated file, we don't want to store it in the source
 # repository).
-#
-# Remove compiled Lisp files so that bootstrap-emacs will be built from
-# sources only.
 
-bootstrap-clean:
+bootstrap-prepare:
         if test -x $(EMACS); then                               \
           $(MAKE) $(MFLAGS) autoloads;                          \
         else                                                    \
@@ -306,7 +310,9 @@ bootstrap-clean:
             cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el;       \
           fi                                                    \
         fi
-        cd $(lisp); rm -f *.elc */*.elc
+
+maintainer-clean:
+        cd $(lisp); rm -f *.elc */*.elc $(AUTOGENEL)
 
 # Generate/update files for the bootstrap process.
 
diff --git a/lisp/allout.el b/lisp/allout.el
index 32ecb35e07e..bd5cd6c36ee 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -5,7 +5,7 @@
 ;; Author: Ken Manheimer <klm@zope.com>
 ;; Maintainer: Ken Manheimer <klm@zope.com>
 ;; Created: Dec 1991 - first release to usenet
-;; Version: $Id: allout.el,v 1.45 2003/10/16 16:28:30 eliz Exp $||
+;; Version: $Id: allout.el,v 1.46 2004/03/01 22:44:04 lektu Exp $||
 ;; Keywords: outlines mode wp languages
 
 ;; This file is part of GNU Emacs.
@@ -508,7 +508,7 @@ behavior."
 ;;;_  : Version
 ;;;_   = allout-version
 (defvar allout-version
-  (let ((rcs-rev "$Revision: 1.45 $"))
+  (let ((rcs-rev "$Revision: 1.46 $"))
     (condition-case err
         (save-match-data
           (string-match "Revision: \\([0-9]+\\.[0-9]+\\)" rcs-rev)
@@ -3015,9 +3015,9 @@ Third arg NUMBER-CONTROL can force the prefix to or away from
 numbered form.  It has effect only if `allout-numbered-bullet' is
 non-nil and soliciting was not explicitly invoked (via first arg).
 Its effect, numbering or denumbering, then depends on the setting
-of the forth arg, INDEX.
+of the fourth arg, INDEX.
 
-If NUMBER-CONTROL is non-nil and forth arg INDEX is nil, then the
+If NUMBER-CONTROL is non-nil and fourth arg INDEX is nil, then the
 prefix of the topic is forced to be non-numbered.  Null index and
 non-nil NUMBER-CONTROL forces denumbering.  Non-nil INDEX (and
 non-nil NUMBER-CONTROL) forces a numbered-prefix form.  If non-nil
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 0cff5e5a21f..beac1f39005 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -90,7 +90,7 @@
   (mapcar 'require '(info dired reporter)))
 
 (defvar desktop-file-version "206"
-  "Verion number of desktop file format.
+  "Version number of desktop file format.
 Written into the desktop file and used at desktop read to provide
 backward compatibility.")
 
@@ -163,7 +163,7 @@ May e.g. be used to show a dired buffer."
   :group 'desktop)
 
 (defcustom desktop-after-read-hook nil
-  "Normal hook run after a sucessful `desktop-read'.
+  "Normal hook run after a successful `desktop-read'.
 May e.g. be used to show a buffer list."
   :type 'hook
   :group 'desktop)
@@ -212,8 +212,7 @@ to the value obtained by evaluateing FORM."
 ;; Maintained for backward compatibility
 (defcustom desktop-clear-preserve-buffers nil
   "*List of buffer names that `desktop-clear' should not delete.
-This variable is maintained for backward compatibility only.  Use
-`desktop-clear-preserve-buffers-regexp' instead."
+This variable is maintained for backward compatibility only."
   :type '(repeat string)
   :group 'desktop)
 (make-obsolete-variable 'desktop-clear-preserve-buffers
@@ -349,9 +348,9 @@ this table."
   "Hooks run after all buffers are loaded; intended for internal use.")
 
 ;; ----------------------------------------------------------------------------
-(defun desktop-truncate (l n)
+(defun desktop-truncate (list n)
   "Truncate LIST to at most N elements destructively."
-  (let ((here (nthcdr (1- n) l)))
+  (let ((here (nthcdr (1- n) list)))
     (if (consp here)
         (setcdr here nil))))
 
@@ -424,22 +423,22 @@ is nil, ask the user where to save the desktop."
       value)))
 
 ;; ----------------------------------------------------------------------------
-(defun desktop-internal-v2s (val)
+(defun desktop-internal-v2s (value)
   "Convert VALUE to a pair (QUOTE . TXT); (eval (read TXT)) gives VALUE.
 TXT is a string that when read and evaluated yields value.
 QUOTE may be `may' (value may be quoted),
 `must' (values must be quoted), or nil (value may not be quoted)."
   (cond
-   ((or (numberp val) (null val) (eq t val))
-    (cons 'may (prin1-to-string val)))
-   ((stringp val)
-    (let ((copy (copy-sequence val)))
+   ((or (numberp value) (null value) (eq t value))
+    (cons 'may (prin1-to-string value)))
+   ((stringp value)
+    (let ((copy (copy-sequence value)))
       (set-text-properties 0 (length copy) nil copy)
       ;; Get rid of text properties because we cannot read them
       (cons 'may (prin1-to-string copy))))
-   ((symbolp val)
-    (cons 'must (prin1-to-string val)))
-   ((vectorp val)
+   ((symbolp value)
+    (cons 'must (prin1-to-string value)))
+   ((vectorp value)
     (let* ((special nil)
            (pass1 (mapcar
                    (lambda (el)
@@ -447,7 +446,7 @@ QUOTE may be `may' (value may be quoted),
                        (if (null (car res))
                            (setq special t))
                        res))
-                   val)))
+                   value)))
       (if special
           (cons nil (concat "(vector "
                             (mapconcat (lambda (el)
@@ -458,8 +457,8 @@ QUOTE may be `may' (value may be quoted),
                                        " ")
                             ")"))
         (cons 'may (concat "[" (mapconcat 'cdr pass1 " ") "]")))))
-   ((consp val)
-    (let ((p val)
+   ((consp value)
+    (let ((p value)
           newlist
           use-list*
           anynil)
@@ -489,13 +488,13 @@ QUOTE may be `may' (value may be quoted),
                         ")"))
         (cons 'must
               (concat "(" (mapconcat 'cdr newlist " ") ")")))))
-   ((subrp val)
+   ((subrp value)
     (cons nil (concat "(symbol-function '"
-                      (substring (prin1-to-string val) 7 -1)
+                      (substring (prin1-to-string value) 7 -1)
                       ")")))
-   ((markerp val)
-    (let ((pos (prin1-to-string (marker-position val)))
-          (buf (prin1-to-string (buffer-name (marker-buffer val)))))
+   ((markerp value)
+    (let ((pos (prin1-to-string (marker-position value)))
+          (buf (prin1-to-string (buffer-name (marker-buffer value)))))
       (cons nil (concat "(let ((mk (make-marker)))"
                         " (add-hook 'desktop-delay-hook"
                         " (list 'lambda '() (list 'set-marker mk "
@@ -504,12 +503,12 @@ QUOTE may be `may' (value may be quoted),
     (cons 'may "\"Unprintable entity\""))))
 
 ;; ----------------------------------------------------------------------------
-(defun desktop-value-to-string (val)
+(defun desktop-value-to-string (value)
   "Convert VALUE to a string that when read evaluates to the same value.
 Not all types of values are supported."
   (let* ((print-escape-newlines t)
          (float-output-format nil)
-         (quote.txt (desktop-internal-v2s val))
+         (quote.txt (desktop-internal-v2s value))
          (quote (car quote.txt))
          (txt (cdr quote.txt)))
     (if (eq quote 'must)
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index 8e290553a61..b164588d8f1 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -551,7 +551,7 @@ version of Emacs."
         (t (mark))))
 
 (defun tpu-set-mark (pos)
-  "TPU-edt verion of the `set-mark' function.
+  "TPU-edt version of the `set-mark' function.
 Sets the mark at POS and activates the region according to the
 current version of Emacs."
   (set-mark pos)
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index 6725f96cc84..fb539487204 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -242,7 +242,7 @@ The options are `begin', `after' or `end'."
 
 (defun eshell-smart-maybe-jump-to-end ()
   "Jump to the end of the input buffer.
-This is done whenever a command exits sucessfully and both the command
+This is done whenever a command exits successfully and both the command
 and the end of the buffer are still visible."
   (when (and (= eshell-last-command-status 0)
              (if (eq eshell-review-quick-commands 'not-even-short-output)
diff --git a/lisp/files.el b/lisp/files.el
index 3b178af029b..a63aea99114 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -855,7 +855,9 @@ do not put this buffer at the front of the list of recently selected ones.
 This uses the function `display-buffer' as a subroutine; see its
 documentation for additional customization information."
   (interactive "BSwitch to buffer in other window: ")
-  (let ((pop-up-windows t))
+  (let ((pop-up-windows t)
+        ;; Don't let these interfere.
+        same-window-buffer-names same-window-regexps)
     (pop-to-buffer buffer t norecord)))
 
 (defun switch-to-buffer-other-frame (buffer &optional norecord)
@@ -866,7 +868,8 @@ do not put this buffer at the front of the list of recently selected ones.
 This uses the function `display-buffer' as a subroutine; see its
 documentation for additional customization information."
   (interactive "BSwitch to buffer in other frame: ")
-  (let ((pop-up-frames t))
+  (let ((pop-up-frames t)
+        same-window-buffer-names same-window-regexps)
     (pop-to-buffer buffer t norecord)
     (raise-frame (window-frame (selected-window)))))
 
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 4deacb9e87f..ad69cdd960c 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1890,10 +1890,13 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
                     "condition-case" "track-mouse"
                     "eval-after-load" "eval-and-compile" "eval-when-compile"
                     "eval-when"
+                    "with-category-table"
                     "with-current-buffer" "with-electric-help"
+                    "with-local-quit" "with-no-warnings"
                     "with-output-to-string" "with-output-to-temp-buffer"
+                    "with-selected-window" "with-syntax-table"
                     "with-temp-buffer" "with-temp-file" "with-temp-message"
-                    "with-timeout") t)
+                    "with-timeout" "with-timeout-handler") t)
              "\\>")
             1)
       ;;
@@ -1908,7 +1911,13 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
                     "proclaim" "declaim" "declare" "symbol-macrolet"
                     "lexical-let" "lexical-let*" "flet" "labels" "compiler-let"
                     "destructuring-bind" "macrolet" "tagbody" "block"
-                    "return" "return-from") t)
+                    "return" "return-from"
+                    "with-accessors" "with-compilation-unit"
+                    "with-condition-restarts" "with-hash-table-iterator"
+                    "with-input-from-string" "with-open-file"
+                    "with-open-stream" "with-output-to-string"
+                    "with-package-iterator" "with-simple-restart"
+                    "with-slots" "with-standard-io-syntax") t)
              "\\>")
             1)
       ;;
@@ -1933,8 +1942,11 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
       ;; ELisp and CLisp `&' keywords as types.
       '("\\&\\sw+\\>" . font-lock-type-face)
       ;;
-      ;; CL `with-' and `do-' constructs
-      '("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face)
+;;; This is too general -- rms.
+;;; A user complained that he has functions whose names start with `do'
+;;; and that they get the wrong color.
+;;;      ;; CL `with-' and `do-' constructs
+;;;      '("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face)
       )))
   "Gaudy level highlighting for Lisp modes.")
 
diff --git a/lisp/gdb-ui.el b/lisp/gdb-ui.el
index 0040fb47f6e..85b03fbce40 100644
--- a/lisp/gdb-ui.el
+++ b/lisp/gdb-ui.el
@@ -1087,7 +1087,6 @@ static char *magick[] = {
   (interactive "e")
   (mouse-minibuffer-check event)
   (let ((posn (event-end event)))
-    (message "pt=%S posn=%S" (posn-point posn) posn)
     (if (numberp (posn-point posn))
         (with-selected-window (posn-window posn)
           (save-excursion
@@ -1808,32 +1807,6 @@ BUFFER nil or omitted means use the current buffer."
                             left-margin-width
                             right-margin-width))))
 
-(defun gdb-put-arrow (putstring pos)
-  "Put arrow string PUTSTRING in the left margin in front of POS
-in the current buffer.  PUTSTRING is displayed by putting an
-overlay into the current buffer with a `before-string'
-\"gdb-arrow\" that has a `display' property whose value is
-PUTSTRING. POS may be an integer or marker."
-  (let ((gdb-string "gdb-arrow")
-        (buffer (current-buffer)))
-    (let ((overlay (make-overlay pos pos buffer))
-          (prop (list (list 'margin 'left-margin) putstring)))
-      (put-text-property 0 (length gdb-string) 'display prop gdb-string)
-      (overlay-put overlay 'put-arrow t)
-      (overlay-put overlay 'before-string gdb-string))))
-
-(defun gdb-remove-arrow (&optional buffer)
-  "Remove arrow in BUFFER.
-Remove only images that were put in BUFFER with calls to `put-arrow'.
-BUFFER nil or omitted means use the current buffer."
-  (unless buffer
-    (setq buffer (current-buffer)))
-  (let ((overlays (overlays-in (point-min) (point-max))))
-    (while overlays
-      (let ((overlay (car overlays)))
-        (when (overlay-get overlay 'put-arrow)
-          (delete-overlay overlay)))
-      (setq overlays (cdr overlays)))))
 
 ;;
 ;; Assembler buffer.
@@ -1850,16 +1823,20 @@ BUFFER nil or omitted means use the current buffer."
 
 (defun gdb-assembler-custom ()
   (let ((buffer (gdb-get-buffer 'gdb-assembler-buffer))
-        (gdb-arrow-position 1) (address) (flag))
+        (pos 1) (address) (flag))
     (with-current-buffer buffer
       (if (not (equal gdb-current-address "main"))
           (progn
-            (gdb-remove-arrow)
             (goto-char (point-min))
             (if (re-search-forward gdb-current-address nil t)
                 (progn
-                  (setq gdb-arrow-position (point))
-                  (gdb-put-arrow "=>" (point))))))
+                  (setq pos (point))
+                  (setq gdb-overlay-arrow-string "=>")
+                  (beginning-of-line)
+                  (or gdb-overlay-arrow-position
+                      (setq gdb-overlay-arrow-position (make-marker)))
+                  (set-marker gdb-overlay-arrow-position
+                              (point) (current-buffer))))))
       ;; remove all breakpoint-icons in assembler buffer before updating.
       (gdb-remove-breakpoint-icons (point-min) (point-max)))
     (with-current-buffer (gdb-get-buffer 'gdb-breakpoints-buffer)
@@ -1880,7 +1857,7 @@ BUFFER nil or omitted means use the current buffer."
                   (if (re-search-forward address nil t)
                       (gdb-put-breakpoint-icon (eq flag ?y))))))))
     (if (not (equal gdb-current-address "main"))
-        (set-window-point (get-buffer-window buffer) gdb-arrow-position))))
+        (set-window-point (get-buffer-window buffer) pos))))
 
 (defvar gdb-assembler-mode-map
   (let ((map (make-sparse-keymap)))
@@ -1893,6 +1870,8 @@ BUFFER nil or omitted means use the current buffer."
 \\{gdb-assembler-mode-map}"
   (setq major-mode 'gdb-assembler-mode)
   (setq mode-name "Machine")
+  (push 'gdb-overlay-arrow-position overlay-arrow-variable-list)
+  (setq gdb-overlay-arrow-position nil)
   (setq fringes-outside-margins t)
   (setq buffer-read-only t)
   (use-local-map gdb-assembler-mode-map)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 60679f8250a..7fa3fb61ce5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * message.el (message-mode): Set comment-start-skip.
+
 2004-02-08  Andreas Schwab  <schwab@suse.de>
 
         * nnlistserv.el (nnlistserv-kk-wash-article): Fix paren nesting.
@@ -30,8 +34,8 @@
 
 2003-05-06  Jesper Harder  <harder@ifa.au.dk>
 
-        * gnus-cus.el (gnus-group-customize, gnus-score-parameters): Don't
-        quote nil and t in docstrings.
+        * gnus-cus.el (gnus-group-customize, gnus-score-parameters):
+        Don't quote nil and t in docstrings.
 
         * gnus-score.el (gnus-score-lower-thread): Likewise.
 
@@ -47,8 +51,7 @@
 
 2003-02-18  Juanma Barranquero  <lektu@terra.es>
 
-        * ietf-drums.el (ietf-drums-remove-whitespace): Fix character
-        constant.
+        * ietf-drums.el (ietf-drums-remove-whitespace): Fix character constant.
 
 2003-02-14  Juanma Barranquero  <lektu@terra.es>
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 8edb5142ddd..4c6284b6d85 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1,5 +1,5 @@
 ;;; message.el --- composing mail and news messages  -*- coding: iso-latin-1 -*-
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -1531,7 +1531,10 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
   (set (make-local-variable 'message-mime-part) 0)
   (message-setup-fill-variables)
   ;; Allow using comment commands to add/remove quoting.
-  (set (make-local-variable 'comment-start) message-yank-prefix)
+  (when message-yank-prefix
+    (set (make-local-variable 'comment-start) message-yank-prefix)
+    (set (make-local-variable 'comment-start-skip)
+         (concat "^" (regexp-quote message-yank-prefix) "[ \t]*")))
   ;;(when (fboundp 'mail-hist-define-keys)
   ;;  (mail-hist-define-keys))
   (if (featurep 'xemacs)
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index 3d01ed6d6b2..67a0af20359 100644
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -101,7 +101,7 @@ The value may be an integer or floating point number.
 If a timer is already active, there are two ways to make the new
 value take effect immediately.  After setting the value, you can
 first call `help-at-pt-cancel-timer' and then set a new timer
-with `help-at-pt-set-timer' .  Alternatively, you can set this
+with `help-at-pt-set-timer'.  Alternatively, you can set this
 variable through Custom.  This will not set a timer if none is
 active, but if one is already active, Custom will make it use the
 new value."
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 413344fc375..40e3c929c59 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -42,6 +42,8 @@
 
 ;;; Code:
 
+(require 'eldoc)
+
 ;;
 ;; vars here
 ;;
@@ -236,6 +238,13 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
 
     (add-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer nil t)
 
+    ;; Set a callback function for eldoc.
+    (set (make-variable-buffer-local 'eldoc-print-current-symbol-info-function)
+         'hexl-print-current-point-info)
+    (eldoc-add-command-completions "hexl-")
+    (eldoc-remove-command "hexl-save-buffer" 
+                          "hexl-current-address")
+
     (if hexl-follow-ascii (hexl-follow-ascii 1)))
   (run-hooks 'hexl-mode-hook))
 
@@ -361,9 +370,15 @@ Ask the user for confirmation."
                  (- current-column 41)
                (/ (- current-column  (/ current-column 5)) 2))))
     (when (interactive-p)
-      (message "Current address is %d" hexl-address))
+      (message "Current address is %d/0x%08x" hexl-address hexl-address))
     hexl-address))
 
+(defun hexl-print-current-point-info ()
+  "Return current hexl-address in string.
+This function is indented to be used as eldoc callback."
+  (let ((addr (hexl-current-address)))
+    (format "Current address is %d/0x%08x" addr addr)))
+
 (defun hexl-address-to-marker (address)
   "Return buffer position for ADDRESS."
   (interactive "nAddress: ")
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 6eecd623cfd..91a2c34870d 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -301,6 +301,7 @@ Default value, nil, means edit the string instead."
     ;; Nothing special for + because it matches at least once.
     (define-key map "*" 'isearch-*-char)
     (define-key map "?" 'isearch-*-char)
+    (define-key map "{" 'isearch-{-char)
     (define-key map "|" 'isearch-|-char)
 
     ;; Turned off because I find I expect to get the global definition--rms.
@@ -1186,21 +1187,30 @@ might return the position of the end of the line."
   (isearch-update))
 
 
+(defun isearch-{-char ()
+  "Handle \{ specially in regexps."
+  (interactive)
+  (isearch-*-char t))
+
 ;; *, ?, and | chars can make a regexp more liberal.
 ;; They can make a regexp match sooner or make it succeed instead of failing.
 ;; So go back to place last successful search started
 ;; or to the last ^S/^R (barrier), whichever is nearer.
 ;; + needs no special handling because the string must match at least once.
 
-(defun isearch-*-char ()
-  "Handle * and ? specially in regexps."
+(defun isearch-*-char (&optional want-backslash)
+  "Handle * and ? specially in regexps.
+When WANT-BACKSLASH is non-nil, do special handling for \{."
   (interactive)
   (if isearch-regexp
       (let ((idx (length isearch-string)))
         (while (and (> idx 0)
                     (eq (aref isearch-string (1- idx)) ?\\))
           (setq idx (1- idx)))
-        (when (= (mod (- (length isearch-string) idx) 2) 0)
+        ;; * and ? are special when not preceded by \.
+        ;; { is special when it is preceded by \.
+        (when (= (mod (- (length isearch-string) idx) 2)
+                 (if want-backslash 1 0))
           (setq isearch-adjusted t)
           ;; Get the isearch-other-end from before the last search.
           ;; We want to start from there,
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index 96a57b38f07..aecc87cf178 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -108,11 +108,15 @@ we expect to find and remove the wrapper characters =?ISO-8859-1?Q?....?=."
       (apply 'concat (nreverse (cons (substring string i) strings))))))
 
 ;;;###autoload
-(defun mail-unquote-printable-region (beg end &optional wrapper noerror)
+(defun mail-unquote-printable-region (beg end &optional wrapper noerror
+                                          unibyte)
   "Undo the \"quoted printable\" encoding in buffer from BEG to END.
 If the optional argument WRAPPER is non-nil,
 we expect to find and remove the wrapper characters =?ISO-8859-1?Q?....?=.
-If NOERROR is non-nil, return t if successful."
+If NOERROR is non-nil, return t if successful.
+If UNIBYTE is non-nil, insert converted characters as unibyte.
+That is useful if you are going to character code decoding afterward,
+as Rmail does."
   (interactive "r\nP")
   (let (failed)
     (save-match-data
@@ -131,13 +135,16 @@ If NOERROR is non-nil, return t if successful."
                   ((= (char-after (match-beginning 1)) ?=)
                    (replace-match "="))
                   ((match-beginning 2)
-                   (replace-match
-                    (make-string 1
-                                 (+ (* 16 (mail-unquote-printable-hexdigit
-                                           (char-after (match-beginning 2))))
-                                    (mail-unquote-printable-hexdigit
-                                     (char-after (1+ (match-beginning 2))))))
-                    t t))
+                   (let ((char (+ (* 16 (mail-unquote-printable-hexdigit
+                                         (char-after (match-beginning 2))))
+                                  (mail-unquote-printable-hexdigit
+                                   (char-after (1+ (match-beginning 2)))))))
+                     (if unibyte
+                         (progn
+                           (replace-match "")
+                           ;; insert-char will insert this as unibyte,
+                           (insert-char char 1))
+                       (replace-match (make-string 1 char) t t))))
                   (noerror
                    (setq failed t))
                   (t
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 4090749d83e..c890ae6e6a0 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1733,7 +1733,7 @@ It returns t if it got any new messages."
                    (if quoted-printable-header-field-end
                        (save-excursion
                          (unless
-                             (mail-unquote-printable-region header-end (point) nil t)
+                             (mail-unquote-printable-region header-end (point) nil t t)
                            (message "Malformed MIME quoted-printable message"))
                          ;; Change "quoted-printable" to "8bit",
                          ;; to reflect the decoding we just did.
@@ -1880,7 +1880,7 @@ It returns t if it got any new messages."
                  (if quoted-printable-header-field-end
                      (save-excursion
                        (unless
-                           (mail-unquote-printable-region header-end (point) nil t)
+                           (mail-unquote-printable-region header-end (point) nil t t)
                          
                          (message "Malformed MIME quoted-printable message"))
                        ;; Change "quoted-printable" to "8bit",
@@ -1917,7 +1917,10 @@ It returns t if it got any new messages."
                    (goto-char (point-min))
                    (while (search-forward "\n\^_" nil t); single char
                      (replace-match "\n^_")))); 2 chars: "^" and "_"
-               (or (bolp) (newline)) ; in case we lost the final newline.
+               ;; This is for malformed messages that don't end in newline.
+               ;; There shouldn't be any, but some users say occasionally
+               ;; there are some.
+               (or (bolp) (newline))
                (insert ?\^_)
                (setq last-coding-system-used nil)
                (or rmail-enable-mime
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index c44ea46243a..932f52204c5 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1,6 +1,6 @@
 ;;; sendmail.el --- mail sending commands for Emacs.  -*- byte-compile-dynamic: t -*-
 
-;; Copyright (C) 1985, 86, 92, 93, 94, 95, 96, 98, 2000, 2001, 2002, 2003
+;; Copyright (C) 1985, 86, 92, 93, 94, 95, 96, 98, 2000, 2001, 2002, 03, 2004
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -512,6 +512,9 @@ Turning on Mail mode runs the normal hooks `text-mode-hook' and
   ;; Allow using comment commands to add/remove quoting (this only does
   ;; anything if mail-yank-prefix is set to a non-nil value).
   (set (make-local-variable 'comment-start) mail-yank-prefix)
+  (if mail-yank-prefix
+      (set (make-local-variable 'comment-start-skip)
+           (concat "^" (regexp-quote mail-yank-prefix) "[ \t]*")))
   (make-local-variable 'adaptive-fill-regexp)
   (setq adaptive-fill-regexp
         (concat "[ \t]*[-[:alnum:]]+>+[ \t]*\\|"
diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el
index 92e837657f6..f9b90fbfc6a 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -196,6 +196,9 @@ If nil, point will always be placed at the beginning of the region."
 
 ;;=== User Command ========================================================
 
+(defvar mouse-sel-has-been-enabled nil
+  "Non-nil if Mouse Sel mode has been enabled at least once.")
+
 (defvar mouse-sel-original-bindings nil)
 (defvar mouse-sel-original-interprogram-cut-function nil)
 (defvar mouse-sel-original-interprogram-paste-function nil)
@@ -252,7 +255,8 @@ primary selection and region."
           (setq mouse-sel-original-interprogram-cut-function
                 interprogram-cut-function
                 mouse-sel-original-interprogram-paste-function
-                interprogram-paste-function)
+                interprogram-paste-function
+                mouse-sel-has-been-enabled t)
           (unless (eq mouse-sel-default-bindings 'interprogram-cut-paste)
             (setq interprogram-cut-function nil
                   interprogram-paste-function nil))))
@@ -261,10 +265,13 @@ primary selection and region."
     (remove-hook 'x-lost-selection-hooks 'mouse-sel-lost-selection-hook)
     (dolist (binding mouse-sel-original-bindings)
       (global-set-key (car binding) (cdr binding)))
-    (setq interprogram-cut-function
-          mouse-sel-original-interprogram-cut-function
-          interprogram-paste-function
-          mouse-sel-original-interprogram-paste-function)))
+    ;; Restore the old values of these variables,
+    ;; only if they were actually saved previously.
+    (if mouse-sel-has-been-enabled
+        (setq interprogram-cut-function
+              mouse-sel-original-interprogram-cut-function
+              interprogram-paste-function
+              mouse-sel-original-interprogram-paste-function))))
 
 ;;=== Internal Variables/Constants ========================================
 
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 5a25801458e..d590e8bb2a4 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -818,8 +818,8 @@ When called non-interactively, optional second argument NEW-WINDOW is
 used instead of `browse-url-new-window-flag'."
   (interactive (browse-url-interactive-arg "URL: "))
   ;; URL encode any `confusing' characters in the URL.  This needs to
-  ;; include at least commas; presumably also close parens.
-  (while (string-match "[,)]" url)
+  ;; include at least commas; presumably also close parens and dollars.
+  (while (string-match "[,)$]" url)
     (setq url (replace-match
                (format "%%%x" (string-to-char (match-string 0 url))) t t url)))
   (let* ((process-environment (browse-url-process-environment))
@@ -889,8 +889,8 @@ When called non-interactively, optional second argument NEW-WINDOW is
 used instead of `browse-url-new-window-flag'."
   (interactive (browse-url-interactive-arg "URL: "))
   ;; URL encode any `confusing' characters in the URL.  This needs to
-  ;; include at least commas; presumably also close parens.
-  (while (string-match "[,)]" url)
+  ;; include at least commas; presumably also close parens and dollars.
+  (while (string-match "[,)$]" url)
     (setq url (replace-match
                (format "%%%x" (string-to-char (match-string 0 url))) t t url)))
   (let* ((process-environment (browse-url-process-environment))
@@ -942,8 +942,8 @@ When called non-interactively, optional second argument NEW-WINDOW is
 used instead of `browse-url-new-window-flag'."
   (interactive (browse-url-interactive-arg "URL: "))
   ;; URL encode any `confusing' characters in the URL.  This needs to
-  ;; include at least commas; presumably also close parens.
-  (while (string-match "[,)]" url)
+  ;; include at least commas; presumably also close parens and dollars.
+  (while (string-match "[,)$]" url)
     (setq url (replace-match
                (format "%%%x" (string-to-char (match-string 0 url))) t t url)))
   (let* ((process-environment (browse-url-process-environment))
@@ -991,8 +991,8 @@ When called non-interactively, optional second argument NEW-WINDOW is
 used instead of `browse-url-new-window-flag'."
   (interactive (browse-url-interactive-arg "URL: "))
   ;; URL encode any `confusing' characters in the URL.  This needs to
-  ;; include at least commas; presumably also close parens.
-  (while (string-match "[,)]" url)
+  ;; include at least commas; presumably also close parens and dollars.
+  (while (string-match "[,)$]" url)
     (setq url (replace-match
                (format "%%%x" (string-to-char (match-string 0 url))) t t url)))
   (let* ((process-environment (browse-url-process-environment))
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 91943503f5e..1c9c0dfd4b6 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -1,6 +1,6 @@
 ;;; newcomment.el --- (un)comment regions of buffers
 
-;; Copyright (C) 1999,2000,2003  Free Software Foundation Inc.
+;; Copyright (C) 1999,2000,2003,2004  Free Software Foundation Inc.
 
 ;; Author: code extracted from Emacs-20's simple.el
 ;; Maintainer: Stefan Monnier <monnier@cs.yale.edu>
@@ -251,8 +251,10 @@ this function before any other, so the rest of the code can assume that
 the variables are properly set."
   (unless (and (not comment-start) noerror)
     (unless comment-start
-      (set (make-local-variable 'comment-start)
-           (read-string "No comment syntax is defined.  Use: ")))
+      (let ((cs (read-string "No comment syntax is defined.  Use: ")))
+        (if (zerop (length cs))
+            (error "No comment syntax defined")
+          (set (make-local-variable 'comment-start) cs))))
     ;; comment-use-syntax
     (when (eq comment-use-syntax 'undecided)
       (set (make-local-variable 'comment-use-syntax)
@@ -716,35 +718,9 @@ comment markers."
                 ;; Find the end of the comment.
                 (ept (progn
                        (goto-char spt)
-                       (unless
-                           (or
-                            (comment-forward)
-                            ;; Allow eob as comment-end instead of \n.
-                            (and
-                             (eobp)
-                             (let ((s1 (aref (syntax-table) (char-after spt)))
-                                   (s2 (aref (syntax-table)
-                                             (or (char-after (1+ spt)) 0)))
-                                   (sn (aref (syntax-table) ?\n))
-                                   (flag->b (car (string-to-syntax "> b")))
-                                   (flag-1b (car (string-to-syntax "  1b")))
-                                   (flag-2b (car (string-to-syntax "  2b"))))
-                               (cond
-                                ;; One-character comment-start terminated by
-                                ;; \n.
-                                ((and
-                                  (equal sn (string-to-syntax ">"))
-                                  (equal s1 (string-to-syntax "<")))
-                                 (insert-char ?\n 1)
-                                 t)
-                                ;; Two-character type b comment-start
-                                ;; terminated by \n.
-                                ((and
-                                  (= (logand (car sn) flag->b) flag->b)
-                                  (= (logand (car s1) flag-1b) flag-1b)
-                                  (= (logand (car s2) flag-2b) flag-2b))
-                                 (insert-char ?\n 1)
-                                 t)))))
+                       (unless (or (comment-forward)
+                                   ;; Allow non-terminated comments.
+                                   (eobp))
                          (error "Can't find the comment end"))
                        (point)))
                 (box nil)
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index 6fa47b9e97c..52989e4c9c6 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -1,6 +1,7 @@
 ;;; pcvs-info.el --- internal representation of a fileinfo entry
 
-;; Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000  Free Software Foundation, Inc.
+;; Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2004
+;;           Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
@@ -219,8 +220,8 @@ to confuse some users sometimes."
          (file (cvs-fileinfo->file fileinfo))
          (default-directory (file-name-as-directory (expand-file-name dir)))
          (files (directory-files "." nil
-                                 (concat "^" (regexp-quote cvs-bakprefix)
-                                         (regexp-quote file) "\\.")))
+                                 (concat "\\`" (regexp-quote cvs-bakprefix)
+                                         (regexp-quote file) "\\(\\.[0-9]+\\.[0-9]+\\)+\\'")))
          bf)
     (dolist (f files bf)
       (when (and (file-readable-p f)
diff --git a/lisp/printing.el b/lisp/printing.el
index a9c1a925c94..6694805fcbd 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -5,13 +5,13 @@
 
 ;; Author: Vinicius Jose Latorre <vinicius@cpqd.com.br>
 ;; Maintainer: Vinicius Jose Latorre <vinicius@cpqd.com.br>
-;; Time-stamp: <2004/02/26 00:43:07 vinicius>
+;; Time-stamp: <2004/02/29 23:18:15 vinicius>
 ;; Keywords: wp, print, PostScript
 ;; Version: 6.7.2
 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
 
 (defconst pr-version "6.7.2"
-  "printing.el, v 6.7.2 <2004/02/26 vinicius>
+  "printing.el, v 6.7.2 <2004/02/29 vinicius>
 
 Please send all bug fixes and enhancements to
         Vinicius Jose Latorre <vinicius@cpqd.com.br>
@@ -517,7 +517,7 @@ Please send all bug fixes and enhancements to
 ;;     5  |   Print                    >|---\ | |Despool... |  |
 ;;     6  |   Text Printer: name       >|-\ | | +-----------+  |
 ;;        +-----------------------------+ | | | +---------+   +------------+
-;; III 7  |[ ]Landscape                 | | | \-|Directory|   |   As Is... | Ia
+;; III 7  |[ ]Landscape                 | | | \-|Directory|   | No Prep... | Ia
 ;;     8  |[ ]Print Header              | | |   |Buffer   |   +------------+ Ib
 ;;     9  |[ ]Print Header Frame        | | |   |Region   |   |   name    >|- C
 ;;     10 |[ ]Line Number               | | |   +---------+   +------------+
@@ -581,8 +581,8 @@ Please send all bug fixes and enhancements to
 ;;
 ;;       NOTE 2: There are the following options for PostScript file
 ;;               processing:
-;;               Ia. Print the file *as is*, that is, send it directly to
-;;                   PostScript printer.
+;;               Ia. Print the file *No Preprocessing*, that is, send it
+;;                   directly to PostScript printer.
 ;;               Ib. PostScript utility processing selection.
 ;;                   See `pr-ps-utility-alist' and `pr-setting-database' for
 ;;                   documentation.
@@ -2415,7 +2415,7 @@ See `pr-ps-printer-alist'.")
           ["Other..." (pr-ps-mode-preview nil t)
            :keys "\\[pr-ps-mode-preview]"])
          ("File"
-          ["As Is..."  (call-interactively 'pr-ps-file-preview)
+          ["No Preprocessing..." (call-interactively 'pr-ps-file-preview)
            :keys "\\[pr-ps-file-preview]"
            :help "Preview PostScript file"]
           "--"
@@ -2470,7 +2470,7 @@ See `pr-ps-printer-alist'.")
           ["Other..." (pr-ps-mode-ps-print nil t)
            :keys "\\[pr-ps-mode-ps-print]"])
          ("File"
-          ["As Is..."  (call-interactively 'pr-ps-file-ps-print)
+          ["No Preprocessing..." (call-interactively 'pr-ps-file-ps-print)
            :keys "\\[pr-ps-file-ps-print]"
            :help "Send PostScript file to printer"]
           "--"
@@ -2624,7 +2624,7 @@ See `pr-ps-printer-alist'.")
           ["Other..." (pr-ps-mode-preview nil t)
            :keys "\\[pr-ps-mode-preview]"])
          ("File"
-          ["As Is..."  (call-interactively 'pr-ps-file-preview)
+          ["No Preprocessing..." (call-interactively 'pr-ps-file-preview)
            :keys "\\[pr-ps-file-preview]"]
           "--"
           ["PostScript Utility" pr-update-menus :active pr-ps-utility-alist]
@@ -2672,7 +2672,7 @@ See `pr-ps-printer-alist'.")
           ["Other..." (pr-ps-mode-ps-print nil t)
            :keys "\\[pr-ps-mode-ps-print]"])
          ("File"
-          ["As Is..."  (call-interactively 'pr-ps-file-ps-print)
+          ["No Preprocessing..." (call-interactively 'pr-ps-file-ps-print)
            :keys "\\[pr-ps-file-ps-print]"]
           "--"
           ["PostScript Utility" pr-update-menus :active pr-ps-utility-alist]
@@ -2861,7 +2861,7 @@ II  4  |   Printify                 >|-----\\ |File      >|--\\  +--------+
     5  |   Print                    >|---\\ | |Despool... |  |
     6  |   Text Printer: name       >|-\\ | | +-----------+  |
        +-----------------------------+ | | | +---------+   +------------+
-III 7  |[ ]Landscape                 | | | \\-|Directory|   |   As Is... | Ia
+III 7  |[ ]Landscape                 | | | \\-|Directory|   | No Prep... | Ia
     8  |[ ]Print Header              | | |   |Buffer   |   +------------+ Ib
     9  |[ ]Print Header Frame        | | |   |Region   |   |   name    >|- C
     10 |[ ]Line Number               | | |   +---------+   +------------+
@@ -2923,8 +2923,8 @@ I. PostScript printing:
               switch from gnus *Summary* buffer first.
 
       NOTE 2: There are the following options for PostScript file processing:
-              Ia. Print the file *as is*, that is, send it directly to
-                  PostScript printer.
+              Ia. Print the file *No Preprocessing*, that is, send it
+                  directly to PostScript printer.
               Ib. PostScript utility processing selection.
                   See `pr-ps-utility-alist' and `pr-setting-database' for
                   documentation.
@@ -3130,7 +3130,7 @@ The printing interface buffer has the following sections:
       NOTE 2: Don't forget to download and install the utilities declared on
               `pr-ps-utility-alist'.
 
-      * Use It AS-IS :
+      * No Preprocessing:
          If it's turned on, don't use the PostScript utility to preprocess the
          PostScript file before printing/previewing.
 
@@ -5752,9 +5752,8 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order."
                   (pr-choice-alist pr-ps-utility-alist)
                   "\n      PostScript Utility : "
                   "    ")
-  ;;    1c. PostScript File: Use It AS-IS
-  (pr-insert-toggle 'pr-i-ps-as-is " Use It ")
-  (pr-insert-italic "AS-IS"))
+  ;;    1c. PostScript File: No Preprocessing
+  (pr-insert-toggle 'pr-i-ps-as-is " No Preprocessing"))
 
 
 (defun pr-insert-section-2 ()
@@ -5882,7 +5881,8 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order."
   (pr-insert-toggle 'pr-print-using-ghostscript " Print via Ghostscript\n  ")
 
   ;; 4. Settings: Upside-Down           Page Parity
-  (pr-insert-toggle 'ps-print-upside-down " Upside-Down           ")
+  (pr-insert-toggle 'ps-print-upside-down " Upside-Down")
+  (pr-insert-italic "\n\nSelect Pages  :   " 2 14)
   (pr-insert-menu "Page Parity" 'ps-even-or-odd-pages
                   (mapcar #'(lambda (alist)
                               (list 'quote
diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el
index 148f23d2cab..0d9977d7084 100644
--- a/lisp/progmodes/ebnf-iso.el
+++ b/lisp/progmodes/ebnf-iso.el
@@ -5,7 +5,7 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/02/22 14:24:55 vinicius>
+;; Time-stamp: <2004/02/29 18:31:33 vinicius>
 ;; Keywords: wp, ebnf, PostScript
 ;; Version: 1.7
 
@@ -113,7 +113,8 @@
 ;; ISO EBNF accepts the characters given by <character> production above,
 ;; HORIZONTAL TAB (^I), VERTICAL TAB (^K), NEWLINE (^J or ^M) and FORM FEED
 ;; (^L), any other characters are illegal.  But ebnf2ps accepts also the
-;; european 8-bit accentuated characters (from \240 to \377) and underscore.
+;; european 8-bit accentuated characters (from \240 to \377) and underscore
+;; (_).
 ;;
 ;;
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el
index aae8906c384..5c98677c334 100644
--- a/lisp/progmodes/ebnf-otz.el
+++ b/lisp/progmodes/ebnf-otz.el
@@ -5,7 +5,7 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/02/22 14:24:37 vinicius>
+;; Time-stamp: <2004/02/29 18:40:14 vinicius>
 ;; Keywords: wp, ebnf, PostScript
 ;; Version: 1.0
 
@@ -38,6 +38,46 @@
 ;; See ebnf2ps.el for documentation.
 ;;
 ;;
+;; Optimizations
+;; -------------
+;;
+;;
+;; *To be implemented*:
+;;    left recursion:
+;;    A = B | A C B | A C D.   ==>   A = B {C (B | D)}*.
+;;
+;;    right recursion:
+;;    A = B | C A.             ==>   A = {C}* B.
+;;    A = B | D | C A | E A.   ==>   A = { C | E }* ( B | D ).
+;;
+;;    optional:
+;;    A = B | C B.             ==>   A = [C] B.
+;;    A = B | B C.             ==>   A = B [C].
+;;    A = D | B D | B C D.     ==>   A = [B [C]] D.
+;;
+;;
+;; *Already implemented*:
+;;    left recursion:
+;;    A = B | A C.             ==>   A = B {C}*.
+;;    A = B | A B.             ==>   A = {B}+.
+;;    A =   | A B.             ==>   A = {B}*.
+;;    A = B | A C B.           ==>   A = {B || C}+.
+;;    A = B | D | A C | A E.   ==>   A = ( B | D ) { C | E }*.
+;;
+;;    optional:
+;;    A = B | .                ==>   A = [B].
+;;    A =   | B .              ==>   A = [B].
+;;
+;;    factoration:
+;;    A = B C | B D.           ==>   A = B (C | D).
+;;    A = C B | D B.           ==>   A = (C | D) B.
+;;    A = B C E | B D E.       ==>   A = B (C | D) E.
+;;
+;;    none:
+;;    A = B | C | .            ==>   A = B | C | .
+;;    A = B | C A D.           ==>   A = B | C A D.
+;;
+;;
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;;; Code:
diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el
index 199e076ad61..ff097b5195d 100644
--- a/lisp/progmodes/ebnf-yac.el
+++ b/lisp/progmodes/ebnf-yac.el
@@ -5,7 +5,7 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/02/22 14:24:17 vinicius>
+;; Time-stamp: <2004/02/29 20:23:29 vinicius>
 ;; Keywords: wp, ebnf, PostScript
 ;; Version: 1.2.1
 
@@ -68,7 +68,7 @@
 ;; Name = "[A-Za-z][A-Za-z0-9_.]*".
 ;;
 ;; Comment = "/*" "any character, but the sequence \"*/\"" "*/"
-;;         | "//" "any character" "\\n".
+;;         | "//" "any character, but the newline \"\\n\"" "\\n".
 ;;
 ;;
 ;; In other words, a valid Name begins with a letter (upper or lower case)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index f765b37c76a..5635a1b17f7 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1,6 +1,6 @@
 ;;; sh-script.el --- shell-script editing commands for Emacs
 
-;; Copyright (C) 1993, 94, 95, 96, 97, 1999, 2001, 2003
+;; Copyright (C) 1993, 94, 95, 96, 97, 1999, 2001, 03, 2004
 ;;  Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
@@ -917,7 +917,7 @@ be indented (i.e. a <<- was used rather than just <<)."
           ;; Skip through one pattern
           (while
               (or (/= 0 (skip-syntax-backward "w_"))
-                  (/= 0 (skip-chars-backward "?[]*/\\"))
+                  (/= 0 (skip-chars-backward "?[]*@/\\"))
                   (and (sh-is-quoted-p (1- (point)))
                        (goto-char (- (point) 2)))
                   (when (memq (char-before) '(?\" ?\'))
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index e49d5f5d251..7cf9ec86f4a 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1,7 +1,7 @@
 ;;; ps-print.el --- print text from the buffer as PostScript
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003 Free Software Foundation, Inc.
+;; 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
 ;;      Jacques Duthen (was <duthen@cegelec-red.fr>)
@@ -10,12 +10,12 @@
 ;; Maintainer: Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
 ;;      Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Keywords: wp, print, PostScript
-;; Time-stamp: <2003/07/10 19:19:12 vinicius>
-;; Version: 6.6.2
+;; Time-stamp: <2004/02/29 00:07:55 vinicius>
+;; Version: 6.6.3
 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
 
-(defconst ps-print-version "6.6.2"
-  "ps-print.el, v 6.6.2 <2003/07/10 vinicius>
+(defconst ps-print-version "6.6.3"
+  "ps-print.el, v 6.6.3 <2004/02/29 vinicius>
 
 Vinicius's last change version -- this file may have been edited as part of
 Emacs without changes to the version number.  When reporting bugs, please also
@@ -1213,6 +1213,9 @@ Please send all bug fixes and enhancements to
 ;;
 ;; [vinicius] Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;;
+;;    20040229
+;;       `ps-time-stamp-yyyy-mm-dd', `ps-time-stamp-iso8601'
+;;
 ;;    20010619
 ;;       `ps-time-stamp-locale-default'
 ;;
@@ -1261,7 +1264,7 @@ Please send all bug fixes and enhancements to
 ;;
 ;; [keinichi] 19990509 Kein'ichi Handa <handa@etl.go.jp>
 ;;
-;; `ps-print-region-function'
+;;    `ps-print-region-function'
 ;;
 ;; [vinicius] Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;;
@@ -1274,7 +1277,7 @@ Please send all bug fixes and enhancements to
 ;;
 ;; [keinichi] 19980819 Kein'ichi Handa <handa@etl.go.jp>
 ;;
-;; Multi-byte buffer handling.
+;;    Multi-byte buffer handling.
 ;;
 ;; [vinicius] Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;;
@@ -1370,9 +1373,11 @@ Please send all bug fixes and enhancements to
 ;; Thanks to David X Callaway <dxc@xprt.net> for helping debugging PostScript
 ;; level 1 compatibility.
 ;;
-;; Thanks to Colin Marquardt <colin.marquardt@usa.alcatel.com> for upside-down,
-;; line number step, line number start and zebra stripe follow suggestions, and
-;; for XEmacs beta-tests.
+;; Thanks to Colin Marquardt <colin.marquardt@usa.alcatel.com> for:
+;;    - upside-down, line number step, line number start and zebra stripe
+;;      follow suggestions.
+;;    - `ps-time-stamp-yyyy-mm-dd' and `ps-time-stamp-iso8601' suggestion.
+;;    - and for XEmacs beta-tests.
 ;;
 ;; Thanks to Klaus Berndl <klaus.berndl@sdm.de> for user defined PostScript
 ;; prologue code suggestion, for odd/even printing suggestion and for
@@ -3111,7 +3116,9 @@ delimiters '(' and ')'.
 For symbols with bound functions, the function is called and should return a
 string to be inserted into the array.  For symbols with bound values, the value
 should be a string to be inserted into the array.  In either case, function or
-variable, the string value has PostScript string delimiters added to it."
+variable, the string value has PostScript string delimiters added to it.
+
+If symbols are unbounded, they are silently ignored."
   :type '(repeat (choice :menu-tag "Left Header"
                          :tag "Left Header"
                          string symbol))
@@ -3135,6 +3142,11 @@ There are the following basic functions implemented:
 
    `ps-time-stamp-mon-dd-yyyy'          Return date as \"Jun 18 2001\".
 
+   `ps-time-stamp-yyyy-mm-dd'           Return date as \"2001-06-18\" (ISO
+                                        date).
+
+   `ps-time-stamp-iso8601'              Alias for `ps-time-stamp-yyyy-mm-dd'.
+
 You can also create your own time stamp function by using `format-time-string'
 \(which see)."
   :type '(repeat (choice :menu-tag "Right Header"
@@ -3157,7 +3169,9 @@ string literals should be delimited with PostScript string delimiters '(' and
 For symbols with bound functions, the function is called and should return a
 string to be inserted into the array.  For symbols with bound values, the value
 should be a string to be inserted into the array.  In either case, function or
-variable, the string value has PostScript string delimiters added to it."
+variable, the string value has PostScript string delimiters added to it.
+
+If symbols are unbounded, they are silently ignored."
   :version "21.1"
   :type '(repeat (choice :menu-tag "Left Footer"
                          :tag "Left Footer"
@@ -3182,6 +3196,11 @@ There are the following basic functions implemented:
 
    `ps-time-stamp-mon-dd-yyyy'          Return date as \"Jun 18 2001\".
 
+   `ps-time-stamp-yyyy-mm-dd'           Return date as \"2001-06-18\" (ISO
+                                        date).
+
+   `ps-time-stamp-iso8601'              Alias for `ps-time-stamp-yyyy-mm-dd'.
+
 You can also create your own time stamp function by using `format-time-string'
 \(which see)."
   :version "21.1"
@@ -3694,6 +3713,15 @@ It can be retrieved with `(ps-get ALIST-SYM KEY)'."
   (format-time-string "%b %d %Y"))
 
 
+(defun ps-time-stamp-yyyy-mm-dd ()
+  "Return date as \"2001-06-18\" (ISO date)."
+  (format-time-string "%Y-%m-%d"))
+
+
+(defalias 'ps-time-stamp-iso8601 'ps-time-stamp-yyyy-mm-dd
+  "Alias for `ps-time-stamp-yyyy-mm-dd' (which see).")
+
+
 (defun ps-time-stamp-hh:mm:ss ()
   "Return time as \"17:28:31\"."
   (format-time-string "%T"))
@@ -6608,10 +6636,12 @@ If FACE is not a valid face name, it is used default face."
 (defun ps-kill-emacs-check ()
   (let (ps-buffer)
     (and (setq ps-buffer (get-buffer ps-spool-buffer-name))
+         (buffer-name ps-buffer)        ; check if it's not killed
          (buffer-modified-p ps-buffer)
          (y-or-n-p "Unprinted PostScript waiting; print now? ")
          (ps-despool))
     (and (setq ps-buffer (get-buffer ps-spool-buffer-name))
+         (buffer-name ps-buffer)        ; check if it's not killed
          (buffer-modified-p ps-buffer)
          (not (yes-or-no-p "Unprinted PostScript waiting; exit anyway? "))
          (error "Unprinted PostScript"))))
diff --git a/lisp/simple.el b/lisp/simple.el
index d3e189dbe13..1f710576fa9 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -739,11 +739,11 @@ to get different commands to edit and resubmit."
 This is used for all minibuffer input
 except when an alternate history list is specified.")
 (defvar minibuffer-history-sexp-flag nil
-  "Non-nil when doing history operations on the variable `command-history'.
-More generally, indicates that the history list being acted on
-contains expressions rather than strings.
-It is only valid if its value equals the current minibuffer depth,
-to handle recursive uses of the minibuffer.")
+  "Control whether history list elements are expressions or strings.
+If the value of this variable equals current minibuffer depth,
+they are expressions; otherwise they are strings.
+\(That convention is designed to do the right thing fora
+recursive uses of the minibuffer.)")
 (setq minibuffer-history-variable 'minibuffer-history)
 (setq minibuffer-history-position nil)
 (defvar minibuffer-history-search-history nil)
@@ -972,9 +972,13 @@ as an argument limits undo to changes within the current region."
   ;; another undo command will find the undo history empty
   ;; and will get another error.  To begin undoing the undos,
   ;; you must type some other command.
-  (setq this-command 'undo)
   (let ((modified (buffer-modified-p))
         (recent-save (recent-auto-save-p)))
+    ;; If we get an error in undo-start,
+    ;; the next command should not be a "consecutive undo".
+    ;; So set `this-command' to something other than `undo'.
+    (setq this-command 'undo-start)
+
     (unless (eq last-command 'undo)
       (setq undo-in-region
             (if transient-mark-mode mark-active (and arg (not (numberp arg)))))
@@ -983,6 +987,8 @@ as an argument limits undo to changes within the current region."
         (undo-start))
       ;; get rid of initial undo boundary
       (undo-more 1))
+    ;; If we got this far, the next command should be a consecutive undo. 
+    (setq this-command 'undo)
     ;; Check to see whether we're hitting a redo record, and if
     ;; so, ask the user whether she wants to skip the redo/undo pair.
     (let ((equiv (gethash pending-undo-list undo-equiv-table)))
@@ -2239,7 +2245,10 @@ even beep.)"
                           (save-excursion
                             (end-of-visible-line) (point))))
                      (if (or (save-excursion
-                               (skip-chars-forward " \t" end)
+                               ;; If trailing whitespace is visible,
+                               ;; don't treat it as nothing.
+                               (unless show-trailing-whitespace
+                                 (skip-chars-forward " \t" end))
                                (= (point) end))
                              (and kill-whole-line (bolp)))
                          (forward-visible-line 1)
diff --git a/lisp/sort.el b/lisp/sort.el
index 541f598e7a5..76559f17288 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -480,19 +480,30 @@ Use \\[untabify] to convert tabs to spaces before sorting."
       (setq col-end (max col-beg1 col-end1))
       (if (search-backward "\t" beg1 t)
           (error "sort-columns does not work with tabs -- use M-x untabify"))
-      (if (not (or (eq system-type 'vax-vms)
-                   (text-properties-at beg1)
-                   (< (next-property-change beg1 nil end1) end1)))
+      (if (not (or (memq system-type '(vax-vms windows-nt ms-dos))
+                   (let ((pos beg1) plist fontified)
+                     (catch 'found
+                       (while (< pos end1)
+                         (setq plist (text-properties-at pos))
+                         (setq fontified (plist-get plist 'fontified))
+                         (while (consp plist)
+                           (unless (or (eq (car plist) 'fontified)
+                                       (and (eq (car plist) 'face)
+                                            fontified))
+                             (throw 'found t))
+                           (setq plist (cddr plist)))
+                         (setq pos (next-property-change pos nil end1)))))))
           ;; Use the sort utility if we can; it is 4 times as fast.
-          ;; Do not use it if there are any properties in the region,
-          ;; since the sort utility would lose the properties.
+          ;; Do not use it if there are any non-font-lock properties
+          ;; in the region, since the sort utility would lose the
+          ;; properties.
           (let ((sort-args (list (if reverse "-rt\n" "-t\n")
                                  (concat "+0." (int-to-string col-start))
                                  (concat "-0." (int-to-string col-end)))))
             (when sort-fold-case
               (push "-f" sort-args))
             (apply #'call-process-region beg1 end1 "sort" t t nil sort-args))
-        ;; On VMS, use Emacs's own facilities.
+        ;; On VMS and ms-windows, use Emacs's own facilities.
         (save-excursion
           (save-restriction
             (narrow-to-region beg1 end1)
diff --git a/lisp/startup.el b/lisp/startup.el
index e79ea4407b1..3186c8a3c27 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -83,8 +83,8 @@ the startup message unless he personally acts to inhibit it."
 (defvar command-switch-alist nil
   "Alist of command-line switches.
 Elements look like (SWITCH-STRING . HANDLER-FUNCTION).
-HANDLER-FUNCTION receives switch name as sole arg;
-remaining command-line args are in the variable `command-line-args-left'.")
+HANDLER-FUNCTION receives the switch string as its sole argument;
+the remaining command-line args are in the variable `command-line-args-left'.")
 
 (defvar command-line-args-left nil
   "List of command-line args not yet processed.")
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 5aded4a85e8..7a794d67c5e 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1,6 +1,6 @@
 ;;; fill.el --- fill commands for Emacs
 
-;; Copyright (C) 1985,86,92,94,95,96,97,1999,2001,02,2003
+;; Copyright (C) 1985,86,92,94,95,96,97,1999,2001,02,03,2004
 ;;               Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -732,7 +732,7 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling."
       ;; Then try our syntax-aware filling code.
       (and fill-paragraph-handle-comment
            ;; Our code only handles \n-terminated comments right now.
-           comment-start comment-start-skip (equal comment-end "")
+           comment-start (equal comment-end "")
            (let ((fill-paragraph-handle-comment nil))
              (fill-comment-paragraph arg)))
       ;; If it all fails, default to the good ol' text paragraph filling.
@@ -822,7 +822,11 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
                              (looking-at comment-re)))
                  ;; We may have gone too far.  Go forward again.
                  (line-beginning-position
-                  (if (looking-at (concat ".*\\(?:" comment-start-skip "\\)"))
+                  (if (progn
+                        (goto-char
+                         (or (comment-search-forward (line-end-position) t)
+                             (point)))
+                        (looking-at comment-re))
                       1 2))))
            ;; Find the beginning of the first line past the region to fill.
            (save-excursion
diff --git a/lisp/xml.el b/lisp/xml.el
index dbd991f5583..61a79b37104 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -1,6 +1,6 @@
 ;;; xml.el --- XML parser
 
-;; Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 01, 03, 2004  Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot  <briot@gnat.com>
 ;; Maintainer: Mark A. Hershberger <mah@everybody.org>
@@ -109,10 +109,7 @@ CHILD-NAME should be a lower case symbol."
 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)))))
+  (cdr (assoc attribute (xml-node-attributes node))))
 
 (defsubst xml-get-attribute (node attribute)
   "Get from NODE the value of ATTRIBUTE.