Merged from miles@gnu.org--gnu-2005 (patch 31-33, 129-141)

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

23 files changed, 495 insertions, 276 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d48d8704eb..7c3842ea3a5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,109 @@
+2005-02-28  Chong Yidong" <cyd@stupidchicken.com> (tiny change)
+
+        * international/utf-16.el (ccl-encode-mule-utf-16le): Fix
+        BUFFER_MAGNIFICATION to 2.
+        (ccl-encode-mule-utf-16be): Likewise.
+
+2005-02-28  Kenichi Handa  <handa@m17n.org>
+
+        * international/utf-16.el (ccl-encode-mule-utf-16le-with-signature):
+        Fix BUFFER_MAGNIFICATION to 4.
+        (ccl-encode-mule-utf-16be-with-signature): Likewise.
+
+2005-02-28  Nick Roberts  <nickrob@snap.net.nz>
+
+        * speedbar.el (speedbar-update-flag): Doc fix.
+        (speedbar-show-info-under-mouse): Give set-mouse-position the right
+        argument.
+
+2005-02-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * reveal.el (reveal-post-command): Don't try to reveal overlays which
+        have a non-nil `invisible' property but are actually visible.
+
+        * progmodes/perl-mode.el (perl-imenu-generic-expression): Add entries
+        for perldoc sections.
+        (perl-outline-regexp, perl-outline-level): New var and function.
+        (perl-mode): Use them.
+
+2005-02-27  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+        * calendar/diary-lib.el (diary-remind): Discard any mark portion
+        from diary-entry.  Reported by Andrew Kemp <ajwk@pell.uklinux.net>.
+
+2005-02-27  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * cus-edit.el: Comment change.
+        (custom-buffer-create-internal): Slightly reword text at top of
+        Custom buffers.  Mention there that saving an option edits the
+        init file.  Add link to Emacs manual node on `custom-file'.
+        (custom-magic-alist): Rewrite individual State messages to use
+        capitalized keywords.  Doc fix.
+
+2005-02-27  Matt Hodges  <MPHodges@member.fsf.org>
+
+        * calendar/calendar.el (calendar-buffer): Move above
+        calendar-week-start-day.
+        (calendar-week-start-day): Doc fix.  Add :set function.
+        (calendar-minimum-window-height): New variable.
+        (generate-calendar-window): Only resize window if selected-window
+        is displaying the calendar buffer.  Use new variable
+        calendar-minimum-window-height.
+        (generate-calendar): Reword error message.
+        (calendar-mode-map): Bind DEL to scroll-other-window-down.
+
+2005-02-27  Andreas Schwab  <schwab@suse.de>
+
+        * vc.el (vc-do-command): Don't run command asynchronously when
+        operating in a remote directory.
+
+        * net/tramp.el (tramp-file-name-for-operation): Fix misapplied
+        change from sync with Tramp 2.0.47.
+
+2005-02-27  Richard M. Stallman  <rms@gnu.org>
+
+        * textmodes/ispell.el (ispell-change-dictionary): Doc fix.
+
+        * textmodes/flyspell.el (flyspell-mode-on):
+        Call ispell-change-dictionary only if necessary.
+
+        * emacs-lisp/re-builder.el (regexp-builder): New function.
+
+        * register.el (describe-register-1): Explicitly handle
+        yank-excluded-properties = t.
+
+        * cus-edit.el (custom-buffer-create-internal): Improve progress msgs.
+        (custom-magic-alist): Change the status descriptions again.
+        (face widget-type): Total rewrite based on `restricted-sexp'
+        to eliminate the confusing double hiding levels.
+
+        * emacs-lisp/debug.el (debug-on-entry-1):
+        If function body is empty, add nil as body form.
+
+2005-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/trace.el (inhibit-trace): New var.
+        (trace-make-advice): Use it.
+
+        * emacs-lisp/debug.el (debug): Put back the inhibit-trace.
+
+2005-02-26  Kim F. Storm  <storm@cua.dk>
+
+        * mouse.el (mouse-1-click-in-non-selected-windows): New defcustom.
+        (mouse-on-link-p, mouse-drag-region-1): Use it.
+
+2005-02-25  Lute Kamstra  <lute@gnu.org>
+
+        * replace.el (query-replace-read-from): Fix 2005-02-19 change.
+
 2005-02-24  Luc Teirlinck  <teirllm@auburn.edu>
 
         * frame.el (blink-cursor-mode): Add :group keyword.
 
 2005-02-24  Ulf Jasper  <ulf.jasper@web.de>
 
-        * calendar/icalendar.el (icalendar--decode-isodatetime): New
-        optional argument DAY-SHIFT.
+        * calendar/icalendar.el (icalendar--decode-isodatetime):
+        New optional argument DAY-SHIFT.
         (icalendar-export-region): Fix coding-system-for-write.
         (icalendar--convert-ical-to-diary): Shift end-day of all-day
         events by one.
@@ -20,6 +118,13 @@
         during redisplay.  Call force-window-update after read-event
         and delete-region to signal that window is not accurate.
 
+2005-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/debug.el (debug): Hide the buffer if it's not killed.
+        Remove unused and inexistent var `inhibit-trace'.
+        (debugger-mode): Use run-mode-hooks.
+        (debugger-list-functions): Add buttons; setup xref stack.
+
 2005-02-23  Richard M. Stallman  <rms@gnu.org>
 
         * calendar/appt.el (appt-time-msg-list): 3rd elt of each
@@ -152,8 +257,8 @@
         * viper-util.el (viper-glob-unix-files): Fix shell status check.
         (viper-file-remote-p): Make equivalent to file-remote-p.
 
-        * viper.el (viper-major-mode-modifier-list): Use
-        viper-gnus-modifier-map.
+        * viper.el (viper-major-mode-modifier-list):
+        Use viper-gnus-modifier-map.
 
 2005-02-19  David Kastrup  <dak@gnu.org>
 
@@ -163,7 +268,7 @@
 2005-02-19  Jay Belanger  <belanger@truman.edu>
 
         * calc/calc-math.el (calc-arctan, calc-tanh, calc-arctanh):
-        Removed extra definitions.
+        Remove extra definitions.
         (calc-coth): New function.
         (calcFunc-cot): Fix `let'.
 
@@ -180,8 +285,8 @@
         query-replace-from-history-variable to handle the case of an empty
         string entered to accept the suggested default.
 
-        * net/tramp.el (tramp-file-name-for-operation): Use
-        dired-call-process instead of dired-call-process-command.
+        * net/tramp.el (tramp-file-name-for-operation):
+        Use dired-call-process instead of dired-call-process-command.
 
 2005-02-19  Jay Belanger  <belanger@truman.edu>
 
@@ -202,22 +307,22 @@
 
 2005-02-19  Michael Kifer  <kifer@cs.stonybrook.edu>
 
-        * ediff.el (ediff-set-diff-overlays-in-one-buffer,
-        ediff-set-fine-overlays-in-one-buffer,ediff-goto-word) make sure
+        * ediff.el (ediff-set-diff-overlays-in-one-buffer)
+        (ediff-set-fine-overlays-in-one-buffer,ediff-goto-word): Make sure
         we use the syntax table of the correct buffer.
-        (ediff-same-file-contents,ediff-same-contents): enhancements thanks to
+        (ediff-same-file-contents,ediff-same-contents): Enhancements thanks to
         Felix Gatzemeier.
 
-        * ediff-init.el (ediff-hide-face): checks for definedness of functions.
-        (ediff-file-remote-p): make synonymous with file-remote-p.
+        * ediff-init.el (ediff-hide-face): Check for definedness of functions.
+        (ediff-file-remote-p): Make synonymous with file-remote-p.
         In all deffaces ediff-*-face-*, use min-colors.
 
-        * ediff-mult.el (ediff-meta-mark-equal-files): make use of
-        ediff-recurse-to-subdirectories.
-        (ediff-mark-if-equal): check that the arguments are strings, use
+        * ediff-mult.el (ediff-meta-mark-equal-files): Make use of
+        ediff-recurse-to-subdirectories.
+        (ediff-mark-if-equal): Check that the arguments are strings, use
         ediff-same-contents (after to Felix Gatzemeier).
 
-        * ediff.el (ediff-merge-on-startup): don't set buffer-modified-p to
+        * ediff.el (ediff-merge-on-startup): Don't set buffer-modified-p to
         nil.
 
 2005-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -287,7 +392,7 @@
 2005-02-15  Jay Belanger  <belanger@truman.edu>
 
         * calc/calc-alg.el: Add simplification rules for calcFunc-sec,
-        calcFunc-csc, calcFunc-cot, calcFunc-sech, calcFunc-csch and
+        calcFunc-csc, calcFunc-cot, calcFunc-sech, calcFunc-csch, and
         calcFunc-coth.
         (math-simplify-sqrt): Add simplifications.
 
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 88d6aee513f..291452db080 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1,7 +1,7 @@
 ;;; calendar.el --- calendar functions
 
 ;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997,
-;;      2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+;;      2000, 2001, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
@@ -141,11 +141,25 @@
   :group 'calendar)
 
 
+(defconst calendar-buffer "*Calendar*"
+  "Name of the buffer used for the calendar.")
+
 ;;;###autoload
 (defcustom calendar-week-start-day 0
   "*The day of the week on which a week in the calendar begins.
-0 means Sunday (default), 1 means Monday, and so on."
+0 means Sunday (default), 1 means Monday, and so on.
+
+If you change this variable directly (without using customize)
+after starting `calendar', you should call `redraw-calendar' to
+update the calendar display to reflect the change, otherwise
+movement commands will not work correctly."
   :type 'integer
+  :set (lambda (sym val)
+         (set sym val)
+         (let ((buffer (get-buffer calendar-buffer)))
+           (when (buffer-live-p buffer)
+             (with-current-buffer buffer
+               (redraw-calendar)))))
   :group 'calendar)
 
 ;;;###autoload
@@ -1303,9 +1317,6 @@ with descriptive strings such as
   :type 'sexp
   :group 'holidays)
 
-(defconst calendar-buffer "*Calendar*"
-  "Name of the buffer used for the calendar.")
-
 (defconst holiday-buffer "*Holidays*"
   "Name of the buffer used for the displaying the holidays.")
 
@@ -1563,7 +1574,7 @@ return negative results."
 The choices are: `one-frame' (calendar and diary together in one separate,
 dedicated frame); `two-frames' (calendar and diary in separate, dedicated
 frames); `calendar-only' (calendar in a separate, dedicated frame); with
-any other value the current frame is used.  Using any of the first 
+any other value the current frame is used.  Using any of the first
 three options overrides the value of `view-diary-entries-initially'."
   :type '(choice
           (const :tag "calendar and diary in separate frame" one-frame)
@@ -1572,6 +1583,12 @@ three options overrides the value of `view-diary-entries-initially'."
           (const :tag "use current frame" nil))
   :group 'calendar)
 
+(defcustom calendar-minimum-window-height 8
+  "Minimum height `generate-calendar-window' should use for calendar window."
+  :type 'integer
+  :version "22.1"
+  :group 'calendar)
+
 ;;;###autoload
 (defun calendar (&optional arg)
   "Choose between the one frame, two frame, or basic calendar displays.
@@ -2039,28 +2056,33 @@ Or, for optional MON, YR."
           (or (not mon)
               (let ((offset (calendar-interval mon yr month year)))
                 (and (<= offset 1) (>= offset -1)))))
-         (day-in-week (calendar-day-of-week today)))
+         (day-in-week (calendar-day-of-week today))
+         (in-calendar-window (eq (window-buffer (selected-window))
+                                 (get-buffer calendar-buffer))))
     (update-calendar-mode-line)
     (if mon
         (generate-calendar mon yr)
-        (generate-calendar month year))
+      (generate-calendar month year))
     (calendar-cursor-to-visible-date
      (if today-visible today (list displayed-month 1 displayed-year)))
     (set-buffer-modified-p nil)
-    (if (or (one-window-p t) (/= (frame-width) (window-width)))
-        ;; Don't mess with the window size, but ensure that the first
-        ;; line is fully visible
-        (set-window-vscroll nil 0)
-      ;; Adjust the window to exactly fit the displayed calendar
-      (fit-window-to-buffer))
-    (sit-for 0)
+    ;; Don't do any window-related stuff if we weren't called from a
+    ;; window displaying the calendar
+    (when in-calendar-window
+      (if (or (one-window-p t) (/= (frame-width) (window-width)))
+          ;; Don't mess with the window size, but ensure that the first
+          ;; line is fully visible
+          (set-window-vscroll nil 0)
+        ;; Adjust the window to exactly fit the displayed calendar
+        (fit-window-to-buffer nil nil calendar-minimum-window-height))
+      (sit-for 0))
     (if (and (boundp 'font-lock-mode)
              font-lock-mode)
         (font-lock-fontify-buffer))
     (and mark-holidays-in-calendar
 ;;;         (calendar-date-is-legal-p today) ; useful for BC dates
          (mark-calendar-holidays)
-         (sit-for 0))
+         (and in-calendar-window (sit-for 0)))
     (unwind-protect
         (if mark-diary-entries-in-calendar (mark-diary-entries))
       (if today-visible
@@ -2071,10 +2093,10 @@ Or, for optional MON, YR."
   "Generate a three-month Gregorian calendar centered around MONTH, YEAR."
 ;;; A negative YEAR is interpreted as BC; -1 being 1 BC, and so on.
 ;;; Note that while calendars for years BC could be displayed as it
-;;; stands, almost all other calendar functions (eg holidays) would 
+;;; stands, almost all other calendar functions (eg holidays) would
 ;;; at best have unpredictable results for such dates.
   (if (< (+ month (* 12 (1- year))) 2)
-      (error "Months before February, 1 AD are not available"))
+      (error "Months before January, 1 AD cannot be displayed"))
   (setq displayed-month month
         displayed-year year)
   (erase-buffer)
@@ -2229,6 +2251,7 @@ the inserted text.  Value is always t."
   (define-key calendar-mode-map "S"   'calendar-sunrise-sunset)
   (define-key calendar-mode-map "M"   'calendar-phases-of-moon)
   (define-key calendar-mode-map " "   'scroll-other-window)
+  (define-key calendar-mode-map (kbd "DEL") 'scroll-other-window-down)
   (define-key calendar-mode-map "\C-c\C-l" 'redraw-calendar)
   (define-key calendar-mode-map "."   'calendar-goto-today)
   (define-key calendar-mode-map "o"   'calendar-other-month)
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index ecbafd24430..5fbae2500d7 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1625,8 +1625,10 @@ marked on the calendar."
            (or (not marking-diary-entries) marking))
       (let ((date (calendar-gregorian-from-absolute
                    (+ (calendar-absolute-from-gregorian date) days))))
-        (if (setq diary-entry (eval sexp))
-            (mapconcat 'eval diary-remind-message ""))))
+        (when (setq diary-entry (eval sexp)) ; re-evaluate with adjusted date
+          ;; Discard any mark portion from diary-anniversary, etc.
+          (if (consp diary-entry) (setq diary-entry (cdr diary-entry)))
+          (mapconcat 'eval diary-remind-message ""))))
      ;; Diary entry may apply to one of a list of days before date
      ((and (listp days) days)
       (or (diary-remind sexp (car days) marking)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 85772094c9a..fb76aa6c3d8 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -121,10 +121,11 @@
 ;; 6. rogue
 
 ;;    There is no standard value.  This means that the variable was
-;;    not defined with defcustom.  You can not create a Custom buffer
-;;    for such variables using the normal interactive Custom commands.
-;;    However, such Custom buffers can be created in other ways, for
-;;    instance, by calling `customize-option' non-interactively.
+;;    not defined with defcustom, nor handled in cus-start.el.  You
+;;    can not create a Custom buffer for such variables using the
+;;    normal interactive Custom commands.  However, such Custom
+;;    buffers can be created in other ways, for instance, by calling
+;;    `customize-option' non-interactively.
 
 ;; 7. hidden
 
@@ -1367,7 +1368,6 @@ Otherwise use brackets."
   :group 'custom-buffer)
 
 (defun custom-buffer-create-internal (options &optional description)
-  (message "Creating customization buffer...")
   (custom-mode)
   (if custom-buffer-verbose-help
       (progn
@@ -1377,17 +1377,23 @@ Otherwise use brackets."
         (widget-insert (format ".
 %s show active fields; type RET or click mouse-1
 on an active field to invoke its action.  Editing an option value
-changes the text in the buffer; invoke the State button and
-choose the Set operation to set the option value.
-Invoke " (if custom-raised-buttons
-             "`Raised' buttons"
-             "Square brackets")))
+changes only the text in the buffer.  Invoke the State button to set or
+save the option value.  Saving an option normally edits your init file.
+Invoke "
+                               (if custom-raised-buttons
+                                   "`Raised' buttons"
+                                 "Square brackets")))
+        (widget-create 'info-link
+                       :tag "Custom file"
+                       "(emacs)Saving Customizations")
+        (widget-insert
+         " for information on how to save in a different file.
+Invoke ")
         (widget-create 'info-link
                        :tag "Help"
                        :help-echo "Read the online help."
                        "(emacs)Easy Customization")
-        (widget-insert " for more information.\n\n")
-        (message "Creating customization buttons...")
+        (widget-insert " for general information.\n\n")
         (widget-insert "Operate on everything in this buffer:\n "))
     (widget-insert " "))
   (widget-create 'push-button
@@ -1478,13 +1484,15 @@ Un-customize all values in this buffer.  They get their standard settings."
   (unless (eq (preceding-char) ?\n)
     (widget-insert "\n"))
   (message "Creating customization items ...done")
+  (message "Resetting customization items...")
   (unless (eq custom-buffer-style 'tree)
     (mapc 'custom-magic-reset custom-options))
+  (message "Resetting customization items...done")
   (message "Creating customization setup...")
   (widget-setup)
   (buffer-enable-undo)
   (goto-char (point-min))
-  (message "Creating customization buffer...done"))
+  (message "Creating customization setup...done"))
 
 ;;; The Tree Browser.
 
@@ -1665,31 +1673,31 @@ item in another window.\n\n"))
 
 (defconst custom-magic-alist
   '((nil "#" underline "\
-uninitialized, you should not see this.")
+UNINITIALIZED, you should not see this.")
     (unknown "?" italic "\
-unknown, you should not see this.")
+UNKNOWN, you should not see this.")
     (hidden "-" default "\
-hidden, invoke \"Show\" in the previous line to show." "\
+HIDDEN, invoke \"Show\" in the previous line to show." "\
 group now hidden, invoke \"Show\", above, to show contents.")
     (invalid "x" custom-invalid-face "\
-the value displayed for this %c is invalid and cannot be set.")
+INVALID, the displayed value cannot be set.")
     (modified "*" custom-modified-face "\
-you have edited the value as text, but you have not set the %c." "\
-you have edited something in this group, but not set anything yet.")
+EDITED, shown value does not take effect until you set or save it." "\
+something in this group has been edited but not set.")
     (set "+" custom-set-face "\
-you have set this %c, but not saved it for future sessions." "\
-you have set something in this group, but not saved anything yet.")
+SET for current session only." "\
+something in this group has been set but not saved.")
     (changed ":" custom-changed-face "\
-this %c has been changed outside the customize buffer." "\
+CHANGED outside Customize; operating on it here may be unreliable." "\
 something in this group has been changed outside customize.")
     (saved "!" custom-saved-face "\
-You have set this %c and saved it through Customize in your init file." "\
+SAVED and set." "\
 something in this group has been set and saved.")
     (rogue "@" custom-rogue-face "\
-this %c has not been changed with customize." "\
+NO CUSTOMIZATION DATA; you should not see this." "\
 something in this group is not prepared for customization.")
     (standard " " nil "\
-this %c is unchanged from its standard setting." "\
+STANDARD." "\
 visible group members are all at standard settings."))
   "Alist of customize option states.
 Each entry is of the form (STATE MAGIC FACE ITEM-DESC [ GROUP-DESC ]), where
@@ -1709,7 +1717,7 @@ STATE is one of the following symbols:
 `set'
    This item has been set but not saved.
 `changed'
-   The current value of this item has been changed temporarily.
+   The current value of this item has been changed outside Customize.
 `saved'
    This item is marked for saving.
 `rogue'
@@ -3285,54 +3293,69 @@ restoring it to the state of a face that has never been customized."
 
 ;;; The `face' Widget.
 
-(define-widget 'face 'default
-  "Select and customize a face."
-  :convert-widget 'widget-value-convert-widget
-  :button-prefix 'widget-push-button-prefix
-  :button-suffix 'widget-push-button-suffix
-  :format "%{%t%}: %[select face%] %v"
-  :tag "Face"
-  :value 'default
+(defvar widget-face-prompt-value-history nil
+  "History of input to `widget-face-prompt-value'.")
+
+(define-widget 'face 'restricted-sexp
+  "A Lisp face name."
+  :complete-function (lambda ()
+                       (interactive)
+                       (lisp-complete-symbol 'facep))
+  :prompt-value 'widget-field-prompt-value
+  :prompt-internal 'widget-symbol-prompt-internal
+  :prompt-match 'facep
+  :prompt-history 'widget-face-prompt-value-history
   :value-create 'widget-face-value-create
-  :value-delete 'widget-face-value-delete
-  :value-get 'widget-value-value-get
-  :validate 'widget-children-validate
-  :action 'widget-face-action
-  :match (lambda (widget value) (symbolp value)))
+  :action 'widget-field-action
+  :match-alternatives '(facep)
+  :validate (lambda (widget)
+              (unless (facep (widget-value widget))
+                (widget-put widget :error (format "Invalid face: %S"
+                                                  (widget-value widget)))
+                widget))
+  :value 'ignore
+  :tag "Function")
+
+
+;;; There is a bug here: the sample doesn't get redisplayed
+;;; in the new font when you specify one.  Does anyone know how to
+;;; make that work?  -- rms.
 
 (defun widget-face-value-create (widget)
-  "Create a `custom-face' child."
-  (let* ((symbol (widget-value widget))
-         (custom-buffer-style 'face)
-         (child (widget-create-child-and-convert
-                 widget 'custom-face
-                 :custom-level nil
-                 :value symbol)))
-    (custom-magic-reset child)
-    (setq custom-options (cons child custom-options))
-    (widget-put widget :children (list child))))
-
-(defun widget-face-value-delete (widget)
-  "Remove the child from the options."
-  (let ((child (car (widget-get widget :children))))
-    (setq custom-options (delq child custom-options))
-    (widget-children-value-delete widget)))
-
-(defvar face-history nil
-  "History of entered face names.")
-
-(defun widget-face-action (widget &optional event)
-  "Prompt for a face."
-  (let ((answer (completing-read "Face: "
-                                 (mapcar (lambda (face)
-                                           (list (symbol-name face)))
-                                         (face-list))
-                                 nil nil nil
-                                 'face-history)))
-    (unless (zerop (length answer))
-      (widget-value-set widget (intern answer))
-      (widget-apply widget :notify widget event)
-      (widget-setup))))
+  "Create an editable face name field."
+  (let ((buttons (widget-get widget :buttons))
+        (symbol (widget-get widget :value)))
+    ;; Sample.
+    (push (widget-create-child-and-convert widget 'item
+                                           :format "(%{%t%})"
+                                           :sample-face symbol
+                                           :tag "sample")
+          buttons)
+    (insert " ")
+    ;; Update buttons.
+    (widget-put widget :buttons buttons))
+
+  (let ((size (widget-get widget :size))
+        (value (widget-get widget :value))
+        (from (point))
+        ;; This is changed to a real overlay in `widget-setup'.  We
+        ;; need the end points to behave differently until
+        ;; `widget-setup' is called.
+        (overlay (cons (make-marker) (make-marker))))
+    (widget-put widget :field-overlay overlay)
+    (insert value)
+    (and size
+         (< (length value) size)
+         (insert-char ?\  (- size (length value))))
+    (unless (memq widget widget-field-list)
+      (setq widget-field-new (cons widget widget-field-new)))
+    (move-marker (cdr overlay) (point))
+    (set-marker-insertion-type (cdr overlay) nil)
+    (when (null size)
+      (insert ?\n))
+    (move-marker (car overlay) from)
+    (set-marker-insertion-type (car overlay) t)))
+
 
 ;;; The `hook' Widget.
 
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index a84a7aca52c..58fb3b4a1b8 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -1,6 +1,7 @@
 ;;; debug.el --- debuggers and related commands for Emacs
 
-;; Copyright (C) 1985, 1986, 1994, 2001, 2003  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1994, 2001, 2003, 2005
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: lisp, tools, maint
@@ -197,15 +198,16 @@ first will be printed into the backtrace buffer."
                     (recursive-edit)))))
           ;; Kill or at least neuter the backtrace buffer, so that users
           ;; don't try to execute debugger commands in an invalid context.
-          (if (get-buffer-window debugger-buffer 'visible)
+          (if (get-buffer-window debugger-buffer 0)
               ;; Still visible despite the save-window-excursion?  Maybe it
               ;; it's in a pop-up frame.  It would be annoying to delete and
               ;; recreate it every time the debugger stops, so instead we'll
-              ;; erase it but leave it visible.
-              (save-excursion
-                (set-buffer debugger-buffer)
+              ;; erase it and hide it but keep it alive.
+              (with-current-buffer debugger-buffer
                 (erase-buffer)
-                (fundamental-mode))
+                (fundamental-mode)
+                (with-selected-window (get-buffer-window debugger-buffer 0)
+                  (bury-buffer)))
             (kill-buffer debugger-buffer))
           (set-match-data debugger-outer-match-data)))
       ;; Put into effect the modified values of these variables
@@ -543,29 +545,26 @@ Applies to the frame whose line point is on in the backtrace."
                                'read-expression-history)))
   (debugger-env-macro (eval-expression exp)))
 
-(defvar debugger-mode-map nil)
-(unless debugger-mode-map
-  (let ((loop ? ))
-    (setq debugger-mode-map (make-keymap))
-    (set-keymap-parent debugger-mode-map button-buffer-map)
-    (suppress-keymap debugger-mode-map)
-    (define-key debugger-mode-map "-" 'negative-argument)
-    (define-key debugger-mode-map "b" 'debugger-frame)
-    (define-key debugger-mode-map "c" 'debugger-continue)
-    (define-key debugger-mode-map "j" 'debugger-jump)
-    (define-key debugger-mode-map "r" 'debugger-return-value)
-    (define-key debugger-mode-map "u" 'debugger-frame-clear)
-    (define-key debugger-mode-map "d" 'debugger-step-through)
-    (define-key debugger-mode-map "l" 'debugger-list-functions)
-    (define-key debugger-mode-map "h" 'describe-mode)
-    (define-key debugger-mode-map "q" 'top-level)
-    (define-key debugger-mode-map "e" 'debugger-eval-expression)
-    (define-key debugger-mode-map " " 'next-line)
-    (define-key debugger-mode-map "R" 'debugger-record-expression)
-    (define-key debugger-mode-map "\C-m" 'help-follow)
-    (define-key debugger-mode-map [mouse-2] 'push-button)
-    ))
-
+(defvar debugger-mode-map
+  (let ((map (make-keymap)))
+    (set-keymap-parent map button-buffer-map)
+    (suppress-keymap map)
+    (define-key map "-" 'negative-argument)
+    (define-key map "b" 'debugger-frame)
+    (define-key map "c" 'debugger-continue)
+    (define-key map "j" 'debugger-jump)
+    (define-key map "r" 'debugger-return-value)
+    (define-key map "u" 'debugger-frame-clear)
+    (define-key map "d" 'debugger-step-through)
+    (define-key map "l" 'debugger-list-functions)
+    (define-key map "h" 'describe-mode)
+    (define-key map "q" 'top-level)
+    (define-key map "e" 'debugger-eval-expression)
+    (define-key map " " 'next-line)
+    (define-key map "R" 'debugger-record-expression)
+    (define-key map "\C-m" 'help-follow)
+    (define-key map [mouse-2] 'push-button)
+    map))
 
 (defcustom debugger-record-buffer "*Debugger-record*"
   "*Buffer name for expression values, for \\[debugger-record-expression]."
@@ -616,7 +615,7 @@ Complete list of commands:
   (setq truncate-lines t)
   (set-syntax-table emacs-lisp-mode-syntax-table)
   (use-local-map debugger-mode-map)
-  (run-hooks 'debugger-mode-hook))
+  (run-mode-hooks 'debugger-mode-hook))
 
 ;;;###autoload
 (defun debug-on-entry (function)
@@ -705,6 +704,10 @@ If argument is nil or an empty string, cancel for all functions."
         ;; Skip the interactive form.
         (if (eq 'interactive (car-safe (car tail))) (setq tail (cdr tail)))
         (unless (eq flag (equal (car tail) '(debug 'debug)))
+          ;; If the function has no body, add nil as a body element.
+          (when (null tail)
+            (setq tail (list nil))
+            (nconc defn tail))
           ;; Add/remove debug statement as needed.
           (if (not flag)
               (progn (setcar tail (cadr tail))
@@ -716,22 +719,23 @@ If argument is nil or an empty string, cancel for all functions."
 (defun debugger-list-functions ()
   "Display a list of all the functions now set to debug on entry."
   (interactive)
-  (with-output-to-temp-buffer "*Help*"
-    (if (null debug-function-list)
-        (princ "No debug-on-entry functions now\n")
-      (princ "Functions set to debug on entry:\n\n")
-      (let ((list debug-function-list))
-        (while list
-          (prin1 (car list))
-          (terpri)
-          (setq list (cdr list))))
-      (princ "Note: if you have redefined a function, then it may no longer\n")
-      (princ "be set to debug on entry, even if it is in the list."))
-    (save-excursion
-      (set-buffer standard-output)
-      (help-mode))))
+  (require 'help-mode)
+  (help-setup-xref '(debugger-list-functions) (interactive-p))
+  (with-output-to-temp-buffer (help-buffer)
+    (with-current-buffer standard-output
+      (if (null debug-function-list)
+          (princ "No debug-on-entry functions now\n")
+        (princ "Functions set to debug on entry:\n\n")
+        (dolist (fun debug-function-list)
+          (make-text-button (point) (progn (prin1 fun) (point))
+                            'type 'help-function
+                            'help-args (list fun))
+          (terpri))
+        (terpri)
+        (princ "Note: if you have redefined a function, then it may no longer\n")
+        (princ "be set to debug on entry, even if it is in the list.")))))
 
 (provide 'debug)
 
-;;; arch-tag: b6ec7047-f801-4103-9c63-d69322db9d3b
+;; arch-tag: b6ec7047-f801-4103-9c63-d69322db9d3b
 ;;; debug.el ends here
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 019a45213c8..d26a0ae5f38 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -327,10 +327,16 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
   "Return binding for SYMBOL in the RE Builder target buffer."
   `(with-current-buffer reb-target-buffer ,symbol))
 
+;;; This is to help people find this in Apropos.
+;;;###autoload
+(defun regexp-builder ()
+  "Alias for `re-builder': Construct a regexp interactively."
+  (interactive)
+  (re-builder))
 
 ;;;###autoload
 (defun re-builder ()
-  "Call up the RE Builder for the current window."
+  "Construct a regexp interactively."
   (interactive)
 
   (if (and (string= (buffer-name) reb-buffer)
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index a6ff9b15286..e3d3e9e645e 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -1,6 +1,6 @@
 ;;; trace.el --- tracing facility for Emacs Lisp functions
 
-;; Copyright (C) 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1998, 2000, 2005  Free Software Foundation, Inc.
 
 ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
 ;; Maintainer: FSF
@@ -175,6 +175,9 @@
 ;; Used to separate new trace output from previous traced runs:
 (defvar trace-separator (format "%s\n" (make-string 70 ?=)))
 
+(defvar inhibit-trace nil
+  "If non-nil, all tracing is temporarily inhibited.")
+
 (defun trace-entry-message (function level argument-bindings)
   ;; Generates a string that describes that FUNCTION has been entered at
   ;; trace LEVEL with ARGUMENT-BINDINGS.
@@ -183,14 +186,13 @@
           (if (> level 1) " " "")
           level
           function
-          (mapconcat (function
-                      (lambda (binding)
-                        (concat
-                         (symbol-name (ad-arg-binding-field binding 'name))
-                         "="
-                         ;; do this so we'll see strings:
-                         (prin1-to-string
-                          (ad-arg-binding-field binding 'value)))))
+          (mapconcat (lambda (binding)
+                       (concat
+                        (symbol-name (ad-arg-binding-field binding 'name))
+                        "="
+                        ;; do this so we'll see strings:
+                        (prin1-to-string
+                         (ad-arg-binding-field binding 'value))))
                      argument-bindings
                      " ")))
 
@@ -211,43 +213,27 @@
   ;; (quietly if BACKGROUND is t).
   (ad-make-advice
    trace-advice-name nil t
-   (cond (background
-          `(advice
-           lambda ()
-           (let ((trace-level (1+ trace-level))
-                 (trace-buffer (get-buffer-create ,buffer)))
-             (save-excursion
-               (set-buffer trace-buffer)
-               (goto-char (point-max))
-               ;; Insert a separator from previous trace output:
-               (if (= trace-level 1) (insert trace-separator))
-               (insert
-                (trace-entry-message
-                 ',function trace-level ad-arg-bindings)))
-             ad-do-it
-             (save-excursion
-               (set-buffer trace-buffer)
-               (goto-char (point-max))
-               (insert
-                (trace-exit-message
-                 ',function trace-level ad-return-value))))))
-         (t `(advice
-             lambda ()
-             (let ((trace-level (1+ trace-level))
-                   (trace-buffer (get-buffer-create ,buffer)))
-               (pop-to-buffer trace-buffer)
-               (goto-char (point-max))
-               ;; Insert a separator from previous trace output:
-               (if (= trace-level 1) (insert trace-separator))
-               (insert
-                (trace-entry-message
-                 ',function trace-level ad-arg-bindings))
-               ad-do-it
-               (pop-to-buffer trace-buffer)
-               (goto-char (point-max))
-               (insert
-                (trace-exit-message
-                 ',function trace-level ad-return-value))))))))
+   `(advice
+     lambda ()
+     (let ((trace-level (1+ trace-level))
+           (trace-buffer (get-buffer-create ,buffer)))
+       (unless inhibit-trace
+         (with-current-buffer trace-buffer
+           ,(unless background '(pop-to-buffer trace-buffer))
+           (goto-char (point-max))
+           ;; Insert a separator from previous trace output:
+           (if (= trace-level 1) (insert trace-separator))
+           (insert
+            (trace-entry-message
+             ',function trace-level ad-arg-bindings))))
+       ad-do-it
+       (unless inhibit-trace
+         (with-current-buffer trace-buffer
+           ,(unless background '(pop-to-buffer trace-buffer))
+           (goto-char (point-max))
+           (insert
+            (trace-exit-message
+             ',function trace-level ad-return-value))))))))
 
 (defun trace-function-internal (function buffer background)
   ;; Adds trace advice for FUNCTION and activates it.
@@ -297,9 +283,9 @@ activated only if the advice of FUNCTION is currently active.  If FUNCTION
 was not traced this is a noop."
   (interactive
    (list (ad-read-advised-function "Untrace function: " 'trace-is-traced)))
-  (cond ((trace-is-traced function)
-         (ad-remove-advice function 'around trace-advice-name)
-         (ad-update function))))
+  (when (trace-is-traced function)
+    (ad-remove-advice function 'around trace-advice-name)
+    (ad-update function)))
 
 (defun untrace-all ()
   "Untraces all currently traced functions."
@@ -309,5 +295,5 @@ was not traced this is a noop."
 
 (provide 'trace)
 
-;;; arch-tag: cfd170a7-4932-4331-8c8b-b7151942e5a1
+;; arch-tag: cfd170a7-4932-4331-8c8b-b7151942e5a1
 ;;; trace.el ends here
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b994e6520db..7ade8548764 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,13 +1,26 @@
+2005-02-27  Arne J,Ax(Brgensen  <arne@arnested.dk>
+
+        * mm-decode.el (mm-dissect-buffer): Pass the from field on to
+        `mm-dissect-multipart' and receive the from field as an (optional)
+        argument from `mm-dissect-multipart'.
+        (mm-dissect-multipart): Receive the from field as an argument and
+        pass it on when we call `mm-dissect-buffer' on MIME parts. Fixes
+        verification/decryption of signed/encrypted MIME parts.
+
+2005-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * gnus-sum.el (gnus-summary-exit): Move point after displaying the
+        buffer, so it moves the window's cursor.
+
 2005-02-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
-        * nnheader.el (nnheader-find-file-noselect): Added doc string.
+        * nnheader.el (nnheader-find-file-noselect): Add doc string.
 
         * nnfolder.el (nnfolder-read-folder): Use RAWFILE for
-        `nnheader-find-file-noselect' to avoid
-        `large-file-warning-threshold'.
+        `nnheader-find-file-noselect' to avoid `large-file-warning-threshold'.
 
-        * gnus-sum.el (gnus-summary-caesar-message): Apply
-        `gnus-treat-article' after rotation.
+        * gnus-sum.el (gnus-summary-caesar-message):
+        Apply `gnus-treat-article' after rotation.
 
         * gnus-group.el (gnus-group-clear-data): Mention process/prefix in
         doc string.
@@ -41,7 +54,7 @@
 
 2005-02-16  Teodor Zlatanov  <tzz@lifelogs.com>
 
-        * gnus-registry.el (gnus-registry-delete-group): minor bug fix
+        * gnus-registry.el (gnus-registry-delete-group): Minor bug fix.
 
         * gnus.el (gnus-install-group-spam-parameters): Doc fix.
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 7748a3529fa..73ac963bd3b 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1,5 +1,5 @@
 ;;; gnus-sum.el --- summary mode commands for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -6680,9 +6680,11 @@ If FORCE (the prefix), also save the .newsrc file(s)."
       (set-buffer gnus-group-buffer)
       (if quit-config
           (gnus-handle-ephemeral-exit quit-config)
-        (goto-char group-point)
         (unless leave-hidden
-          (gnus-configure-windows 'group 'force)))
+          (gnus-configure-windows 'group 'force))
+        ;; Move point after calling gnus-configure-windows to make sure it
+        ;; moves the window's point as well.
+        (goto-char group-point))
       ;; Clear the current group name.
       (unless quit-config
         (setq gnus-newsgroup-name nil)))))
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 579571e16aa..10c7ea16db4 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -509,10 +509,10 @@ Postpone undisplaying of viewers for types in
     (message "Destroying external MIME viewers")
     (mm-destroy-parts mm-postponed-undisplay-list)))
 
-(defun mm-dissect-buffer (&optional no-strict-mime loose-mime)
+(defun mm-dissect-buffer (&optional no-strict-mime loose-mime from)
   "Dissect the current buffer and return a list of MIME handles."
   (save-excursion
-    (let (ct ctl type subtype cte cd description id result from)
+    (let (ct ctl type subtype cte cd description id result)
       (save-restriction
         (mail-narrow-to-head)
         (when (or no-strict-mime
@@ -523,8 +523,9 @@ Postpone undisplaying of viewers for types in
                 cte (mail-fetch-field "content-transfer-encoding")
                 cd (mail-fetch-field "content-disposition")
                 description (mail-fetch-field "content-description")
-                from (mail-fetch-field "from")
                 id (mail-fetch-field "content-id"))
+          (unless from
+                (setq from (mail-fetch-field "from")))
           ;; FIXME: In some circumstances, this code is running within
           ;; an unibyte macro.  mail-extract-address-components
           ;; creates unibyte buffers. This `if', though not a perfect
@@ -567,7 +568,7 @@ Postpone undisplaying of viewers for types in
                                         'from from
                                         'start start)
                                   (car ctl))
-             (cons (car ctl) (mm-dissect-multipart ctl))))
+             (cons (car ctl) (mm-dissect-multipart ctl from))))
           (t
            (mm-possibly-verify-or-decrypt
             (mm-dissect-singlepart
@@ -594,7 +595,7 @@ Postpone undisplaying of viewers for types in
     (mm-make-handle
      (mm-copy-to-buffer) ctl cte nil cdl description nil id)))
 
-(defun mm-dissect-multipart (ctl)
+(defun mm-dissect-multipart (ctl from)
   (goto-char (point-min))
   (let* ((boundary (concat "\n--" (mail-content-type-get ctl 'boundary)))
          (close-delimiter (concat (regexp-quote boundary) "--[ \t]*$"))
@@ -611,7 +612,7 @@ Postpone undisplaying of viewers for types in
         (save-excursion
           (save-restriction
             (narrow-to-region start (point))
-            (setq parts (nconc (list (mm-dissect-buffer t)) parts)))))
+            (setq parts (nconc (list (mm-dissect-buffer t nil from)) parts)))))
       (end-of-line 2)
       (or (looking-at boundary)
           (forward-line 1))
@@ -620,7 +621,7 @@ Postpone undisplaying of viewers for types in
       (save-excursion
         (save-restriction
           (narrow-to-region start end)
-          (setq parts (nconc (list (mm-dissect-buffer t)) parts)))))
+          (setq parts (nconc (list (mm-dissect-buffer t nil from)) parts)))))
     (mm-possibly-verify-or-decrypt (nreverse parts) ctl)))
 
 (defun mm-copy-to-buffer ()
diff --git a/lisp/international/utf-16.el b/lisp/international/utf-16.el
index 477cccc2bf9..04c9f682139 100644
--- a/lisp/international/utf-16.el
+++ b/lisp/international/utf-16.el
@@ -391,7 +391,7 @@ name `utf-translation-table-for-decode'.")
 
 
 (define-ccl-program ccl-encode-mule-utf-16le
-  `(1
+  `(2
     ,utf-16le-encode-loop)
   "Encode to UTF-16LE (little endian without signature).
 Characters from the charsets ascii, eight-bit-control,
@@ -401,7 +401,7 @@ after translation through the translation-table of name
 Others are encoded as U+FFFD.")
 
 (define-ccl-program ccl-encode-mule-utf-16be
-  `(1
+  `(2
     ,utf-16be-encode-loop)
   "Encode to UTF-16BE (big endian without signature).
 Characters from the charsets ascii, eight-bit-control,
@@ -411,7 +411,7 @@ after translation through the translation-table named
 Others are encoded as U+FFFD.")
 
 (define-ccl-program ccl-encode-mule-utf-16le-with-signature
-  `(1
+  `(4
     ((write #xFF)
      (write #xFE)
      ,@utf-16le-encode-loop))
@@ -423,7 +423,7 @@ after translation through the translation-table of name
 Others are encoded as U+FFFD.")
 
 (define-ccl-program ccl-encode-mule-utf-16be-with-signature
-  `(1
+  `(4
     ((write #xFE)
      (write #xFF)
      ,@utf-16be-encode-loop))
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 5efcca1bd5e..fdc99205780 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -82,6 +82,17 @@ packages.  See `mouse-on-link-p' for details."
                  (other :tag "Single click" t))
   :group 'mouse)
 
+(defcustom mouse-1-click-in-non-selected-windows t
+  "*If non-nil, a Mouse-1 click also follows links in non-selected windows.
+
+If nil, a Mouse-1 click on a link in a non-selected window performs
+the normal mouse-1 binding, typically selects the window and sets
+point at the click position."
+  :type 'boolean
+  :version "22.1"
+  :group 'mouse)
+
+
 
 ;; Provide a mode-specific menu on a mouse button.
 
@@ -771,6 +782,8 @@ If the click is in the echo area, display the `*Messages*' buffer."
   "Return non-nil if POS is on a link in the current buffer.
 POS must be a buffer position in the current buffer or an mouse
 event location in the selected window, see `event-start'.
+However, if `mouse-1-click-in-non-selected-windows' is non-nil,
+POS may be a mouse event location in any window.
 
 A clickable link is identified by one of the following methods:
 
@@ -805,21 +818,24 @@ click is the local or global binding of that event.
 
 - Otherwise, the mouse-1 event is translated into a mouse-2 event
 at the same position."
-  (if (consp pos)
-      (setq pos (and (eq (selected-window) (posn-window pos))
-                     (posn-point pos))))
-  (when pos
-    (let ((action
-           (or (get-char-property pos 'follow-link)
-               (save-excursion
-                 (goto-char pos)
-                 (key-binding [follow-link] nil t)))))
-      (cond
-       ((eq action 'mouse-face)
-        (and (get-char-property pos 'mouse-face) t))
-       ((functionp action)
-        (funcall action pos))
-       (t action)))))
+  (let ((w (and (consp pos) (posn-window pos))))
+    (if (consp pos)
+        (setq pos (and (or mouse-1-click-in-non-selected-windows
+                           (eq (selected-window) w))
+                       (posn-point pos))))
+    (when pos
+      (with-current-buffer (window-buffer w)
+        (let ((action
+               (or (get-char-property pos 'follow-link)
+                   (save-excursion
+                     (goto-char pos)
+                     (key-binding [follow-link] nil t)))))
+          (cond
+           ((eq action 'mouse-face)
+            (and (get-char-property pos 'mouse-face) t))
+           ((functionp action)
+            (funcall action pos))
+           (t action)))))))
 
 
 (defun mouse-drag-region-1 (start-event)
@@ -839,7 +855,8 @@ at the same position."
                    ;; Don't count the mode line.
                    (1- (nth 3 bounds))))
          (on-link (and mouse-1-click-follows-link
-                       (eq start-window (selected-window))))
+                       (or mouse-1-click-in-non-selected-windows
+                           (eq start-window (selected-window)))))
          remap-double-click
          (click-count (1- (event-click-count start-event))))
     (setq mouse-selection-click-count click-count)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0fee809789e..14682975fe9 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4107,7 +4107,7 @@ ARGS are the arguments OPERATION has been called with."
    ((member operation
             (list 'dired-call-process
                   ; Emacs only
-                  'shell
+                  'shell-command
                   ; Post Emacs 21.3 only
                   'process-file
                   ; XEmacs only
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index eb630c2ed54..ad4633e20eb 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -161,10 +161,11 @@ The expansion is entirely correct because it uses the C preprocessor."
 
 (defvar perl-imenu-generic-expression
   '(;; Functions
-    (nil "^sub\\s-+\\([-A-Za-z0-9+_:]+\\)\\(\\s-\\|\n\\)*{" 1 )
+    (nil "^sub\\s-+\\([-A-Za-z0-9+_:]+\\)" 1)
     ;;Variables
-    ("Variables" "^\\([$@%][-A-Za-z0-9+_:]+\\)\\s-*=" 1 )
-    ("Packages" "^package\\s-+\\([-A-Za-z0-9+_:]+\\);" 1 ))
+    ("Variables" "^\\([$@%][-A-Za-z0-9+_:]+\\)\\s-*=" 1)
+    ("Packages" "^package\\s-+\\([-A-Za-z0-9+_:]+\\);" 1)
+    ("Doc sections" "^=head[0-9][ \t]+\\(.*\\)" 1))
   "Imenu generic expression for Perl mode.  See `imenu-generic-expression'.")
 
 ;; Regexps updated with help from Tom Tromey <tromey@cambric.colorado.edu> and
@@ -411,6 +412,20 @@ create a new comment."
 (defcustom perl-nochange ";?#\\|\f\\|\\s(\\|\\(\\w\\|\\s_\\)+:[^:]"
   "*Lines starting with this regular expression are not auto-indented."
   :type 'regexp)
+
+;; Outline support
+
+(defvar perl-outline-regexp
+  (concat (mapconcat 'cadr perl-imenu-generic-expression "\\|")
+          "\\|^=cut\\>"))
+
+(defun perl-outline-level ()
+  (cond
+   ((looking-at "package\\s-") 0)
+   ((looking-at "sub\\s-") 1)
+   ((looking-at "=head[0-9]") (- (char-before (match-end 0)) ?0))
+   ((looking-at "=cut") 1)
+   (t 3)))
 
 ;;;###autoload
 (defun perl-mode ()
@@ -498,9 +513,12 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'."
                               . perl-font-lock-syntactic-face-function)
                              (parse-sexp-lookup-properties . t)))
   ;; Tell imenu how to handle Perl.
-  (make-local-variable 'imenu-generic-expression)
-  (setq imenu-generic-expression perl-imenu-generic-expression)
+  (set (make-local-variable 'imenu-generic-expression)
+       perl-imenu-generic-expression)
   (setq imenu-case-fold-search nil)
+  ;; Setup outline-minor-mode.
+  (set (make-local-variable 'outline-regexp) perl-outline-regexp)
+  (set (make-local-variable 'outline-level) 'perl-outline-level)
   (run-hooks 'perl-mode-hook))
 
 ;; This is used by indent-for-comment
diff --git a/lisp/register.el b/lisp/register.el
index bab9d01edf2..253207c3140 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -227,8 +227,10 @@ The Lisp value REGISTER is a character."
         (princ (car val))))
 
      ((stringp val)
-      (remove-list-of-text-properties 0 (length val)
-                                      yank-excluded-properties val)
+      (if (eq yank-excluded-properties t)
+          (set-text-properties 0 (length val) nil val)
+        (remove-list-of-text-properties 0 (length val)
+                                        yank-excluded-properties val))
       (if verbose
           (progn
             (princ "the text:\n")
diff --git a/lisp/replace.el b/lisp/replace.el
index 2c60cd006f1..d2a0370f93e 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1,7 +1,7 @@
 ;;; replace.el --- replace commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001, 2002,
-;;   2003, 2004  Free Software Foundation, Inc.
+;;   2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -116,10 +116,10 @@ wants to replace FROM with TO."
                nil t t))))
       (if (and (zerop (length from)) lastto lastfrom)
           (progn
-            (cons lastfrom
-                  (query-replace-compile-replacement lastto regexp-flag))
             (set query-replace-from-history-variable
-                 (cdr (symbol-value query-replace-from-history-variable))))
+                 (cdr (symbol-value query-replace-from-history-variable)))
+            (cons lastfrom
+                  (query-replace-compile-replacement lastto regexp-flag)))
         ;; Warn if user types \n or \t, but don't reject the input.
         (and regexp-flag
              (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from)
diff --git a/lisp/reveal.el b/lisp/reveal.el
index 04cc58893c9..4d2742a4810 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -1,6 +1,6 @@
 ;;; reveal.el --- Automatically reveal hidden text at point
 
-;; Copyright (C) 2000, 2001, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: outlines
@@ -93,16 +93,22 @@
                           (overlays-at (point))))
          (push (cons (selected-window) ol) reveal-open-spots)
          (setq old-ols (delq ol old-ols))
-         (let ((open (overlay-get ol 'reveal-toggle-invisible)) inv)
-           (when (or open
-                     (and (setq inv (overlay-get ol 'invisible))
-                          (symbolp inv)
-                          (or (setq open (or (get inv 'reveal-toggle-invisible)
-                                             (overlay-get ol 'isearch-open-invisible-temporary)))
-                              (overlay-get ol 'isearch-open-invisible)
-                              (and (consp buffer-invisibility-spec)
-                                   (assq inv buffer-invisibility-spec)))
-                          (overlay-put ol 'reveal-invisible inv)))
+         (let ((inv (overlay-get ol 'invisible)) open)
+           (when (and inv
+                      ;; There's an `invisible' property.  Make sure it's
+                      ;; actually invisible.
+                      (or (not (listp buffer-invisibility-spec))
+                          (memq inv buffer-invisibility-spec)
+                          (assq inv buffer-invisibility-spec))
+                      (or (setq open
+                                (or (overlay-get ol 'reveal-toggle-invisible)
+                                    (and (symbolp inv)
+                                         (get inv 'reveal-toggle-invisible))
+                                    (overlay-get ol 'isearch-open-invisible-temporary)))
+                          (overlay-get ol 'isearch-open-invisible)
+                          (and (consp buffer-invisibility-spec)
+                               (cdr (assq inv buffer-invisibility-spec))))
+                      (overlay-put ol 'reveal-invisible inv))
              (if (null open)
                  (overlay-put ol 'invisible nil)
                ;; Use the provided opening function and repeat (since the
@@ -110,7 +116,8 @@
                (setq repeat t)
                (condition-case err
                    (funcall open ol nil)
-                 (error (message "!!Reveal-show: %s !!" err)
+                 (error (message "!!Reveal-show (funcall %s %s nil): %s !!"
+                                 open ol err)
                         ;; Let's default to a meaningful behavior to avoid
                         ;; getting stuck in an infinite loop.
                         (setq repeat nil)
@@ -147,7 +154,8 @@
                                            (overlay-get ol 'isearch-open-invisible-temporary)))))
                    (condition-case err
                        (funcall open ol t)
-                     (error (message "!!Reveal-hide: %s !!" err)))
+                     (error (message "!!Reveal-hide (funcall %s %s t): %s !!"
+                                     open ol err)))
                  (overlay-put ol 'invisible inv))))))))
    (error (message "Reveal: %s" err)))))
 
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index ecb213d52fd..7a6e01f2859 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -761,11 +761,9 @@ PATH-EXPRESSION to `speedbar-ignored-path-expressions'."
                                   (display-graphic-p)
                                 window-system))
   "*Non-nil means to automatically update the display.
-When this is nil then speedbar will not follow the attached frame's path.
-When speedbar is active, use:
-
-\\<speedbar-key-map> `\\[speedbar-toggle-updates]'
-
+When this is nil then speedbar will not follow the attached
+frame's path.  Type \
+\\<speedbar-key-map>\\[speedbar-toggle-updates] in the speedbar \
 to toggle this value.")
 
 (defvar speedbar-syntax-table nil
@@ -1344,7 +1342,7 @@ Optional EVENT is currently not used."
     (if (equal (car pos) speedbar-frame)
         (save-excursion
           (save-window-excursion
-            (apply 'set-mouse-position pos)
+            (apply 'set-mouse-position (list (car pos) (cadr pos) (cddr pos)))
             (speedbar-item-info))))))
 
 (defun speedbar-set-mode-line-format ()
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 01db2d64b27..c224a970e01 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -543,8 +543,9 @@ in your .emacs file.
   "Turn Flyspell mode on.  Do not use this; use `flyspell-mode' instead."
   (setq ispell-highlight-face 'flyspell-incorrect-face)
   ;; local dictionaries setup
-  (ispell-change-dictionary
-   (or ispell-local-dictionary ispell-dictionary flyspell-default-dictionary))
+  (or ispell-local-dictionary ispell-dictionary
+      (if flyspell-default-dictionary
+          (ispell-change-dictionary flyspell-default-dictionary)))
   ;; we have to force ispell to accept the local definition or
   ;; otherwise it could be too late, the local dictionary may
   ;; be forgotten!
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index a28764b54a1..2a84d584634 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2417,9 +2417,10 @@ With NO-ERROR, just return non-nil if there was no Ispell running."
 ;;;###autoload
 (defun ispell-change-dictionary (dict &optional arg)
   "Change to dictionary DICT for Ispell.
-By just answering RET you can find out what the current dictionary is.
+With a prefix arg, set it \"globally\", for all buffers.
+Without a prefix arg, set it \"locally\", just for this buffer.
 
-With prefix argument, set the default dictionary."
+By just answering RET you can find out what the current dictionary is."
   (interactive
    (list (completing-read
           "Use new dictionary (RET for current, SPC to complete): "
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 8bc7209749f..5a3bf23529c 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-26  James Cloos  <cloos@jhcloos.com>  (tiny change)
+
+        * url-history.el (url-have-visited-url): Don't barf if
+        url-history-hash-table is nil.
+
 2005-02-14  Michael Welsh Duggan  <md5i@cs.cmu.edu>
 
         * url-http.el (url-http-parse-headers): Test url-automatic-caching.
diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index 6a2d87cfbc1..e2bc9b17f69 100644
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -164,7 +164,8 @@ user for what type to save as."
 
 (defun url-have-visited-url (url)
   (url-do-setup)
-  (gethash url url-history-hash-table nil))
+  (and url-history-hash-table
+       (gethash url url-history-hash-table nil)))
 
 (defun url-completion-function (string predicate function)
   (url-do-setup)
diff --git a/lisp/vc.el b/lisp/vc.el
index 2daf100ff57..2e241e67f48 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -958,6 +958,9 @@ that is inserted into the command line before the filename."
                            (mapconcat 'identity vc-path path-separator))
                    process-environment))
             (w32-quote-process-args t))
+        (if (and (eq okstatus 'async) (file-remote-p default-directory))
+            ;; start-process does not support remote execution
+            (setq okstatus nil))
         (if (eq okstatus 'async)
             (let ((proc (apply 'start-process command (current-buffer) command
                                squeezed)))