Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-47

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-571
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-580
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-31
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-33
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-34
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-35
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-37
   Update from CVS

31 files changed, 637 insertions, 317 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a77f2206e58..187fc607c27 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,79 @@
+2004-09-28  Stefan  <monnier@iro.umontreal.ca>
+
+        * dired.el (dired-view-command-alist): Use more efficient regexps.
+        Remove dubious arguments.
+        (dired-align-file): New function.
+        (dired-insert-directory): Use it.
+        (dired-move-to-end-of-filename): Make the " -> " search more specific.
+        (dired-buffers-for-dir): Remove unused var `pattern'.
+
+2004-09-29  Kim F. Storm  <storm@cua.dk>
+
+        * progmodes/gdb-ui.el (breakpoint): Define as fringe bitmap.
+        (gdb-mouse-toggle-breakpoint): Fix fringe-bitmaps-at-pos usage.
+        (gdb-put-breakpoint-icon): Use breakpoint bitmap.
+
+        * fringe.el (fringe-bitmap-p): New macro.
+        (fringe-bitmaps): Add standard fringe bitmaps on load.
+
+2004-09-28  Matthew Mundell  <matt@mundell.ukfsn.org>  (tiny change)
+
+        * calendar/diary-lib.el (list-diary-entries): Save diary buffer
+        from diary display excursion.  Store diary buffer's point for
+        `simple-diary-display'.
+        (simple-diary-display): Set window point and start when
+        displaying buffer, to preserve point.
+
+2004-09-27  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * textmodes/enriched.el (enriched-translations): Replace defconst
+        with defvar.
+
+2004-09-26  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * printing.el: Doc fix.
+        (pr-version): New version number (6.8.1).
+        (pr-ps-file-using-ghostscript): Use make-temp-file instead of
+        make-temp-name.
+        (pr-delete-file): Check if file exists before deleting it.  Reported by
+        Lennart Borgman <lennart.borgman.073@student.lu.se>.
+
+2004-09-26  Stefan  <monnier@iro.umontreal.ca>
+
+        * term.el (term-display-table): New variable.
+        (term-mode): Use it.
+        (term-exec-1): Set the coding system to binary.
+        (term-emulate-terminal): Decode the string before inserting it.
+
+2004-09-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term.el (term-ansi-at-eval-string, term-ansi-default-fg)
+        (term-ansi-default-bg, term-ansi-current-temp): Delete unused
+        vars.
+        (map): Bind S-prior, S-next and S-insert.
+        (term-mode): Set `indent-tabs-mode' to nil.
+        (term-paste): New function to be bound to S-insert.
+        (term-send-del, term-send-backspace): Change the strings sent.
+        (term-termcap-format): Synchronyze with etc/e/eterm.ti.
+        (term-handle-colors-array): Fix handling of underline and reverse.
+        (term-handle-ansi-escape): Do not handle smcup/rmcup. Add
+        comments.
+        (term-erase-in-line): Fix comparison.
+        (term-emulate-terminal): Fix line wrap handling.
+        (term-start-output-log): Renamed from `term-set-output-log'.
+        (term-stop-output-log): Renamed from `term-stop-photo'.
+        (term-switch-to-alternate-sub-buffer): Comment out, unused.
+
+2004-09-25  Stefan  <monnier@iro.umontreal.ca>
+
+        * dired.el (dired-move-to-filename): Don't output a message if
+        raise-error is non-nil.  Fix return position and value.
+
+        * files.el (insert-directory): Obey --dired even with symlinks.
+
 2004-09-25  Lars Hansen  <larsh@math.ku.dk>
 
-        * ls-lisp.el (ls-lisp-format): Mark file names with poperty
+        * ls-lisp.el (ls-lisp-format): Mark file names with property
         dired-filename.
 
 2004-09-25  Kim F. Storm  <storm@cua.dk>
@@ -21,8 +94,8 @@
         it, and show completions.
         (ido-all-completions): Let bind ido-directory-too-big to nil.
         (ido-exhibit): Handle ido-directory-too-big.
-        (ido-read-buffer): Handle fallback to read-buffer.  Init
-        ido-directory-too-big.
+        (ido-read-buffer): Handle fallback to read-buffer.
+        Init ido-directory-too-big.
         (ido-read-file-name, ido-read-directory-name, ido-completing-read):
         Init ido-directory-too-big.
 
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 45bb3c0e4c0..945119f06df 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -4,6 +4,7 @@
 ;;           Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
+;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
 ;; Keywords: calendar
 
 ;; This file is part of GNU Emacs.
@@ -296,6 +297,8 @@ Only used if `diary-header-line-flag' is non-nil."
   :type    'sexp
   :version "21.4")
 
+(defvar diary-saved-point)              ; internal
+
 (defun list-diary-entries (date number)
   "Create and display a buffer containing the relevant lines in diary-file.
 The arguments are DATE and NUMBER; the entries selected are those
@@ -345,112 +348,116 @@ These hooks have the following distinct roles:
             (set-buffer diary-buffer)
             (or (verify-visited-file-modtime diary-buffer)
                 (revert-buffer t t))))
-        (setq file-glob-attrs (nth 1 (diary-pull-attrs nil "")))
-        (setq selective-display t)
-        (setq selective-display-ellipses nil)
-        (if diary-header-line-flag
-            (setq header-line-format diary-header-line-format))
-        (setq old-diary-syntax-table (syntax-table))
-        (set-syntax-table diary-syntax-table)
-        (unwind-protect
-            (let ((buffer-read-only nil)
-                  (diary-modified (buffer-modified-p))
-                  (mark (regexp-quote diary-nonmarking-symbol)))
-              ;; First and last characters must be ^M or \n for
-              ;; selective display to work properly
-              (goto-char (1- (point-max)))
-              (if (not (looking-at "\^M\\|\n"))
-                  (progn
-                    (goto-char (point-max))
-                    (insert "\^M")))
-              (goto-char (point-min))
-              (if (not (looking-at "\^M\\|\n"))
-                  (insert "\^M"))
-              (subst-char-in-region (point-min) (point-max) ?\n ?\^M t)
-              (calendar-for-loop i from 1 to number do
-                 (let ((d diary-date-forms)
-                       (month (extract-calendar-month date))
-                       (day (extract-calendar-day date))
-                       (year (extract-calendar-year date))
-                       (entry-found (list-sexp-diary-entries date)))
-                   (while d
-                     (let*
-                          ((date-form (if (equal (car (car d)) 'backup)
-                                          (cdr (car d))
-                                        (car d)))
-                          (backup (equal (car (car d)) 'backup))
-                          (dayname
-                           (format "%s\\|%s\\.?"
-                            (calendar-day-name date)
-                            (calendar-day-name date 'abbrev)))
-                          (monthname
-                           (format "\\*\\|%s\\|%s\\.?"
-                            (calendar-month-name month)
-                            (calendar-month-name month 'abbrev)))
-                          (month (concat "\\*\\|0*" (int-to-string month)))
-                          (day (concat "\\*\\|0*" (int-to-string day)))
-                          (year
-                           (concat
-                            "\\*\\|0*" (int-to-string year)
-                            (if abbreviated-calendar-year
-                                (concat "\\|" (format "%02d" (% year 100)))
-                              "")))
-                          (regexp
-                           (concat
-                            "\\(\\`\\|\^M\\|\n\\)" mark "?\\("
-                            (mapconcat 'eval date-form "\\)\\(")
-                            "\\)"))
-                          (case-fold-search t))
-                       (goto-char (point-min))
-                       (while (re-search-forward regexp nil t)
-                         (if backup (re-search-backward "\\<" nil t))
-                         (if (and (or (char-equal (preceding-char) ?\^M)
-                                      (char-equal (preceding-char) ?\n))
-                                  (not (looking-at " \\|\^I")))
-                             ;;  Diary entry that consists only of date.
-                             (backward-char 1)
-                           ;; Found a nonempty diary entry--make it visible and
-                           ;; add it to the list.
-                           (setq entry-found t)
-                           (let ((entry-start (point))
-                                 date-start temp)
-                             (re-search-backward "\^M\\|\n\\|\\`")
-                             (setq date-start (point))
-                             (re-search-forward "\^M\\|\n" nil t 2)
-                             (while (looking-at " \\|\^I")
-                               (re-search-forward "\^M\\|\n" nil t))
-                             (backward-char 1)
-                             (subst-char-in-region date-start
-                                (point) ?\^M ?\n t)
-                             (setq entry (buffer-substring entry-start (point))
-                                   temp (diary-pull-attrs entry file-glob-attrs)
-                                   entry (nth 0 temp))
-                             (add-to-diary-list
-                              date
-                              entry
-                              (buffer-substring
-                               (1+ date-start) (1- entry-start))
-                              (copy-marker entry-start) (nth 1 temp))))))
-                     (setq d (cdr d)))
-                   (or entry-found
-                       (not diary-list-include-blanks)
-                       (setq diary-entries-list
-                             (append diary-entries-list
-                                     (list (list date "" "" "" "")))))
-                   (setq date
-                         (calendar-gregorian-from-absolute
-                           (1+ (calendar-absolute-from-gregorian date))))
-                   (setq entry-found nil)))
-              (set-buffer-modified-p diary-modified))
-          (set-syntax-table old-diary-syntax-table))
-        (goto-char (point-min))
-        (run-hooks 'nongregorian-diary-listing-hook
-                   'list-diary-entries-hook)
-        (if diary-display-hook
-            (run-hooks 'diary-display-hook)
-          (simple-diary-display))
-        (run-hooks 'diary-hook)
-        diary-entries-list))))
+        ;; d-s-p is passed to the diary display function.
+        (let ((diary-saved-point (point)))
+          (save-excursion
+            (setq file-glob-attrs (nth 1 (diary-pull-attrs nil "")))
+            (setq selective-display t)
+            (setq selective-display-ellipses nil)
+            (if diary-header-line-flag
+                (setq header-line-format diary-header-line-format))
+            (setq old-diary-syntax-table (syntax-table))
+            (set-syntax-table diary-syntax-table)
+            (unwind-protect
+                (let ((buffer-read-only nil)
+                      (diary-modified (buffer-modified-p))
+                      (mark (regexp-quote diary-nonmarking-symbol)))
+                  ;; First and last characters must be ^M or \n for
+                  ;; selective display to work properly
+                  (goto-char (1- (point-max)))
+                  (if (not (looking-at "\^M\\|\n"))
+                      (progn
+                        (goto-char (point-max))
+                        (insert "\^M")))
+                  (goto-char (point-min))
+                  (if (not (looking-at "\^M\\|\n"))
+                      (insert "\^M"))
+                  (subst-char-in-region (point-min) (point-max) ?\n ?\^M t)
+                  (calendar-for-loop
+                   i from 1 to number do
+                   (let ((d diary-date-forms)
+                         (month (extract-calendar-month date))
+                         (day (extract-calendar-day date))
+                         (year (extract-calendar-year date))
+                         (entry-found (list-sexp-diary-entries date)))
+                     (while d
+                       (let*
+                           ((date-form (if (equal (car (car d)) 'backup)
+                                           (cdr (car d))
+                                         (car d)))
+                            (backup (equal (car (car d)) 'backup))
+                            (dayname
+                             (format "%s\\|%s\\.?"
+                                     (calendar-day-name date)
+                                     (calendar-day-name date 'abbrev)))
+                            (monthname
+                             (format "\\*\\|%s\\|%s\\.?"
+                                     (calendar-month-name month)
+                                     (calendar-month-name month 'abbrev)))
+                            (month (concat "\\*\\|0*" (int-to-string month)))
+                            (day (concat "\\*\\|0*" (int-to-string day)))
+                            (year
+                             (concat
+                              "\\*\\|0*" (int-to-string year)
+                              (if abbreviated-calendar-year
+                                  (concat "\\|" (format "%02d" (% year 100)))
+                                "")))
+                            (regexp
+                             (concat
+                              "\\(\\`\\|\^M\\|\n\\)" mark "?\\("
+                              (mapconcat 'eval date-form "\\)\\(")
+                              "\\)"))
+                            (case-fold-search t))
+                         (goto-char (point-min))
+                         (while (re-search-forward regexp nil t)
+                           (if backup (re-search-backward "\\<" nil t))
+                           (if (and (or (char-equal (preceding-char) ?\^M)
+                                        (char-equal (preceding-char) ?\n))
+                                    (not (looking-at " \\|\^I")))
+                               ;;  Diary entry that consists only of date.
+                               (backward-char 1)
+                             ;; Found a nonempty diary entry--make it
+                             ;; visible and add it to the list.
+                             (setq entry-found t)
+                             (let ((entry-start (point))
+                                   date-start temp)
+                               (re-search-backward "\^M\\|\n\\|\\`")
+                               (setq date-start (point))
+                               (re-search-forward "\^M\\|\n" nil t 2)
+                               (while (looking-at " \\|\^I")
+                                 (re-search-forward "\^M\\|\n" nil t))
+                               (backward-char 1)
+                               (subst-char-in-region date-start
+                                                     (point) ?\^M ?\n t)
+                               (setq entry (buffer-substring entry-start (point))
+                                     temp (diary-pull-attrs entry file-glob-attrs)
+                                     entry (nth 0 temp))
+                               (add-to-diary-list
+                                date
+                                entry
+                                (buffer-substring
+                                 (1+ date-start) (1- entry-start))
+                                (copy-marker entry-start) (nth 1 temp))))))
+                       (setq d (cdr d)))
+                     (or entry-found
+                         (not diary-list-include-blanks)
+                         (setq diary-entries-list
+                               (append diary-entries-list
+                                       (list (list date "" "" "" "")))))
+                     (setq date
+                           (calendar-gregorian-from-absolute
+                            (1+ (calendar-absolute-from-gregorian date))))
+                     (setq entry-found nil)))
+                  (set-buffer-modified-p diary-modified))
+              (set-syntax-table old-diary-syntax-table))
+            (goto-char (point-min))
+            (run-hooks 'nongregorian-diary-listing-hook
+                       'list-diary-entries-hook)
+            (if diary-display-hook
+                (run-hooks 'diary-display-hook)
+              (simple-diary-display))
+            (run-hooks 'diary-hook)
+            diary-entries-list))))))
 
 (defun include-other-diary-files ()
   "Include the diary entries from other diary files with those of diary-file.
@@ -528,8 +535,12 @@ changing the variable `diary-include-string'."
           (setq buffer-read-only t)
           (display-buffer holiday-buffer)
           (message  "No diary entries for %s" date-string))
-      (display-buffer (find-buffer-visiting
-                       (substitute-in-file-name diary-file)))
+      (with-current-buffer
+          (find-buffer-visiting (substitute-in-file-name diary-file))
+        (let ((window (display-buffer (current-buffer))))
+          ;; d-s-p is passed from list-diary-entries.
+          (set-window-point window diary-saved-point)
+          (set-window-start window (point-min))))
       (message "Preparing diary...done"))))
 
 (defface diary-button-face '((((type pc) (class color))
diff --git a/lisp/dired.el b/lisp/dired.el
index 43eec9408d4..96b2905337e 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -202,10 +202,11 @@ with the buffer narrowed to the listing."
 
 ;; Fixme: This should use mailcap.
 (defcustom dired-view-command-alist
-  '(("[.]\\(ps\\|ps_pages\\|eps\\)\\'" . "gv -spartan -color -watch %s")
-    ("[.]pdf\\'" . "xpdf %s")
-    ("[.]\\(jpe?g\\|gif\\|png\\)\\'" . "eog %s")
-    ("[.]dvi\\'" . "xdvi -sidemargin 0.5 -topmargin 1 %s"))
+  '(("\\.\\(ps\\|ps_pages\\|eps\\)\\'" . "gv %s")
+    ("\\.pdf\\'" . "xpdf %s")
+    ;; ("\\.pod\\'" . "perldoc %s")
+    ("\\.\\(jpe?g\\|gif\\|png\\)\\'" . "eog %s")
+    ("\\.dvi\\'" . "xdvi %s"))
   "Alist specifying how to view special types of files.
 Each element has the form (REGEXP . SHELL-COMMAND).
 When the file name matches REGEXP, `dired-view-file'
@@ -797,6 +798,112 @@ wildcards, erases the buffer, and builds the subdir-alist anew
         (dired-insert-directory dir dired-actual-switches
                                 file-list (not file-list) t)))))
 
+(defun dired-align-file (beg end)
+  "Align the fields of a file to the ones of surrounding lines.
+BEG..END is the line where the file info is located."
+  ;; Some versions of ls try to adjust the size of each field so as to just
+  ;; hold the largest element ("largest" in the current invocation, of
+  ;; course).  So when a single line is output, the size of each field is
+  ;; just big enough for that one output.  Thus when dired refreshes one
+  ;; line, the alignment if this line w.r.t the rest is messed up because
+  ;; the fields of that one line will generally be smaller.
+  ;;
+  ;; To work around this problem, we here add spaces to try and re-align the
+  ;; fields as needed.  Since this is purely aesthetic, it is of utmost
+  ;; importance that it doesn't mess up anything like
+  ;; `dired-move-to-filename'.  To this end, we limit ourselves to adding
+  ;; spaces only, and to only add them at places where there was already at
+  ;; least one space.  This way, as long as `dired-move-to-filename-regexp'
+  ;; always matches spaces with "*" or "+", we know we haven't made anything
+  ;; worse.  There is one spot where the exact number of spaces is
+  ;; important, which is just before the actual filename, so we refrain from
+  ;; adding spaces there (and within the filename as well, of course).
+  (save-excursion
+    (let (file file-col other other-col)
+      ;; Check the there is indeed a file, and that there is anoter adjacent
+      ;; file with which to align, and that additional spaces are needed to
+      ;; align the filenames.
+      (when (and (setq file (progn (goto-char beg)
+                                   (dired-move-to-filename nil end)))
+                 (setq file-col (current-column))
+                 (setq other
+                       (or (and (goto-char beg)
+                                (zerop (forward-line -1))
+                                (dired-move-to-filename))
+                           (and (goto-char beg)
+                                (zerop (forward-line 1))
+                                (dired-move-to-filename))))
+                 (setq other-col (current-column))
+                 (/= file other)
+                 ;; Make sure there is some work left to do.
+                 (> other-col file-col))
+        ;; If we've only looked at the line above, check to see if the line
+        ;; below exists as well and if so, align with the shorter one.
+        (when (and (< other file)
+                   (goto-char beg)
+                   (zerop (forward-line 1))
+                   (dired-move-to-filename))
+          (let ((alt-col (current-column)))
+            (when (< alt-col other-col)
+              (setq other-col alt-col)
+              (setq other (point)))))
+        ;; Keep positions uptodate when we insert stuff.
+        (if (> other file) (setq other (copy-marker other)))
+        (setq file (copy-marker file))
+        ;; Main loop.
+        (goto-char beg)
+        (while (and (> other-col file-col)
+                    (skip-chars-forward "^ ")
+                    ;; Skip the spaces, and make sure there's at least one.
+                    (> (skip-chars-forward " ") 0)
+                    ;; Don't touch anything just before (and after) the
+                    ;; beginning of the filename.
+                    (> file (point)))
+          ;; We're now just in front of a field, with a space behind us.
+          (let* ((curcol (current-column))
+                 ;; Nums are right-aligned.
+                 (num-align (looking-at "[0-9]"))
+                 ;; Let's look at the other line, in the same column: we
+                 ;; should be either near the end of the previous field, or
+                 ;; in the space between that field and the next.
+                 ;; [ Of course, it's also possible that we're already within
+                 ;; the next field or even past it, but that's unlikely since
+                 ;; other-col > file-col. ]
+                 ;; Let's find the distance to the alignment-point (either
+                 ;; the beginning or the end of the next field, depending on
+                 ;; whether this field is left or right aligned).
+                 (align-pt-offset
+                  (save-excursion
+                    (goto-char other)
+                    (move-to-column curcol)
+                    (when (looking-at
+                           (concat
+                            (if (eq (char-before) ?\ ) " *" "[^ ]* *")
+                            (if num-align "[0-9][^ ]*")))
+                      (- (match-end 0) (match-beginning 0)))))
+                 ;; Now, the number of spaces to insert is align-pt-offset
+                 ;; minus the distance to the equivalent point on the
+                 ;; current line.
+                 (spaces
+                  (if (not num-align)
+                      align-pt-offset
+                    (and align-pt-offset
+                         (save-excursion
+                           (skip-chars-forward "^ ")
+                           (- align-pt-offset (- (current-column) curcol)))))))
+            (when (and spaces (> spaces 0))
+              (setq file-col (+ spaces file-col))
+              (if (> file-col other-col)
+                  (setq spaces (- spaces (- file-col other-col))))
+              (insert-char ?\s spaces)
+              ;; Let's just make really sure we did not mess up.
+              (unless (save-excursion
+                        (equal (dired-move-to-filename) (marker-position file)))
+                ;; Damn!  We messed up: let's revert the change.
+                (delete-char (- spaces))))))
+        (set-marker file nil)))))
+                         
+
 (defun dired-insert-directory (dir switches &optional file-list wildcard hdr)
   "Insert a directory listing of DIR, Dired style.
 Use SWITCHES to make the listings.
@@ -815,7 +922,10 @@ If HDR is non-nil, insert a header line with the directory name."
     ;; with the new value of dired-move-to-filename-regexp.
     (if file-list
         (dolist (f file-list)
-          (insert-directory f switches nil nil))
+          (let ((beg (point)))
+            (insert-directory f switches nil nil)
+            ;; Re-align fields, if necessary.
+            (dired-align-file beg (point))))
       (insert-directory dir switches wildcard (not wildcard)))
     ;; Quote certain characters, unless ls quoted them for us.
     (if (not (string-match "b" dired-actual-switches))
@@ -1762,6 +1872,8 @@ regardless of the language.")
 ;; Move to first char of filename on this line.
 ;; Returns position (point) or nil if no filename on this line."
 (defun dired-move-to-filename (&optional raise-error eol)
+  "Move to the beginning of the filename on the current line.
+Return the position of the beginning of the filename, or nil if none found."
   ;; This is the UNIX version.
   (or eol (setq eol (line-end-position)))
   (beginning-of-line)
@@ -1774,8 +1886,10 @@ regardless of the language.")
       (goto-char (match-end 0)))
      ((re-search-forward dired-permission-flags-regexp eol t)
       ;; Ha!  There *is* a file.  Our regexp-from-hell just failed to find it.
-      (funcall (if raise-error 'error 'message)
-               "Unrecognized line!  Check dired-move-to-filename-regexp"))
+      (if raise-error
+          (error "Unrecognized line!  Check dired-move-to-filename-regexp"))
+      (beginning-of-line)
+      nil)
      (raise-error
       (error "No file on this line")))))
 
@@ -1818,9 +1932,9 @@ regardless of the language.")
             (or no-error (error "No file on this line"))))
         ;; Move point to end of name:
         (if symlink
-            (if (search-forward " ->" eol t)
+            (if (search-forward " -> " eol t)
                 (progn
-                  (forward-char -3)
+                  (forward-char -4)
                   (and used-F
                        dired-ls-F-marks-symlinks
                        (eq (preceding-char) ?@) ;; did ls really mark the link?
@@ -1885,7 +1999,7 @@ You can then feed the file name(s) to other commands with \\[yank]."
 ;; As a side effect, killed dired buffers for DIR are removed from
 ;; dired-buffers.
   (setq dir (file-name-as-directory dir))
-  (let ((alist dired-buffers) result elt buf pattern)
+  (let ((alist dired-buffers) result elt buf)
     (while alist
       (setq elt (car alist)
             buf (cdr elt))
diff --git a/lisp/files.el b/lisp/files.el
index 962fd483c2c..aaed1395275 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4376,7 +4376,8 @@ normally equivalent short `-D' option is just passed on to
                   (while (< (point) end)
                     (let ((start (+ beg (read (current-buffer))))
                           (end (+ beg (read (current-buffer)))))
-                      (if (= (char-after end) ?\n)
+                      (if (memq (char-after end) '(?\n ?\ ))
+                          ;; End is followed by \n or by " -> ".
                           (put-text-property start end 'dired-filename t)
                         ;; It seems that we can't trust ls's output as to
                         ;; byte positions of filenames.
diff --git a/lisp/fringe.el b/lisp/fringe.el
index f52ecdf64d2..07c93d39f40 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -37,27 +37,29 @@
 
 ;; Standard fringe bitmaps
 
-(defconst no-fringe-bitmap 0)
-(defconst undef-fringe-bitmap 1)
-(defconst left-truncation-fringe-bitmap 2)
-(defconst right-truncation-fringe-bitmap 3)
-(defconst up-arrow-fringe-bitmap 4)
-(defconst down-arrow-fringe-bitmap 5)
-(defconst continued-line-fringe-bitmap 6)
-(defconst continuation-line-fringe-bitmap 7)
-(defconst overlay-arrow-fringe-bitmap 8)
-(defconst top-left-angle-fringe-bitmap 9)
-(defconst top-right-angle-fringe-bitmap 10)
-(defconst bottom-left-angle-fringe-bitmap 11)
-(defconst bottom-right-angle-fringe-bitmap 12)
-(defconst left-bracket-fringe-bitmap 13)
-(defconst right-bracket-fringe-bitmap 14)
-(defconst filled-box-cursor-fringe-bitmap 15)
-(defconst hollow-box-cursor-fringe-bitmap 16)
-(defconst hollow-square-fringe-bitmap 17)
-(defconst bar-cursor-fringe-bitmap 18)
-(defconst hbar-cursor-fringe-bitmap 19)
-(defconst empty-line-fringe-bitmap 20)
+(defmacro fringe-bitmap-p (symbol)
+  "Return non-nil if SYMBOL is a fringe bitmap."
+  `(get ,symbol 'fringe))
+
+(defvar fringe-bitmaps)
+
+(unless (get 'left-truncation 'fringe)
+  (let ((bitmaps '(left-truncation right-truncation
+                   up-arrow down-arrow
+                   continued-line continuation-line
+                   overlay-arrow
+                   top-left-angle top-right-angle
+                   bottom-left-angle bottom-right-angle
+                   left-bracket right-bracket
+                   filled-box-cursor hollow-box-cursor hollow-square
+                   bar-cursor hbar-cursor
+                   empty-line))
+        (bn 2))
+    (while bitmaps
+      (push (car bitmaps) fringe-bitmaps)
+      (put (car bitmaps) 'fringe bn)
+      (setq bitmaps (cdr bitmaps)
+            bn (1+ bn)))))
 
 
 ;; Control presence of fringes
@@ -228,7 +230,7 @@ SIDE must be the symbol `left' or `right'."
                         (window-fringes))
                0)
            (float (frame-char-width))))
-  
+
 (provide 'fringe)
 
 ;;; arch-tag: 6611ef60-0869-47ed-8b93-587ee7d3ff5d
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 60ad776347c..3cdda661e86 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,77 @@
+2004-09-28  Jesper Harder  <harder@ifa.au.dk>
+
+        * gnus-picon.el: Require cl.
+
+        * mml-sec.el (mml-signencrypt-style): Don't depend on Gnus.
+
+        * mml-smime.el: Require cl.  Autoload message-fetch-field.
+
+        * gnus-fun.el: Require gnus-ems and gnus-util.
+
+        * gnus-diary.el (gnus-diary-header-schedule): caddr -> car (cddr
+
+        * gnus-art.el (gnus-article-edit-mode): Define before first
+        reference.
+
+        * gnus.el (gnus-method-to-server): Move defsubst before first use.
+
+        * spam.el (spam-check-spamoracle, spam-spamoracle-learn): Fix
+        format string mismatch.
+        * nnml.el (nnml-request-set-mark, nnml-save-marks): do. 
+        * nnfolder.el (nnfolder-request-set-mark, nnfolder-save-marks): do.
+
+2004-09-27  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.el (gnus-version-number): Set to 5.11.
+
+2004-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-decode.el (mm-copy-to-buffer): Don't use set-buffer-multibyte.
+
+2004-09-26  Jesper Harder  <harder@ifa.au.dk>
+
+        * gnus-msg.el (gnus-post-news): Use blank Newsgroups line if
+        GROUP is a virtual group.
+
+        * mm-util.el (mm-charset-synonym-alist): Remove obsolete entries
+        for big5 and gb2312.
+        
+        * rfc2047.el (rfc2047-pad-base64): Deal with more cases of invalid
+        padding.
+
+        * mm-bodies.el (mm-7bit-chars): Don't include \r.       
+
+        * mml.el (mml-compute-boundary-1): Don't uncompress files.
+
+        * rfc2047.el (rfc2047-qp-or-base64): New function to reduce
+        dependencies.
+        (rfc2047-encode): Use it.
+        
+        * flow-fill.el: Typo.
+
+        * mml.el (mml-generate-mime-1): Don't use format=flowed with
+        inline PGP.
+
+        * gnus.el (gnus-getenv-nntpserver): Strip whitespace.
+
+        * gnus-cache.el (gnus-cache-save-buffers): Check if buffer is
+        alive.  Reported by Laurent Martelli <laurent@aopsys.com>.
+
+        * mm-util.el (mm-image-load-path): Handle nil in load-path.
+        From Christian Neukirchen <chneukirchen@yahoo.de>.
+
+        * html2text.el (html2text-replace-list): Add &amp; and &apos;.
+
+        * nnheader.el (nnheader-max-head-length): Increase to 8192.
+
+        * message.el (message-clone-locals): Clone sendmail and smtp
+        variables.
+
+2004-09-23  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-msg.el (gnus-configure-posting-styles): Narrow to headers
+        in `header' match.  Reported by Svend Tollak Munkejord.
+
 2004-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * mm-decode.el (mm-copy-to-buffer): Preserve the data's unibyteness.
diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el
index a22f2a5af07..8a8098727fe 100644
--- a/lisp/gnus/flow-fill.el
+++ b/lisp/gnus/flow-fill.el
@@ -1,4 +1,4 @@
-;;; flow-fill.el --- interprete RFC2646 "flowed" text
+;;; flow-fill.el --- interpret RFC2646 "flowed" text
 
 ;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 5544c28f967..d4dbe1319e0 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1464,6 +1464,8 @@ Initialized from `text-mode-syntax-table.")
 
 (defvar gnus-inhibit-hiding nil)
 
+(defvar gnus-article-edit-mode nil)
+
 ;;; Macros for dealing with the article buffer.
 
 (defmacro gnus-with-article-headers (&rest forms)
diff --git a/lisp/gnus/gnus-cache.el b/lisp/gnus/gnus-cache.el
index bc09b3a2368..99e77b18f68 100644
--- a/lisp/gnus/gnus-cache.el
+++ b/lisp/gnus/gnus-cache.el
@@ -125,9 +125,8 @@ it's not cached."
           (overview-file (gnus-cache-file-name
                           (car gnus-cache-buffer) ".overview")))
       ;; write the overview only if it was modified
-      (when (buffer-modified-p buffer)
-        (save-excursion
-          (set-buffer buffer)
+      (when (and (buffer-live-p buffer) (buffer-modified-p buffer))
+        (with-current-buffer buffer
           (if (> (buffer-size) 0)
               ;; Non-empty overview, write it to a file.
               (let ((coding-system-for-write
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index 120b812c209..e82d77fa58b 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -204,7 +204,7 @@ There are currently two built-in format functions:
      (let ((head (cdr (assoc (intern (format "X-Diary-%s" (car elt)))
                              headers))))
        (when head
-         (nndiary-parse-schedule-value head (cadr elt) (caddr elt)))))
+         (nndiary-parse-schedule-value head (cadr elt) (car (cddr elt))))))
    nndiary-headers))
 
 ;; #### NOTE: Gnus sometimes gives me a HEADER not corresponding to any
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index 087c30da5df..82282e084f7 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -26,8 +26,11 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)
-  (require 'mm-util))
+  (require 'cl))
+
+(require 'mm-util)
+(require 'gnus-ems)
+(require 'gnus-util)
 
 (defcustom gnus-x-face-directory (expand-file-name "x-faces" gnus-directory)
   "*Directory where X-Face PBM files are stored."
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index f986e451c02..33531e7f8a4 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -915,7 +915,9 @@ header line with the old Message-ID."
                      (not to-address)))
             ;; This is news.
             (if post
-                (message-news (or to-group group))
+                (message-news
+                 (or to-group
+                     (and (not (gnus-virtual-group-p pgroup)) group)))
               (set-buffer gnus-article-copy)
               (gnus-msg-treat-broken-reply-to)
               (message-followup (if (or newsgroup-p force-news)
@@ -1801,9 +1803,11 @@ this is a reply."
                 ;; Obsolete format of header match.
                 (and (gnus-buffer-live-p gnus-article-copy)
                      (with-current-buffer gnus-article-copy
-                       (let ((header (message-fetch-field (pop style))))
-                         (and header
-                              (string-match (pop style) header))))))
+                       (save-restriction
+                         (nnheader-narrow-to-headers)
+                         (let ((header (message-fetch-field (pop style))))
+                           (and header
+                                (string-match (pop style) header)))))))
                ((or (symbolp match)
                     (functionp match))
                 (cond
@@ -1819,9 +1823,11 @@ this is a reply."
                   ;; New format of header match.
                   (and (gnus-buffer-live-p gnus-article-copy)
                        (with-current-buffer gnus-article-copy
-                         (let ((header (message-fetch-field (nth 1 match))))
-                           (and header
-                                (string-match (nth 2 match) header))))))
+                         (save-restriction
+                           (nnheader-narrow-to-headers)
+                           (let ((header (message-fetch-field (nth 1 match))))
+                             (and header
+                                  (string-match (nth 2 match) header)))))))
                  (t
                   ;; This is a form to be evaled.
                   (eval match)))))
diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index dbb96333d75..817696ed974 100644
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -40,8 +40,9 @@
 ;;
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
-(require 'custom)
 (require 'gnus-art)
 
 ;;; User variables:
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 3b7c8c916d8..28ef2c22a15 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -282,7 +282,7 @@ is restarted, and sometimes reloaded."
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
-(defconst gnus-version-number "5.10.6"
+(defconst gnus-version-number "5.11"
   "Version number for this version of Gnus.")
 
 (defconst gnus-version (format "Gnus v%s" gnus-version-number)
@@ -1104,9 +1104,8 @@ Check the NNTPSERVER environment variable and the
       (and (file-readable-p gnus-nntpserver-file)
            (with-temp-buffer
              (insert-file-contents gnus-nntpserver-file)
-             (let ((name (buffer-string)))
-               (unless (string-match "\\`[ \t\n]*$" name)
-                 name))))))
+             (when (re-search-forward "[^ \t\n\r]+" nil t)
+               (match-string 0))))))
 
 (defcustom gnus-select-method
   (condition-case nil
@@ -3309,38 +3308,6 @@ that that variable is buffer-local to the summary buffers."
           (push (cons server result) gnus-server-method-cache))
         result)))
 
-(defsubst gnus-method-to-server (method)
-  (catch 'server-name
-    (setq method (or method gnus-select-method))
-
-    ;; Perhaps it is already in the cache.
-    (mapc (lambda (name-method)
-            (if (equal (cdr name-method) method)
-                (throw 'server-name (car name-method))))
-          gnus-server-method-cache)
-
-    (mapc
-     (lambda (server-alist)
-       (mapc (lambda (name-method)
-               (when (gnus-methods-equal-p (cdr name-method) method)
-                 (unless (member name-method gnus-server-method-cache)
-                   (push name-method gnus-server-method-cache))
-                 (throw 'server-name (car name-method))))
-             server-alist))
-     (let ((alists (list gnus-server-alist
-                         gnus-predefined-server-alist)))
-       (if gnus-select-method
-           (push (list (cons "native" gnus-select-method)) alists))
-       alists))
-
-    (let* ((name (if (member (cadr method) '(nil ""))
-                     (format "%s" (car method))
-                   (format "%s:%s" (car method) (cadr method))))
-           (name-method (cons name method)))
-      (unless (member name-method gnus-server-method-cache)
-        (push name-method gnus-server-method-cache))
-      name)))
-
 (defsubst gnus-server-get-method (group method)
   ;; Input either a server name, and extended server name, or a
   ;; select method, and return a select method.
diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el
index f2aefbef993..6f1ef3b0289 100644
--- a/lisp/gnus/html2text.el
+++ b/lisp/gnus/html2text.el
@@ -1,5 +1,5 @@
 ;;; html2text.el --- a simple html to plain text converter
-;; Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Joakim Hove <hove@phys.ntnu.no>
 
@@ -42,7 +42,8 @@
 (defvar html2text-format-single-element-list '(("hr" . html2text-clean-hr)))
 
 (defvar html2text-replace-list
-  '(("&nbsp;" . " ") ("&gt;" . ">") ("&lt;" . "<") ("&quot;" . "\""))
+  '(("&nbsp;" . " ") ("&gt;" . ">") ("&lt;" . "<") ("&quot;" . "\"")
+    ("&amp;" . "&") ("&apos;" . "'"))
   "The map of entity to text.
 
 This is an alist were each element is a dotted pair consisting of an
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 21c386b86ce..8e5edbc048a 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6685,7 +6685,7 @@ regexp VARSTR."
   (let ((locals (save-excursion
                   (set-buffer buffer)
                   (buffer-local-variables)))
-        (regexp "^gnus\\|^nn\\|^message\\|^user-mail-address"))
+        (regexp "^gnus\\|^nn\\|^message\\|^sendmail\\|^smtp\\|^user-mail-address"))
     (mapcar
      (lambda (local)
        (when (and (consp local)
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 40b920bb70d..ad2239a22b8 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -38,9 +38,16 @@
 (require 'rfc2047)
 (require 'mm-encode)
 
-;; 8bit treatment gets any char except: 0x32 - 0x7f, CR, LF, TAB, BEL,
+;; 8bit treatment gets any char except: 0x32 - 0x7f, LF, TAB, BEL,
 ;; BS, vertical TAB, form feed, and ^_
-(defvar mm-7bit-chars "\x20-\x7f\r\n\t\x7\x8\xb\xc\x1f")
+;;
+;; Note that CR is *not* included, as that would allow a non-paired CR
+;; in the body contrary to RFC 2822:
+;;
+;;   - CR and LF MUST only occur together as CRLF; they MUST NOT
+;;     appear independently in the body.
+
+(defvar mm-7bit-chars "\x20-\x7f\n\t\x7\x8\xb\xc\x1f")
 
 (defcustom mm-body-charset-encoding-alist
   '((iso-2022-jp . 7bit)
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index ff05393415d..51ec38dc387 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -623,14 +623,14 @@ Postpone undisplaying of viewers for types in
   "Copy the contents of the current buffer to a fresh buffer."
   (save-excursion
     (let ((obuf (current-buffer))
-          (multibyte enable-multibyte-characters)
           beg)
       (goto-char (point-min))
       (search-forward-regexp "^\n" nil t)
       (setq beg (point))
-      (set-buffer (generate-new-buffer " *mm*"))
-      ;; Preserve the data's unibyteness (for url-insert-file-contents).
-      (set-buffer-multibyte multibyte)
+      (set-buffer
+       ;; Preserve the data's unibyteness (for url-insert-file-contents).
+       (let ((default-enable-multibyte-characters (mm-multibyte-p)))
+         (generate-new-buffer " *mm*")))
       (insert-buffer-substring obuf beg)
       (current-buffer))))
 
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 55c3fd33bc2..3831e1a07ce 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -133,15 +133,9 @@ In XEmacs, also return non-nil if CS is a coding system object."
 
 (defvar mm-charset-synonym-alist
   `(
-    ;; Perfectly fine?  A valid MIME name, anyhow.
-    ,@(unless (mm-coding-system-p 'big5)
-       '((big5 . cn-big5)))
     ;; Not in XEmacs, but it's not a proper MIME charset anyhow.
     ,@(unless (mm-coding-system-p 'x-ctext)
        '((x-ctext . ctext)))
-    ;; Apparently not defined in Emacs 20, but is a valid MIME name.
-    ,@(unless (mm-coding-system-p 'gb2312)
-       '((gb2312 . cn-gb-2312)))
     ;; ISO-8859-15 is very similar to ISO-8859-1.  But it's _different_!
     ,@(unless (mm-coding-system-p 'iso-8859-15)
        '((iso-8859-15 . iso-8859-1)))
@@ -727,11 +721,12 @@ If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'."
 (defun mm-image-load-path (&optional package)
   (let (dir result)
     (dolist (path load-path (nreverse result))
-      (if (file-directory-p
-           (setq dir (concat (file-name-directory
-                              (directory-file-name path))
-                             "etc/" (or package "gnus/"))))
-          (push dir result))
+      (when (and path
+                 (file-directory-p
+                  (setq dir (concat (file-name-directory
+                                     (directory-file-name path))
+                                    "etc/" (or package "gnus/")))))
+        (push dir result))
       (push path result))))
 
 ;; Fixme: This doesn't look useful where it's used.
diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index c9f5cb80190..b8107364411 100644
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -113,7 +113,7 @@ You can also customize or set `mml-signencrypt-style-alist' instead."
             (setf (second style-item) style)
           ;; otherwise, just return the current value
           (second style-item))
-      (gnus-message 3 "Warning, attempt to set invalid signencrypt-style"))))
+      (message "Warning, attempt to set invalid signencrypt style"))))
 
 ;;; Security functions
 
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 596585afc72..3313d6a4118 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -25,9 +25,12 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'smime)
 (require 'mm-decode)
 (autoload 'message-narrow-to-headers "message")
+(autoload 'message-fetch-field "message")
 
 (defun mml-smime-sign (cont)
   (when (null smime-keys)
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index c8f1c030acc..1843cf2068d 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -449,6 +449,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
                     ;; actually are hard newlines in the text.
                     (let (use-hard-newlines)
                       (when (and (string= type "text/plain")
+                                 (not (string= (cdr (assq 'sign cont)) "pgp"))
                                  (or (null (assq 'format cont))
                                      (string= (cdr (assq 'format cont))
                                               "flowed"))
@@ -590,7 +591,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
           (insert-buffer-substring (cdr (assq 'buffer cont))))
          ((and (setq filename (cdr (assq 'filename cont)))
                (not (equal (cdr (assq 'nofile cont)) "yes")))
-          (mm-insert-file-contents filename))
+          (mm-insert-file-contents filename nil nil nil nil t))
          (t
           (insert (cdr (assq 'contents cont)))))
         (goto-char (point-min))
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 142202cb4d2..369631ce653 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -1174,7 +1174,7 @@ This command does not work if you use short group names."
       (let ((range (nth 0 action))
             (what  (nth 1 action))
             (marks (nth 2 action)))
-        (assert (or (eq what 'add) (eq what 'del)) t
+        (assert (or (eq what 'add) (eq what 'del)) nil
                 "Unknown request-set-mark action: %s" what)
         (dolist (mark marks)
           (setq nnfolder-marks (gnus-update-alist-soft
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 0ff82c69523..1b6ec636734 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -1,7 +1,7 @@
 ;;; nnheader.el --- header access macros for Gnus and its backends
 
 ;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996,
-;;        1997, 1998, 2000, 2001, 2002, 2003
+;;        1997, 1998, 2000, 2001, 2002, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -58,7 +58,7 @@ they will keep on jabbering all the time."
   :group 'gnus-server
   :type 'boolean)
 
-(defvar nnheader-max-head-length 4096
+(defvar nnheader-max-head-length 8192
   "*Max length of the head of articles.
 
 Value is an integer, nil, or t.  nil means read in chunks of a file
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index cb820b094c1..4a9cfd32943 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -923,7 +923,7 @@ Use the nov database for the current group if available."
       (let ((range (nth 0 action))
             (what  (nth 1 action))
             (marks (nth 2 action)))
-        (assert (or (eq what 'add) (eq what 'del)) t
+        (assert (or (eq what 'add) (eq what 'del)) nil
                 "Unknown request-set-mark action: %s" what)
         (dolist (mark marks)
           (setq nnml-marks (gnus-update-alist-soft
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index 978bec3c361..cbb5a1fc5b0 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -126,6 +126,25 @@ quoted-printable and base64 respectively.")
 ;;; Functions for encoding RFC2047 messages
 ;;;
 
+(defun rfc2047-qp-or-base64 ()
+  "Return the type with which to encode the buffer.
+This is either `base64' or `quoted-printable'."
+  (save-excursion
+    (let ((limit (min (point-max) (+ 2000 (point-min))))
+          (n8bit 0))
+      (goto-char (point-min))
+      (skip-chars-forward "\x20-\x7f\r\n\t" limit)
+      (while (< (point) limit)
+        (incf n8bit)
+        (forward-char 1)
+        (skip-chars-forward "\x20-\x7f\r\n\t" limit))
+      (if (or (< (* 6 n8bit) (- limit (point-min)))
+              ;; Don't base64, say, a short line with a single
+              ;; non-ASCII char when splitting parts by charset.
+              (= n8bit 1))
+          'quoted-printable
+        'base64))))
+
 (defun rfc2047-narrow-to-field ()
   "Narrow the buffer to the header on the current line."
   (beginning-of-line)
@@ -411,7 +430,7 @@ By default, the region is treated as containing addresses (see
                        ;; encoding, choose the one that's shorter.
                        (save-restriction
                          (narrow-to-region b e)
-                         (if (eq (mm-qp-or-base64) 'base64)
+                         (if (eq (rfc2047-qp-or-base64) 'base64)
                              'B
                            'Q))))
          (start (concat
@@ -720,11 +739,15 @@ decodable."
   ;; Be more liberal to accept buggy base64 strings. If
   ;; base64-decode-string accepts buggy strings, this function could
   ;; be aliased to identity.
-  (case (mod (length string) 4)
-    (0 string)
-    (1 string) ;; Error, don't pad it.
-    (2 (concat string "=="))
-    (3 (concat string "="))))
+  (if (= 0 (mod (length string) 4))
+      string
+    (when (string-match "=+$" string)
+      (setq string (substring string 0 (match-beginning 0))))
+    (case (mod (length string) 4)
+      (0 string)
+      (1 string) ;; Error, don't pad it.
+      (2 (concat string "=="))
+      (3 (concat string "=")))))
 
 (defun rfc2047-decode (charset encoding string)
   "Decode STRING from the given MIME CHARSET in the given ENCODING.
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 6fb99db157a..85534f3828c 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -1746,7 +1746,7 @@ REMOVE not nil, remove the ADDRESSES."
                   (goto-char (point-min))
                   (when (re-search-forward "^X-Spam: yes;" nil t)
                     spam-split-group))
-              (error "Error running spamoracle" status))))))))
+              (error "Error running spamoracle: %s" status))))))))
 
 (defun spam-spamoracle-learn (articles article-is-spam-p &optional unregister)
   "Run spamoracle in training mode."
@@ -1768,8 +1768,8 @@ REMOVE not nil, remove the ADDRESSES."
                            `("-f" ,spam-spamoracle-database
                              "add" ,arg)
                          `("add" ,arg)))))
-          (when (not (eq 0 status))
-            (error "Error running spamoracle" status)))))))
+          (unless (eq 0 status)
+            (error "Error running spamoracle: %s" status)))))))
 
 (defun spam-spamoracle-learn-ham (articles &optional unregister)
   (spam-spamoracle-learn articles nil unregister))
diff --git a/lisp/printing.el b/lisp/printing.el
index a406e09b8c0..3efb53111fd 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -5,13 +5,13 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/09/21 22:51:58 vinicius>
+;; Time-stamp: <2004/09/26 22:11:24 vinicius>
 ;; Keywords: wp, print, PostScript
-;; Version: 6.8
+;; Version: 6.8.1
 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
 
-(defconst pr-version "6.8"
-  "printing.el, v 6.8 <2004/09/21 vinicius>
+(defconst pr-version "6.8.1"
+  "printing.el, v 6.8.1 <2004/09/26 vinicius>
 
 Please send all bug fixes and enhancements to
         Vinicius Jose Latorre <viniciusjl@ig.com.br>
@@ -125,16 +125,16 @@ Please send all bug fixes and enhancements to
 ;; Novices (First Users)
 ;; ---------------------
 ;;
-;; First of all, take a glance of printing documentation only to have an idea
-;; of what `printing' is capable.
+;; First of all, see printing documentation only to get an idea of what
+;; `printing' is capable.
 ;;
 ;; Then try to set the variables: `pr-ps-name', `pr-ps-printer-alist',
 ;; `pr-txt-name', `pr-txt-printer-alist' and `pr-path-alist'.  These variables
 ;; are the main variables for printing processing.
 ;;
-;; Now, please, see these variables documentation more in deep.  You can do
-;; this by typing C-h v pr-ps-name RET (for example) if you already loaded
-;; printing package, or by browsing printing.el source file.
+;; Now, please, see these variables documentation deeper.  You can do this by
+;; typing C-h v pr-ps-name RET (for example) if you already loaded printing
+;; package, or by browsing printing.el source file.
 ;;
 ;; If the documentation isn't clear or if you find a way to improve the
 ;; documentation, please, send an email to maintainer.  All printing users
@@ -263,7 +263,8 @@ Please send all bug fixes and enhancements to
 ;;    in Windows.  The gsprint utility is faster than ghostscript to print
 ;;    monochrome PostScript.
 ;;
-;;    The efficiency is similar to print non-monochrome PostScript file.
+;;    To print non-monochrome PostScript file, the efficiency of ghostscript
+;;    is similar to gsprint.
 ;;
 ;;    Also the gsprint utility comes together with gsview distribution.
 ;;
@@ -3887,7 +3888,7 @@ image in a file with that name."
   (interactive (list (pr-ps-infile-preprint "Print preview ")))
   (and (stringp filename) (file-exists-p filename)
        (let* ((file (pr-expand-file-name filename))
-              (tempfile (pr-dosify-file-name (make-temp-name file))))
+              (tempfile (pr-dosify-file-name (make-temp-file file))))
          ;; gs use
          (pr-call-process pr-gs-command
                           (format "-sDEVICE=%s" pr-gs-device)
@@ -5221,7 +5222,8 @@ non-nil."
 
 
 (defun pr-delete-file (file)
-  (and pr-delete-temp-file (delete-file file)))
+  (and pr-delete-temp-file (file-exists-p file)
+       (delete-file file)))
 
 
 (defun pr-expand-file-name (filename)
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 1972074fdb1..612a2034e00 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1069,8 +1069,9 @@ static char *magick[] = {
 (defvar breakpoint-disabled-icon nil
   "Icon for disabled breakpoint in display margin")
 
-(defvar breakpoint-bitmap nil
-  "Bitmap for breakpoint in fringe")
+;; Bitmap for breakpoint in fringe
+(define-fringe-bitmap 'breakpoint
+  "\x3c\x7e\xff\xff\xff\xff\x7e\x3c")
 
 (defface breakpoint-enabled-bitmap-face
   '((t
@@ -1140,9 +1141,8 @@ static char *magick[] = {
           (save-excursion
             (goto-char (posn-point posn))
             (if (or (posn-object posn)
-                    (and breakpoint-bitmap
-                         (eq (car (fringe-bitmaps-at-pos (posn-point posn)))
-                             breakpoint-bitmap)))
+                    (eq (car (fringe-bitmaps-at-pos (posn-point posn)))
+                        'breakpoint))
                 (gud-remove nil)
               (gud-break nil)))))))
 
@@ -1831,11 +1831,7 @@ BUFFER nil or omitted means use the current buffer."
         (if (>= (car (window-fringes)) 8)
             (gdb-put-string
              nil (1+ start)
-             `(left-fringe
-               ,(or breakpoint-bitmap
-                    (setq breakpoint-bitmap
-                          (define-fringe-bitmap
-                            "\x3c\x7e\xff\xff\xff\xff\x7e\x3c")))
+             `(left-fringe breakpoint
                ,(if enabled
                     'breakpoint-enabled-bitmap-face
                   'breakpoint-disabled-bitmap-face)))
diff --git a/lisp/term.el b/lisp/term.el
index 7991e74c5e9..35bb74834b5 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1,6 +1,6 @@
 ;;; term.el --- general command interpreter in a window stuff
 
-;;; Copyright (C) 1988, 1990, 1992, 1994, 1995 Free Software Foundation, Inc.
+;;; Copyright (C) 1988, 1990, 1992, 1994, 1995, 2004 Free Software Foundation, Inc.
 
 ;; Author: Per Bothner <bothner@cygnus.com>
 ;; Based on comint mode written by: Olin Shivers <shivers@cs.cmu.edu>
@@ -676,7 +676,6 @@ Buffer local variable.")
 (defvar term-terminal-menu)
 
 ;;; Let's silence the byte-compiler -mm
-(defvar term-ansi-at-eval-string nil)
 (defvar term-ansi-at-host nil)
 (defvar term-ansi-at-dir nil)
 (defvar term-ansi-at-user nil)
@@ -692,9 +691,6 @@ Buffer local variable.")
 (defvar term-ansi-current-highlight 0)
 (defvar term-ansi-current-reverse 0)
 (defvar term-ansi-current-invisible 0)
-(defvar term-ansi-default-fg 0)
-(defvar term-ansi-default-bg 0)
-(defvar term-ansi-current-temp 0)
 
 ;;; Four should be enough, if you want more, just add. -mm
 (defvar term-terminal-more-parameters 0)
@@ -915,6 +911,9 @@ is buffer-local.")
     (define-key term-raw-map [backspace] 'term-send-backspace)
     (define-key term-raw-map [home] 'term-send-home)
     (define-key term-raw-map [end] 'term-send-end)
+    (define-key term-raw-map [S-prior] 'scroll-down)
+    (define-key term-raw-map [S-next] 'scroll-up)
+    (define-key term-raw-map [S-insert] 'term-paste)
     (define-key term-raw-map [prior] 'term-send-prior)
     (define-key term-raw-map [next] 'term-send-next)))
 
@@ -930,6 +929,27 @@ is buffer-local.")
 
 (put 'term-mode 'mode-class 'special)
 
+
+;;; Use this variable as a display table for `term-mode'.
+(defvar term-display-table
+  (let ((dt (or (copy-sequence standard-display-table)
+                (make-display-table)))
+        i)
+    ;; avoid changing the display table for ^J
+    (setq i 0) 
+    (while (< i 10)
+      (aset dt i (vector i))
+      (setq i (1+ i)))
+    (setq i 11) 
+    (while (< i 32)
+      (aset dt i (vector i))
+      (setq i (1+ i)))
+    (setq i 128)
+    (while (< i 256)
+      (aset dt i (vector i))
+      (setq i (1+ i)))
+    dt))
+
 (defun term-mode ()
   "Major mode for interacting with an inferior interpreter.
 The interpreter name is same as buffer name, sans the asterisks.
@@ -979,6 +999,9 @@ Entry to this mode runs the hooks on `term-mode-hook'."
   (setq major-mode 'term-mode)
   (setq mode-name "Term")
   (use-local-map term-mode-map)
+  ;; we do not want indent to sneak in any tabs
+  (setq indent-tabs-mode nil)
+  (setq buffer-display-table term-display-table)
   (make-local-variable 'term-home-marker)
   (setq term-home-marker (copy-marker 0))
   (make-local-variable 'term-saved-home-marker)
@@ -1182,6 +1205,11 @@ without any interpretation."
                                         ((eq arg '-) -1)
                                         (t (1- arg)))))))
 
+(defun term-paste ()
+  "Insert the last stretch of killed text at point."
+  (interactive)
+   (term-send-raw-string (current-kill 0)))
+
 ;; Which would be better:  "\e[A" or "\eOA"? readline accepts either.
 ;; For my configuration it's definitely better \eOA but YMMV. -mm
 ;; For example: vi works with \eOA while elm wants \e[A ...
@@ -1193,8 +1221,8 @@ without any interpretation."
 (defun term-send-end   () (interactive) (term-send-raw-string "\e[4~"))
 (defun term-send-prior () (interactive) (term-send-raw-string "\e[5~"))
 (defun term-send-next  () (interactive) (term-send-raw-string "\e[6~"))
-(defun term-send-del   () (interactive) (term-send-raw-string "\C-?"))
-(defun term-send-backspace  () (interactive) (term-send-raw-string "\C-H"))
+(defun term-send-del   () (interactive) (term-send-raw-string "\e[3~"))
+(defun term-send-backspace  () (interactive) (term-send-raw-string "\C-?"))
 
 (defun term-char-mode ()
   "Switch to char (\"raw\") sub-mode of term mode.
@@ -1364,14 +1392,15 @@ The main purpose is to get rid of the local keymap."
   "%s%s:li#%d:co#%d:cl=\\E[H\\E[J:cd=\\E[J:bs:am:xn:cm=\\E[%%i%%d;%%dH\
 :nd=\\E[C:up=\\E[A:ce=\\E[K:ho=\\E[H:pt\
 :al=\\E[L:dl=\\E[M:DL=\\E[%%dM:AL=\\E[%%dL:cs=\\E[%%i%%d;%%dr:sf=^J\
-:te=\\E[2J\\E[?47l\\E8:ti=\\E7\\E[?47h\
 :dc=\\E[P:DC=\\E[%%dP:IC=\\E[%%d@:im=\\E[4h:ei=\\E[4l:mi:\
 :so=\\E[7m:se=\\E[m:us=\\E[4m:ue=\\E[m:md=\\E[1m:mr=\\E[7m:me=\\E[m\
 :UP=\\E[%%dA:DO=\\E[%%dB:LE=\\E[%%dD:RI=\\E[%%dC\
 :kl=\\EOD:kd=\\EOB:kr=\\EOC:ku=\\EOA:kN=\\E[6~:kP=\\E[5~:@7=\\E[4~:kh=\\E[1~\
 :mk=\\E[8m:cb=\\E[1K:op=\\E[39;49m:Co#8:pa#64:AB=\\E[4%%dm:AF=\\E[3%%dm:cr=^M\
-:bl=^G:do=^J:le=^H:ta=^I:se=\E[27m:ue=\E24m:"
+:bl=^G:do=^J:le=^H:ta=^I:se=\E[27m:ue=\E24m\
+:kb=^?:kD=^[[3~:sc=\E7:rc=\E8:"
 ;;; : -undefine ic
+;;; don't define :te=\\E[2J\\E[?47l\\E8:ti=\\E7\\E[?47h\
   "termcap capabilities supported")
 
 ;;; This auxiliary function cranks up the process for term-exec in
@@ -1398,9 +1427,10 @@ The main purpose is to get rid of the local keymap."
         (process-connection-type t)
         ;; We should suppress conversion of end-of-line format.
         (inhibit-eol-conversion t)
-        ;; inhibit-eol-conversion doesn't seem to do the job, but this does.
-        (coding-system-for-read 'unknown-unix)
-        )
+        ;; The process's output contains not just chars but also binary
+        ;; escape codes, so we need to see the raw output.  We will have to
+        ;; do the decoding by hand on the parts that are made of chars.
+        (coding-system-for-read 'binary))
     (apply 'start-process name buffer
            "/bin/sh" "-c"
            (format "stty -nl echo rows %d columns %d sane 2>/dev/null;\
@@ -2691,7 +2721,12 @@ See `term-prompt-regexp'."
                    (if (not funny) (setq funny str-length))
                    (cond ((> funny i)
                           (cond ((eq term-terminal-state 1)
-                                 (term-move-columns 1)
+                                 ;; We are in state 1, we need to wrap
+                                 ;; around.  Go to the beginning of
+                                 ;; the next line and switch to state
+                                 ;; 0.
+                                 (term-down 1)
+                                 (term-move-columns (- (term-current-column)))
                                  (setq term-terminal-state 0)))
                           (setq count (- funny i))
                           (setq temp (- (+ (term-horizontal-column) count)
@@ -2700,6 +2735,7 @@ See `term-prompt-regexp'."
                                 ((> count temp) ;; Some chars fit.
                                  ;; This iteration, handle only what fits.
                                  (setq count (- count temp))
+                                 (setq temp 0)
                                  (setq funny (+ count i)))
                                 ((or (not (or term-pager-count
                                               term-scroll-with-delete))
@@ -2720,7 +2756,7 @@ See `term-prompt-regexp'."
                           ;; following point if not eob nor insert-mode.
                           (let ((old-column (current-column))
                                 columns pos)
-                            (insert (substring str i funny))
+                            (insert (decode-coding-string (substring str i funny) locale-coding-system))
                             (setq term-current-column (current-column)
                                   columns (- term-current-column old-column))
                             (when (not (or (eobp) term-insert-mode))
@@ -2739,7 +2775,7 @@ See `term-prompt-regexp'."
                                  (setq term-terminal-state 1)))
                           (setq i (1- funny)))
                          ((and (setq term-terminal-state 0)
-                               (eq char ?\^I)) ; TAB
+                               (eq char ?\^I)) ; TAB (terminfo: ht)
                           ;; FIXME:  Does not handle line wrap!
                           (setq count (term-current-column))
                           (setq count (+ count 8 (- (mod count 8))))
@@ -2766,7 +2802,7 @@ See `term-prompt-regexp'."
                           (if (not (and term-kill-echo-list
                                         (term-check-kill-echo-list)))
                               (term-down 1 t)))
-                         ((eq char ?\b)
+                         ((eq char ?\b)  ;; (terminfo: cub1)
                           (term-move-columns -1))
                          ((eq char ?\033) ; Escape
                           (setq term-terminal-state 2))
@@ -2816,13 +2852,13 @@ See `term-prompt-regexp'."
                          ((eq char ?M) ;; scroll reversed
                           (term-insert-lines 1)
                           (setq term-terminal-state 0))
-                         ((eq char ?7) ;; Save cursor
+                         ((eq char ?7) ;; Save cursor (terminfo: sc)
                           (term-handle-deferred-scroll)
                           (setq term-saved-cursor
                                 (cons (term-current-row)
                                       (term-horizontal-column)))
                           (setq term-terminal-state 0))
-                         ((eq char ?8) ;; Restore cursor
+                         ((eq char ?8) ;; Restore cursor (terminfo: rc)
                           (if term-saved-cursor
                               (term-goto (car term-saved-cursor)
                                          (cdr term-saved-cursor)))
@@ -2974,13 +3010,13 @@ See `term-prompt-regexp'."
    ((eq parameter 8)
     (setq term-ansi-current-invisible 1))
 
-;;; Reset reverse (i.e. terminfo rmso)
+;;; Reset underline (i.e. terminfo rmul)
    ((eq parameter 24)
-    (setq term-ansi-current-reverse 0))
+    (setq term-ansi-current-underline 0))
 
-;;; Reset underline (i.e. terminfo rmul)
+;;; Reset reverse (i.e. terminfo rmso)
    ((eq parameter 27)
-    (setq term-ansi-current-underline 0))
+    (setq term-ansi-current-reverse 0))
 
 ;;; Foreground
    ((and (>= parameter 30) (<= parameter 37))
@@ -3095,7 +3131,7 @@ See `term-prompt-regexp'."
     (term-goto
      (1- term-terminal-previous-parameter)
      (1- term-terminal-parameter)))
-   ;; \E[A - cursor up
+   ;; \E[A - cursor up (terminfo: cuu1)
    ((eq char ?A)
     (term-handle-deferred-scroll)
     (term-down (- (max 1 term-terminal-parameter)) t))
@@ -3108,13 +3144,13 @@ See `term-prompt-regexp'."
    ;; \E[D - cursor left
    ((eq char ?D)
     (term-move-columns (- (max 1 term-terminal-parameter))))
-   ;; \E[J - clear to end of screen
+   ;; \E[J - clear to end of screen (terminfo: ed, clear)
    ((eq char ?J)
     (term-erase-in-display term-terminal-parameter))
-   ;; \E[K - clear to end of line
+   ;; \E[K - clear to end of line (terminfo: el, el1)
    ((eq char ?K)
     (term-erase-in-line term-terminal-parameter))
-   ;; \E[L - insert lines
+   ;; \E[L - insert lines (terminfo: il, il1)
    ((eq char ?L)
     (term-insert-lines (max 1 term-terminal-parameter)))
    ;; \E[M - delete lines
@@ -3128,19 +3164,22 @@ See `term-prompt-regexp'."
     (term-insert-spaces (max 1 term-terminal-parameter)))
    ;; \E[?h - DEC Private Mode Set
    ((eq char ?h)
-    (cond ((eq term-terminal-parameter 4)
+    (cond ((eq term-terminal-parameter 4)  ;; (terminfo: smir)
            (setq term-insert-mode t))
-          ((eq term-terminal-parameter 47)
-           (term-switch-to-alternate-sub-buffer t))))
+          ;; ((eq term-terminal-parameter 47) ;; (terminfo: smcup)
+          ;; (term-switch-to-alternate-sub-buffer t))
+          ))
    ;; \E[?l - DEC Private Mode Reset
    ((eq char ?l)
-    (cond ((eq term-terminal-parameter 4)
+    (cond ((eq term-terminal-parameter 4)  ;; (terminfo: rmir)
            (setq term-insert-mode nil))
-          ((eq term-terminal-parameter 47)
-           (term-switch-to-alternate-sub-buffer nil))))
+          ;; ((eq term-terminal-parameter 47) ;; (terminfo: rmcup)
+          ;; (term-switch-to-alternate-sub-buffer nil))
+          ))
 
 ;;; Modified to allow ansi coloring -mm
-   ;; \E[m - Set/reset standard mode
+   ;; \E[m - Set/reset modes, set bg/fg 
+   ;;(terminfo: smso,rmso,smul,rmul,rev,bold,sgr0,invis,op,setab,setaf)
    ((eq char ?m)
     (when (= term-terminal-more-parameters 1)
       (if (>= term-terminal-previous-parameter-4 0)
@@ -3184,32 +3223,32 @@ The top-most line is line 0."
             (not (and (= term-scroll-start 0)
                       (= term-scroll-end term-height))))))
 
-(defun term-switch-to-alternate-sub-buffer (set)
-  ;; If asked to switch to (from) the alternate sub-buffer, and already (not)
-  ;; using it, do nothing.  This test is needed for some programs (including
-  ;; Emacs) that emit the ti termcap string twice, for unknown reason.
-  (term-handle-deferred-scroll)
-  (if (eq set (not (term-using-alternate-sub-buffer)))
-      (let ((row (term-current-row))
-            (col (term-horizontal-column)))
-        (cond (set
-               (goto-char (point-max))
-               (if (not (eq (preceding-char) ?\n))
-                   (term-insert-char ?\n 1))
-               (setq term-scroll-with-delete t)
-               (setq term-saved-home-marker (copy-marker term-home-marker))
-               (set-marker term-home-marker (point)))
-              (t
-               (setq term-scroll-with-delete
-                     (not (and (= term-scroll-start 0)
-                               (= term-scroll-end term-height))))
-               (set-marker term-home-marker term-saved-home-marker)
-               (set-marker term-saved-home-marker nil)
-               (setq term-saved-home-marker nil)
-               (goto-char term-home-marker)))
-        (setq term-current-column nil)
-        (setq term-current-row 0)
-        (term-goto row col))))
+;; (defun term-switch-to-alternate-sub-buffer (set)
+;;   ;; If asked to switch to (from) the alternate sub-buffer, and already (not)
+;;   ;; using it, do nothing.  This test is needed for some programs (including
+;;   ;; Emacs) that emit the ti termcap string twice, for unknown reason.
+;;   (term-handle-deferred-scroll)
+;;   (if (eq set (not (term-using-alternate-sub-buffer)))
+;;       (let ((row (term-current-row))
+;;          (col (term-horizontal-column)))
+;;      (cond (set
+;;             (goto-char (point-max))
+;;             (if (not (eq (preceding-char) ?\n))
+;;                 (term-insert-char ?\n 1))
+;;             (setq term-scroll-with-delete t)
+;;             (setq term-saved-home-marker (copy-marker term-home-marker))
+;;             (set-marker term-home-marker (point)))
+;;            (t
+;;             (setq term-scroll-with-delete
+;;                   (not (and (= term-scroll-start 0)
+;;                             (= term-scroll-end term-height))))
+;;             (set-marker term-home-marker term-saved-home-marker)
+;;             (set-marker term-saved-home-marker nil)
+;;             (setq term-saved-home-marker nil)
+;;             (goto-char term-home-marker)))
+;;      (setq term-current-column nil)
+;;      (setq term-current-row 0)
+;;      (term-goto row col))))
 
 ;; Default value for the symbol term-command-hook.
 
@@ -3519,11 +3558,11 @@ all pending output has been dealt with."))
   (if (not (bolp)) (insert-before-markers ?\n)))
 
 (defun term-erase-in-line (kind)
-  (if (> kind 1) ;; erase left of point
+  (if (= kind 1) ;; erase left of point
       (let ((cols (term-horizontal-column)) (saved-point (point)))
         (term-vertical-motion 0)
         (delete-region (point) saved-point)
-        (term-insert-char ?\n cols)))
+        (term-insert-char ?  cols)))
   (if (not (eq kind 1)) ;; erase right of point
       (let ((saved-point (point))
             (wrapped (and (zerop (term-horizontal-column))
@@ -3622,7 +3661,7 @@ Should only be called when point is at the start of a screen line."
     (term-insert-char ?\n lines)
     (goto-char start)))
 
-(defun term-set-output-log (name)
+(defun term-start-output-log (name)
   "Record raw inferior process output in a buffer."
   (interactive (list (if term-log-buffer
                          nil
@@ -3644,10 +3683,10 @@ Should only be called when point is at the start of a screen line."
     (message "Recording terminal emulator output into buffer \"%s\""
              (buffer-name term-log-buffer))))
 
-(defun term-stop-photo ()
+(defun term-stop-output-log ()
   "Discontinue raw inferior process logging."
   (interactive)
-  (term-set-output-log nil))
+  (term-start-output-log nil))
 
 (defun term-show-maximum-output ()
   "Put the end of the buffer at the bottom of the window."
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index 4db493803ef..c2ed47cb48d 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -102,7 +102,7 @@ expression, which is evaluated to get the string to insert.")
 (defconst enriched-annotation-regexp "<\\(/\\)?\\([-A-Za-z0-9]+\\)>"
   "Regular expression matching enriched-text annotations.")
 
-(defconst enriched-translations
+(defvar enriched-translations
   '((face          (bold-italic "bold" "italic")
                    (bold        "bold")
                    (italic      "italic")