Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 447-459)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 141-144)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-115

55 files changed, 1114 insertions, 488 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42ef944476b..49d677c8cfc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,12 +1,344 @@
+2006-10-03  Denis St,A|(Bnkel  <dstuenkel@googlemail.com>  (tiny change)
+
+        * ibuf-ext.el (eval, view-and-eval) <define-ibuffer-op>:
+        Use the interactive spec of `eval-expression'.
+
+2006-10-02  Michael Welsh Duggan  <md5i@cs.cmu.edu>
+
+        * progmodes/sh-script.el (sh-prev-thing): Fix last change.
+
+2006-10-02  MIYOSHI Masanori <miyoshi@meadowy.org>  (tiny change)
+
+        * mail/smtpmail.el (smtpmail-try-auth-methods): Fix typo in
+        2006-09-28 commit.
+
+2006-10-02  Kenichi Handa  <handa@m17n.org>
+
+        * international/code-pages.el (iso-8859-6): Table fixed.
+
+2006-10-01  Chris Moore <christopher.ian.moore@gmail.com>  (tiny change)
+
+        * dired.el (dired-build-subdir-alist): Fix previous change.
+
+2006-10-01  Johan Bockg,Ae(Brd  <bojohan+mail@dd.chalmers.se>
+
+        * simple.el (undo-elt-crosses-region): Fix the inequalities.
+
+2006-10-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/find-func.el (find-function-regexp): Don't match
+        "define-button-type".
+
+        * pcvs.el (cvs-update-header): Fix handling of extra newlines so that
+        they don't keep accumulating.
+
+2006-10-01  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>  (tiny change)
+
+        * ffap.el (ffap-rfc-path): Change the address of the RFC
+        repository to ftp.rfc-editor.org, as ds.internic.net seems to be gone.
+
+2006-10-01  Stephen Berman  <Stephen.Berman@gmx.net>
+
+        * allout.el (allout-expose-topic): Rectify implementation of "+"
+        spec, so that bodies are not exposed with headlines.
+
+2006-10-01  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-current-depth): Do aberrent check only at or
+        below doublecheck depth.
+        (allout-chart-subtree): Make it explicit that LEVELS being nil
+        means unlimited depth.  Drop undocumented support for LEVELS value
+        t meaning unlimited depth.  (This is consistent with
+        allout-chart-to-reveal, but contrary to allout-show-children,
+        which needs to use nil to default to depth of 1.)
+        (allout-goto-prefix-doublechecked): Wrap long docstring line.
+        (allout-chart-to-reveal): Be explicit in docstring about meaning
+        of nil LEVELS, and drop support for LEVELS value t.
+        (allout-show-children): Translate the level spec used by this
+        routine to that used by allout-chart-subtree and
+        allout-chart-to-reveal.
+        (allout-show-to-offshoot): Retry once when stuck, after opening
+        subtree - improvements in discontinuity handling likely will
+        enable progress.
+
+2006-09-30  Chong Yidong  <cyd@stupidchicken.com>
+
+        * wid-edit.el (widget-button-click-moves-point): New variable.
+        (widget-button-click): If widget-button-click-moves-point is
+        non-nil, set point after performing the button action
+
+        * cus-edit.el (custom-mode): Set widget-button-click-moves-point.
+
+2006-09-30  Martin Rudalics  <rudalics@gmx.at>
+
+        * files.el (find-file-existing): Modify to not allow wildcards.
+
+2006-09-30  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
+
+        * simple.el (undo-more): When undo information for the region is
+        exhausted, say "No further undo information FOR REGION".
+
+2006-09-30  Michael Welsh Duggan  <md5i@cs.cmu.edu>
+
+        * progmodes/sh-script.el (sh-prev-thing):
+        Take `sh-leading-keywords' into account.
+
+2006-09-29  Glenn Morris  <rgm@gnu.org>
+
+        * custom.el (defcustom): Doc fix.
+
+        * calendar/calendar.el (european-calendar-style):
+        Call european-calendar or american-calendar as needed when set.
+        (diary-view-entries, list-calendar-holidays): Move autoloads
+        before use.
+
+2006-09-29  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/cperl-mode.el (cperl-after-expr-p): Don't move point
+        to nil if there is no previous property change.
+
+2006-09-26  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
+
+        * cus-edit.el (custom-save-all): Switch to emacs-lisp mode before
+        saving anything to be sure that `forward-sexp' behaves correctly.
+
+2006-09-29  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (line-move-finish): Ignore field boundaries if the
+        initial and final points have the same `field' property.
+
+2006-09-29  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-file-internal): Only bind minibuffer-completing-file-name
+        to t while calling ido-read-internal.
+
+2006-09-29  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-file-remote-p): Get regexp from list.
+        (org-archive-subtree): Remove erraneous `]' from character list.
+
+2006-09-28  Jonathan Yavner  <jyavner@member.fsf.org>
+
+        * ses.el (ses-in-print-area, ses-goto-data, ses-load)
+        (ses-reconstruct-all): Make undo of "insert row" work by keeping
+        markers for data-area and parameters-area.
+
+2006-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/make-mode.el (makefile-mode): Don't disable jit-lock.
+
+        * font-lock.el (font-lock-after-change-function): Refontify next line
+        as well if end is at BOL.
+        (font-lock-extend-jit-lock-region-after-change): Be more careful to
+        only extend the region as much as needed.
+
+2006-09-28  Richard Stallman  <rms@gnu.org>
+
+        * comint.el (comint-mode): Bind font-lock-defaults non-nil.
+
+        * subr.el (insert-for-yank-1): Handle `font-lock-face' specially.
+
+        * international/mule.el (after-insert-file-set-coding):
+        If VISIT, don't let set-buffer-multibyte make undo info.
+
+2006-09-28  Osamu Yamane  <yamane@green.ocn.ne.jp> (tiny change)
+
+        * mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
+        lines in base64-encoded authentication response.
+
+2006-09-26  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * progmode/ebnf2ps.el: Doc fix. Implement arrow spacing and scaling.
+        (ebnf-version): New version 4.3.
+        (ebnf-arrow-extra-width, ebnf-arrow-scale): New options.
+        (ebnf-prologue): Adjust PostScript programming.
+        (ebnf-begin-file, ebnf-insert-ebnf-prologue, ebnf-terminal-dimension1)
+        (ebnf-repeat-dimension, ebnf-except-dimension): Adjust code.
+
+2006-09-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * jit-lock.el (jit-lock-force-redisplay): Rename from
+        jit-lock-fontify-again, and undo the mistaken change I've just done.
+
+        * jit-lock.el (jit-lock-fontify-now): Don't fontify the empty text.
+        (jit-lock-fontify-again): Don't refontify text that's not displayed.
+
+2006-09-26  Kenichi Handa  <handa@m17n.org>
+
+        * startup.el (display-splash-screen): Allow a prefix argument.
+
+2006-09-25  Jason Rumney  <jasonr@gnu.org>
+
+        * subr.el (shell-quote-argument): Use DOS logic for Windows
+        shells with DOS semantics.
+
+2006-09-24  Richard Stallman  <rms@gnu.org>
+
+        * progmodes/compile.el (compilation-goto-locus-delete-o): New fn.
+        (compilation-goto-locus): Use compilation-goto-locus-delete-o
+        to delete the overlay.  Put it on pre-command-hook.
+
+        * emacs-lisp/timer.el (timer-max-repeats): Doc fix.
+
+        * startup.el (fancy-splash-screens, normal-splash-screen):
+        Call the splash buffer *About GNU Emacs*.
+
+        * simple.el (next-error-highlight, next-error-highlight-no-select):
+        Default to 0.5.
+        (yank-excluded-properties): Add `fontified'.
+
+        * font-lock.el (font-lock-compile-keywords): Allow value of
+        syntax-begin-function to enable paren-column-0 highlighting.
+
+2006-09-24  Chris Moore  <christopher.ian.moore@gmail.com>  (tiny change)
+
+        * dired.el (dired-build-subdir-alist): When file ends in colon,
+        don't exit the loop, just disregard that file.
+
+2006-09-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (line-move-finish): Handle corner case for fields in
+        continued lines.
+        (line-move-1): Remove flawed test for that case.
+
+2006-09-24  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * icomplete.el (icomplete-simple-completing-p): Use the correct
+        name for the new variable, `icomplete-with-completion-tables'.
+        (file local variables): Remove superfluous setting.
+
+2006-09-23  Jeff Miller  <jmiller@cablespeed.com>  (tiny change)
+
+        * calendar/appt.el (appt-check): Fix typo for appointments just
+        after midnight.
+
+2006-09-23  Chong Yidong  <cyd@stupidchicken.com>
+
+        * help.el (describe-key-briefly, describe-key): Don't expect an
+        extra up event if a down-event is generated by a popup menu.
+
+2006-09-23  Michal Nazarewicz  <mnazarewicz@gmail.com> (tiny change)
+
+        * textmodes/ispell.el (ispell-change-dictionary): Don't check the
+        local dictionary when changing the global dictionary.
+
+2006-09-23  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * icomplete.el (icomplete-with-completion-tables): List of
+        specialized completion tables with which icomplete should
+        operate.  Include the new `internal-complete-buffer', so icomplete
+        works with interactive buffer-selection.
+        (icomplete-simple-completing-p): Add acceptance of specialized
+        completion tables listed in icomplete-with-completion-tables.
+
+2006-09-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * frame.el (focus-follows-mouse): Set default to nil on Mac.
+
+        * startup.el (command-line): Use `custom-reevaluate-setting' for
+        `focus-follows-mouse'.
+
+2006-09-22  Richard Stallman  <rms@gnu.org>
+
+        * cus-edit.el (custom-buffer-create-internal): In `emacs -q',
+        explain why Save is not available.
+
+2006-09-22  Juanma Barranquero  <lekktu@gmail.com>
+
+        * woman.el (woman0-so): Use `let*', not `let'.
+        (woman-horizontal-line): Remove unbalanced parenthesis.
+
+2006-09-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * woman.el: Make sure all the end-of-region markers we use have
+        a non-nil insertion-type.
+        (woman0-so): Move things around so we can use copy-marker.
+        (woman0-roff-buffer, woman2-process-escapes-to-eol, woman2-roff-buffer):
+        Adjust marker type.
+        (woman2-process-escapes): Check marker type.
+        (woman-horizontal-line): Dispense with the use of a marker.
+
+2006-09-22  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-lang.el: Add Greek letters to math-variable-table
+        property of tex.
+
+2006-09-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * files.el (save-some-buffers-action-alist): Display diff in
+        view-mode.
+
+2006-09-22  Masatake YAMATO  <jet@gyve.org>
+
+        * add-log.el (add-log-current-defun): Use `forward-sexp'
+        instead of `forward-word' to pick c++::symbol.
+        Reported by Herbert Euler <herberteuler@hotmail.com>.
+
+2006-09-22  Kenichi Handa  <handa@m17n.org>
+
+        * bindings.el: Fix setting self-insert-command for multibyte
+        characters in global-map.
+
+2006-09-21  David Kastrup  <dak@gnu.org>
+
+        * mouse.el (mouse-posn-property): Fix typo for `event-start' in
+        doc string.
+
+2006-09-21  Kim F. Storm  <storm@cua.dk>
+
+        * emacs-lisp/cl.el (pushnew-internal): Remove defvar.
+        (pushnew): Fix last change.
+
+2006-09-21  Kenichi Handa  <handa@m17n.org>
+
+        * language/european.el ("Latin-1"): Add windows-1252 to
+        coding-priority.
+        ("German"): Likewise.
+
+2006-09-21  Kim F. Storm  <storm@cua.dk>
+
+        * emacs-lisp/cl-macs.el (member*): Use memql instead of complex code.
+        Suggested by Miles Bader.
+
+        * emacs-lisp/cl.el (pushnew): Rework 2006-09-10 change.  Use memql
+        instead of add-to-list in the simple case.
+
+2006-09-20  Kenichi Handa  <handa@m17n.org>
+
+        * isearch.el (isearch-process-search-char): Cancel the previous
+        change.
+        (isearch-search-string): New function.
+        (isearch-search): Use isearch-search-string.
+        (isearch-lazy-highlight-search): Likewise.
+
+2006-09-20  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * lpr.el (lpr-page-header-switches): Insert `*' at beginning of doc
+        string to become an option.
+
+2006-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (find-buffer-visiting): Don't get fooled by a nil inode.
+
+2006-09-20  Kim F. Storm  <storm@cua.dk>
+
+        * simple.el (line-move-partial): Call pos-visible-in-window-p with
+        position t instead of trying both window-end and window-end - 1.
+
+2006-09-20  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-scan-tags): Find end of subtrees also in
+        hidden trees.
+
 2006-09-20  David Kastrup  <dak@gnu.org>
 
         * mouse.el (mouse-posn-property): Improve doc string.
         (mouse-on-link-p): Change buffers for function calls on links.
 
-        * menu-bar.el (clipboard-yank): bomb out in interactive use if
+        * menu-bar.el (clipboard-yank): Bomb out in interactive use if
         buffer is read-only.
 
-2006-09-18  Ken Manheimer  <ken.manheimer@gmail.com>
+2006-09-20  Ken Manheimer  <ken.manheimer@gmail.com>
 
         * allout.el (allout-unprotected): Let inhibit-read-only only when
         buffer-read-only isn't set.
@@ -17,16 +349,15 @@
         rather than allout-exposure-changed-hook, as a stronger assertion.
         (allout-keybindings-list): Add bindings for
         allout-copy-line-as-kill and allout-copy-topic-as-kill.
-        (allout-copy-line-as-kill, allout-copy-topic-as-kill): copy
-        wrappers for allout-kill-line and allout-kill-topic.
+        (allout-copy-line-as-kill, allout-copy-topic-as-kill):
+        Copy wrappers for allout-kill-line and allout-kill-topic.
         (allout-listify-exposed): Position correctly to accumulate lines.
 
 2006-09-19  Chong Yidong  <cyd@stupidchicken.com>
 
         * simple.el (line-move-1): Escape field boundaries occurring
         exactly at point.  Update goal column if constrained to a field.
-        (line-move-finish): Escape field boundaries occurring exactly at
-        point.
+        (line-move-finish): Escape field boundaries occurring exactly at point.
 
 2006-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 393a696d3f1..d60f920244a 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -914,7 +914,7 @@ Has a preference of looking backwards."
                                ;; Include certain keywords if they
                                ;; precede the name.
                                (setq middle (point))
-                               (forward-word -1)
+                               (forward-sexp -1)
                                ;; Is this C++ method?
                                (when (and (< 2 middle)
                                           (string= (buffer-substring (- middle 2)
diff --git a/lisp/allout.el b/lisp/allout.el
index 2d7a4777df3..5f59e5e0103 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -2202,8 +2202,9 @@ Actually, returns prefix beginning point."
   (save-excursion
     (allout-beginning-of-current-line)
     (and (looking-at allout-regexp)
-         (not (allout-aberrant-container-p))
-         (allout-prefix-data))))
+         (allout-prefix-data)
+         (or (> allout-recent-depth allout-doublecheck-at-and-shallower)
+             (not (allout-aberrant-container-p))))))
 ;;;_    > allout-on-heading-p ()
 (defalias 'allout-on-heading-p 'allout-on-current-heading-p)
 ;;;_    > allout-e-o-prefix-p ()
@@ -2329,7 +2330,7 @@ If less than this depth, ascend to that depth and count..."
 
   (save-excursion
     (cond ((and depth (<= depth 0) 0))
-          ((or (not depth) (= depth (allout-depth)))
+          ((or (null depth) (= depth (allout-depth)))
            (let ((index 1))
              (while (allout-previous-sibling allout-recent-depth nil)
                (setq index (1+ index)))
@@ -2505,13 +2506,13 @@ We skip anomolous low-level topics, a la `allout-aberrant-container-p'."
 (defun allout-chart-subtree (&optional levels visible orig-depth prev-depth)
   "Produce a location \"chart\" of subtopics of the containing topic.
 
-Optional argument LEVELS specifies the depth \(relative to start
-depth) for the chart.
+Optional argument LEVELS specifies a depth limit \(relative to start
+depth) for the chart.  Null LEVELS means no limit.
 
 When optional argument VISIBLE is non-nil, the chart includes
 only the visible subelements of the charted subjects.
 
-The remaining optional args are not for internal use by the function.
+The remaining optional args are for internal use by the function.
 
 Point is left at the end of the subtree.
 
@@ -2618,16 +2619,19 @@ for an explanation of charts."
 
   "Return a flat list of hidden points in subtree CHART, up to DEPTH.
 
+If DEPTH is nil, include hidden points at any depth.
+
 Note that point can be left at any of the points on chart, or at the
 start point."
 
   (let (result here)
-    (while (and (or (eq depth t) (> depth 0))
+    (while (and (or (null depth) (> depth 0))
                 chart)
       (setq here (car chart))
       (if (listp here)
-          (let ((further (allout-chart-to-reveal here (or (eq depth t)
-                                                           (1- depth)))))
+          (let ((further (allout-chart-to-reveal here (if (null depth)
+                                                          depth
+                                                        (1- depth)))))
             ;; We're on the start of a subtree - recurse with it, if there's
             ;; more depth to go:
             (if further (setq result (append further result)))
@@ -2697,7 +2701,10 @@ Returns the point at the beginning of the prefix, or nil if none."
 (defun allout-goto-prefix-doublechecked ()
   "Put point at beginning of immediately containing outline topic.
 
-Like `allout-goto-prefix', but shallow topics \(according to `allout-doublecheck-at-and-shallower') are checked and disqualified for child containment discontinuity, according to `allout-aberrant-container-p'."
+Like `allout-goto-prefix', but shallow topics \(according to
+`allout-doublecheck-at-and-shallower') are checked and
+disqualified for child containment discontinuity, according to
+`allout-aberrant-container-p'."
   (allout-goto-prefix)
   (if (and (<= allout-recent-depth allout-doublecheck-at-and-shallower)
            (allout-aberrant-container-p))
@@ -4620,8 +4627,13 @@ point of non-opened subtree?)"
         (allout-beginning-of-current-line)
         (save-restriction
           (let* (depth
-                 (chart (allout-chart-subtree (or level 1)))
-                 (to-reveal (or (allout-chart-to-reveal chart (or level 1))
+                 ;; translate the level spec for this routine to the ones
+                 ;; used by -chart-subtree and -chart-to-reveal:
+                 (chart-level (cond ((not level) 1)
+                                    ((eq level t) nil)
+                                    (t level)))
+                 (chart (allout-chart-subtree chart-level))
+                 (to-reveal (or (allout-chart-to-reveal chart chart-level)
                                 ;; interactive, show discontinuous children:
                                 (and chart
                                      (interactive-p)
@@ -4672,22 +4684,22 @@ Useful for coherently exposing to a random point in a hidden region."
           (orig-pt (point))
           (orig-pref (allout-goto-prefix-doublechecked))
           (last-at (point))
-          bag-it)
-      (while (or bag-it (allout-hidden-p))
+          (bag-it 0))
+      (while (or (> bag-it 1) (allout-hidden-p))
         (while (allout-hidden-p)
           (move-beginning-of-line 1)
           (if (allout-hidden-p) (forward-char -1)))
         (if (= last-at (setq last-at (point)))
-            ;; Oops, we're not making any progress!  Show the current
-            ;; topic completely, and bag this try.
+            ;; Oops, we're not making any progress!  Show the current topic
+            ;; completely, and try one more time here, if we haven't already.
             (progn (beginning-of-line)
                    (allout-show-current-subtree)
                    (goto-char orig-pt)
-                   (setq bag-it t)
-                   (beep)
-                   (message "%s: %s"
-                            "allout-show-to-offshoot: "
-                            "Aberrant nesting encountered."))
+                   (setq bag-it (1+ bag-it))
+                   (if (> bag-it 1)
+                       (error "allout-show-to-offshoot: %s"
+                              "Stumped by aberrant nesting.")))
+          (if (> bag-it 0) (setq bag-it 0))
           (allout-show-children)
           (goto-char orig-pref)))
       (goto-char orig-pt)))
@@ -4895,7 +4907,10 @@ Examples:
           (cond ((eq curr-elem '*) (allout-show-current-subtree)
                  (if (> allout-recent-end-of-subtree max-pos)
                      (setq max-pos allout-recent-end-of-subtree)))
-                ((eq curr-elem '+) (allout-show-current-branches)
+                ((eq curr-elem '+)
+                 (if (not (allout-hidden-p))
+                     (save-excursion (allout-hide-current-subtree t)))
+                 (allout-show-current-branches)
                  (if (> allout-recent-end-of-subtree max-pos)
                      (setq max-pos allout-recent-end-of-subtree)))
                 ((eq curr-elem '-) (allout-show-current-entry))
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index c7f92a13847..07bc0e247f7 100644
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -409,13 +409,54 @@
      ( \\mu        . calcFunc-moebius )))
 
 (put 'tex 'math-variable-table
-  '( ( \\pi        . var-pi )
-     ( \\infty     . var-inf )
-     ( \\infty     . var-uinf )
-     ( \\phi       . var-phi )
-     ( \\gamma     . var-gamma )
-     ( \\sum       . (math-parse-tex-sum calcFunc-sum) )
-     ( \\prod      . (math-parse-tex-sum calcFunc-prod) )))
+  '( 
+    ;; The Greek letters
+    ( \\alpha      . var-alpha )
+    ( \\beta       . var-beta  )
+    ( \\gamma      . var-gamma )
+    ( \\Gamma      . var-Gamma )
+    ( \\delta      . var-delta )
+    ( \\Delta      . var-Delta )
+    ( \\epsilon    . var-epsilon )
+    ( \\varepsilon . var-varepsilon)
+    ( \\zeta       . var-zeta )
+    ( \\eta        . var-eta  )
+    ( \\theta      . var-theta )
+    ( \\vartheta   . var-vartheta )
+    ( \\Theta      . var-Theta )
+    ( \\iota       . var-iota )
+    ( \\kappa      . var-kappa )
+    ( \\lambda     . var-lambda )
+    ( \\Lambda     . var-Lambda )
+    ( \\mu         . var-mu )
+    ( \\nu         . var-nu )
+    ( \\xi         . var-xi )
+    ( \\Xi         . var-Xi )
+    ( \\pi         . var-pi )
+    ( \\varpi      . var-varpi )
+    ( \\Pi         . var-Pi )
+    ( \\rho        . var-rho )
+    ( \\varrho     . var-varrho )
+    ( \\sigma      . var-sigma )
+    ( \\sigma      . var-varsigma )
+    ( \\Sigma      . var-Sigma )
+    ( \\tau        . var-tau )
+    ( \\upsilon    . var-upsilon )
+    ( \\Upsilon    . var-Upsilon )
+    ( \\phi        . var-phi )
+    ( \\varphi     . var-varphi )
+    ( \\Phi        . var-Phi )
+    ( \\chi        . var-chi )
+    ( \\psi        . var-psi )
+    ( \\Psi        . var-Psi )
+    ( \\omega      . var-omega )
+    ( \\Omega      . var-Omega )
+    ;; Others
+    ( \\ell        . var-ell )
+    ( \\infty      . var-inf )
+    ( \\infty      . var-uinf )
+    ( \\sum        . (math-parse-tex-sum calcFunc-sum) )
+    ( \\prod       . (math-parse-tex-sum calcFunc-prod) )))
 
 (put 'tex 'math-complex-format 'i)
 
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 29e6fe56b6e..892c76bba0c 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -394,8 +394,8 @@ displayed in a window:
                 (if (and (< appt-comp-time appt-message-warning-time)
                          (> (+ cur-comp-time appt-message-warning-time)
                             appt-max-time))
-                    (setq min-to-app (+ (- (1+ appt-max-time) cur-comp-time))
-                          appt-comp-time))
+                    (setq min-to-app (+ (- (1+ appt-max-time) cur-comp-time)
+                          appt-comp-time)))
 
                 ;; issue warning if the appointment time is
                 ;; within appt-message-warning time
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 38bcc887ec0..6fc18d05837 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -568,11 +568,20 @@ are
 
 Names can be capitalized or not, written in full (as specified by the
 variable `calendar-day-name-array'), or abbreviated (as specified by
-`calendar-day-abbrev-array') with or without a period.  To take effect,
-this variable should be set before the calendar package and its associates
-are loaded.  Otherwise, use one of the functions `european-calendar' or
-`american-calendar' to force the appropriate update."
+`calendar-day-abbrev-array') with or without a period.
+
+Setting this variable directly does not take effect (if the
+calendar package is already loaded).  Rather, use either
+\\[customize] or the functions `european-calendar' and
+`american-calendar'."
   :type 'boolean
+  ;; Without :initialize (require 'calendar) throws an error because
+  ;; american-calendar is undefined at this point.
+  :initialize 'custom-initialize-default
+  :set (lambda (symbol value)
+         (if value
+             (european-calendar)
+           (american-calendar)))
   :group 'diary)
 
 ;;;###autoload
@@ -1582,6 +1591,19 @@ See the documentation of that function for more information."
          (calendar-only-one-frame-setup arg))
         (t (calendar-basic-setup arg))))
 
+(autoload 'diary-view-entries "diary-lib"
+  "Prepare and display a buffer with diary entries.
+Searches your diary file for entries that match ARG days starting with
+the date indicated by the cursor position in the displayed three-month
+calendar."
+  t)
+
+(autoload 'list-calendar-holidays "holidays"
+  "Create a buffer containing the holidays for the current calendar window.
+The holidays are those in the list `calendar-notable-days'.  Returns t if any
+holidays are found, nil if not."
+  t)
+
 (defun calendar-basic-setup (&optional arg)
   "Display a three-month calendar in another window.
 The three months appear side by side, with the current month in the middle
@@ -1649,13 +1671,6 @@ to be replaced by asterisks to highlight it whenever it is in the window."
         (list-calendar-holidays)))
   (run-hooks 'initial-calendar-window-hook))
 
-(autoload 'diary-view-entries "diary-lib"
-  "Prepare and display a buffer with diary entries.
-Searches your diary file for entries that match ARG days starting with
-the date indicated by the cursor position in the displayed three-month
-calendar."
-  t)
-
 (autoload 'view-other-diary-entries "diary-lib"
   "Prepare and display buffer of diary entries from an alternative diary file.
 Searches for entries that match ARG days, starting with the date indicated
@@ -1930,12 +1945,6 @@ to the date indicated by point."
 to the date indicated by point."
   t)
 
-(autoload 'list-calendar-holidays "holidays"
-  "Create a buffer containing the holidays for the current calendar window.
-The holidays are those in the list `calendar-notable-days'.  Returns t if any
-holidays are found, nil if not."
-  t)
-
 (autoload 'cal-tex-cursor-month "cal-tex"
   "Make a buffer with LaTeX commands for the month cursor is on.
 Optional prefix argument specifies number of months to be produced.
diff --git a/lisp/comint.el b/lisp/comint.el
index 5e223ef8f18..48b747065b5 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -650,7 +650,10 @@ Entry to this mode runs the hooks on `comint-mode-hook'."
   (make-local-variable 'comint-process-echoes)
   (make-local-variable 'comint-file-name-chars)
   (make-local-variable 'comint-file-name-quote-list)
-  (set (make-local-variable 'comint-accum-marker) (make-marker))
+  (make-local-variable 'comint-accum-marker)
+  (setq comint-accum-marker (make-marker))
+  (make-local-variable 'font-lock-defaults)
+  (setq font-lock-defaults '(nil))
   (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
   ;; This behavior is not useful in comint buffers, and is annoying
   (set (make-local-variable 'next-line-add-newlines) nil))
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 70552c604b7..ab3f7ec2b92 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1521,13 +1521,18 @@ Otherwise use brackets."
             (widget-insert description))
         (widget-insert (format ".
 %s buttons; type RET or click mouse-1 to actuate one.
-Editing a setting changes only the text in the buffer.
-Use the setting's State button to set it or save changes in it.
-Saving a change normally works by editing your Emacs init file.
-See "
+Editing a setting changes only the text in the buffer."
                                (if custom-raised-buttons
                                    "`Raised' text indicates"
                                  "Square brackets indicate")))
+        (if init-file-user
+            (widget-insert "
+Use the setting's State button to set it or save changes in it.
+Saving a change normally works by editing your Emacs init file.")
+            (widget-insert "
+\nSince you started Emacs with `-q', which inhibits use of the
+Emacs init file, you cannot save settings into the Emacs init file."))
+        (widget-insert "\nSee ")
         (widget-create 'custom-manual
                        :tag "Custom file"
                        "(emacs)Saving Customizations")
@@ -4152,6 +4157,8 @@ if only the first line of the docstring is shown."))
                                     recentf-exclude)))
          (old-buffer (find-buffer-visiting filename)))
     (with-current-buffer (or old-buffer (find-file-noselect filename))
+      (unless (eq major-mode 'emacs-lisp-mode)
+        (emacs-lisp-mode))
       (let ((inhibit-read-only t))
         (custom-save-variables)
         (custom-save-faces))
@@ -4548,6 +4555,13 @@ if that value is non-nil."
   (setq widget-documentation-face 'custom-documentation)
   (make-local-variable 'widget-button-face)
   (setq widget-button-face custom-button)
+
+  ;; We need this because of the "More" button on docstrings.
+  ;; Otherwise clicking on "More" can push point offscreen, which
+  ;; causes the window to recenter on point, which pushes the
+  ;; newly-revealed docstring offscreen; which is annoying.  -- cyd.
+  (set (make-local-variable 'widget-button-click-moves-point) t)
+
   (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed)
   (set (make-local-variable 'widget-mouse-face) custom-button-mouse)
 
diff --git a/lisp/custom.el b/lisp/custom.el
index 104e63126f0..e69e233614a 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -210,11 +210,11 @@ The following keywords are meaningful:
         `custom-initialize-reset'.
 :set    VALUE should be a function to set the value of the symbol.
         It takes two arguments, the symbol to set and the value to
-        give it.  The default choice of function is `custom-set-default'.
+        give it.  The default choice of function is `set-default'.
 :get    VALUE should be a function to extract the value of symbol.
         The function takes one argument, a symbol, and should return
         the current value for that symbol.  The default choice of function
-        is `custom-default-value'.
+        is `default-value'.
 :require
         VALUE should be a feature symbol.  If you save a value
         for this option, then when your `.emacs' file loads the value,
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 7433c728405..b89e979ff0b 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -5,10 +5,10 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2006-02-06 13:37:10 ttn>
+;; Time-stamp: <2006/09/15 17:35:06 vinicius>
 ;; Version: 2.1
 ;; Keywords: internal
-;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
+;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/dired.el b/lisp/dired.el
index 2974b386d0b..491ef261c11 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2204,40 +2204,40 @@ instead of `dired-actual-switches'."
                  (concat "\\`" (match-string 1 default-directory)))))
       (goto-char (point-min))
       (setq dired-subdir-alist nil)
-      (while (and (re-search-forward dired-subdir-regexp nil t)
-                  ;; Avoid taking a file name ending in a colon
-                  ;; as a subdir name.
-                  (not (save-excursion
-                         (goto-char (match-beginning 0))
-                         (beginning-of-line)
-                         (forward-char 2)
-                         (save-match-data (looking-at dired-re-perms)))))
-        (save-excursion
-          (goto-char (match-beginning 1))
-          (setq new-dir-name
-                (buffer-substring-no-properties (point) (match-end 1))
-                new-dir-name
-                (save-match-data
-                  (if (and R-ftp-base-dir-regex
-                           (not (string= new-dir-name default-directory))
-                           (string-match R-ftp-base-dir-regex new-dir-name))
-                      (concat default-directory
-                              (substring new-dir-name (match-end 0)))
-                    (expand-file-name new-dir-name))))
-          (delete-region (point) (match-end 1))
-          (insert new-dir-name))
-        (setq count (1+ count))
-        (dired-alist-add-1 new-dir-name
-                           ;; Place a sub directory boundary between lines.
-                           (save-excursion
-                             (goto-char (match-beginning 0))
-                             (beginning-of-line)
-                             (point-marker))))
+      (while (re-search-forward dired-subdir-regexp nil t)
+        ;; Avoid taking a file name ending in a colon
+        ;; as a subdir name.
+        (unless (save-excursion
+                  (goto-char (match-beginning 0))
+                  (beginning-of-line)
+                  (forward-char 2)
+                  (save-match-data (looking-at dired-re-perms)))
+          (save-excursion
+            (goto-char (match-beginning 1))
+            (setq new-dir-name
+                  (buffer-substring-no-properties (point) (match-end 1))
+                  new-dir-name
+                  (save-match-data
+                    (if (and R-ftp-base-dir-regex
+                             (not (string= new-dir-name default-directory))
+                             (string-match R-ftp-base-dir-regex new-dir-name))
+                        (concat default-directory
+                                (substring new-dir-name (match-end 0)))
+                      (expand-file-name new-dir-name))))
+            (delete-region (point) (match-end 1))
+            (insert new-dir-name))
+          (setq count (1+ count))
+          (dired-alist-add-1 new-dir-name
+                             ;; Place a sub directory boundary between lines.
+                             (save-excursion
+                               (goto-char (match-beginning 0))
+                               (beginning-of-line)
+                               (point-marker)))))
       (if (and (> count 1) (interactive-p))
-          (message "Buffer includes %d directories" count))
-      ;; We don't need to sort it because it is in buffer order per
-      ;; constructionem.  Return new alist:
-      dired-subdir-alist)))
+          (message "Buffer includes %d directories" count)))
+    ;; We don't need to sort it because it is in buffer order per
+    ;; constructionem.  Return new alist:
+    dired-subdir-alist))
 
 (defun dired-alist-add-1 (dir new-marker)
   ;; Add new DIR at NEW-MARKER.  Don't sort.
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 45ec97b3281..ab3bfeccfb3 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2578,21 +2578,7 @@ surrounded by (block NAME ...).
                    (cl-const-expr-val (nth 1 keys)))))
     (cond ((eq test 'eq) (list 'memq a list))
           ((eq test 'equal) (list 'member a list))
-          ((or (null keys) (eq test 'eql))
-           (if (eq (cl-const-expr-p a) t)
-               (list (if (floatp-safe (cl-const-expr-val a)) 'member 'memq)
-                     a list)
-             (if (eq (cl-const-expr-p list) t)
-                 (let ((p (cl-const-expr-val list)) (mb nil) (mq nil))
-                   (if (not (cdr p))
-                       (and p (list 'eql a (list 'quote (car p))))
-                     (while p
-                       (if (floatp-safe (car p)) (setq mb t)
-                         (or (integerp (car p)) (symbolp (car p)) (setq mq t)))
-                       (setq p (cdr p)))
-                     (if (not mb) (list 'memq a list)
-                       (if (not mq) (list 'member a list) form))))
-               form)))
+          ((or (null keys) (eq test 'eql)) (list 'memql a list))
           (t form))))
 
 (define-compiler-macro assoc* (&whole form a list &rest keys)
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 53bec05ddc3..3399f7e7b20 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -159,9 +159,7 @@ an element already on the list.
 \n(fn X PLACE [KEYWORD VALUE]...)"
   (if (symbolp place)
       (if (null keys)
-          `(let ((pushnew-internal ,place))
-             (add-to-list 'pushnew-internal ,x nil 'eql)
-             (setq ,place pushnew-internal))
+          `(if (memql ,x ,place) ,place (setq ,place (cons ,x ,place)))
         (list 'setq place (list* 'adjoin x place keys)))
     (list* 'callf2 'adjoin x place keys)))
 
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 50b7d8dc9ef..42c5d3183e7 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -64,7 +64,7 @@
   (concat
    "^\\s-*(\\(def\\(ine-skeleton\\|ine-generic-mode\\|ine-derived-mode\\|\
 ine\\(?:-global\\)?-minor-mode\\|ine-compilation-mode\\|un-cvs-mode\\|\
-foo\\|[^cfgv]\\(\\w\\|\\s_\\)+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\
+foo\\|[^icfgv]\\(\\w\\|\\s_\\)+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\
 menu-bar-make-toggle\\)"
    find-function-space-re
    "\\('\\|\(quote \\)?%s\\(\\s-\\|$\\|\(\\|\)\\)")
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 54c5aff305a..0c66a207351 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -300,7 +300,11 @@ and idle timers such as are scheduled by `run-with-idle-timer'."
   "Third-to-last timer that was run.")
 
 (defvar timer-max-repeats 10
-  "*Maximum number of times to repeat a timer, if real time jumps.")
+  "*Maximum number of times to repeat a timer, if many repeats are delayed.
+Timer invocations can be delayed because Emacs is suspended or busy,
+or because the system's time changes.  If such an occurrence makes it
+appear that many invocations are overdue, this variable controls
+how many will really happen.")
 
 (defun timer-until (timer time)
   "Calculate number of seconds from when TIMER will run, until TIME.
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 5ff63bfdec2..bd0c213ba6e 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -954,7 +954,7 @@ If t, `ffap-tex-init' will initialize this when needed.")
     (substring name 2))))
 
 (defvar ffap-rfc-path
-  (concat (ffap-host-to-filename "ds.internic.net") "/rfc/rfc%s.txt"))
+  (concat (ffap-host-to-filename "ftp.rfc-editor.org") "/in-notes/rfc%s.txt"))
 
 (defun ffap-rfc (name)
   (format ffap-rfc-path
diff --git a/lisp/files.el b/lisp/files.el
index 642bd2d9372..3e2cf2ee92d 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1117,13 +1117,15 @@ expand wildcards (if any) and visit multiple files."
                 (mapcar 'switch-to-buffer (cdr value))))
       (switch-to-buffer-other-frame value))))
 
-(defun find-file-existing (filename &optional wildcards)
-  "Edit the existing file FILENAME.
-Like \\[find-file] but only allow a file that exists."
-  (interactive (find-file-read-args "Find existing file: " t))
-  (unless (file-exists-p filename) (error "%s does not exist" filename))
-  (find-file filename wildcards)
-  (current-buffer))
+(defun find-file-existing (filename)
+   "Edit the existing file FILENAME.
+Like \\[find-file] but only allow a file that exists, and do not allow
+file names with wildcards."
+   (interactive (nbutlast (find-file-read-args "Find existing file: " t)))
+   (if (and (not (interactive-p)) (not (file-exists-p filename)))
+       (error "%s does not exist" filename)
+     (find-file filename)
+     (current-buffer)))
 
 (defun find-file-read-only (filename &optional wildcards)
   "Edit file FILENAME but don't allow changes.
@@ -1365,7 +1367,7 @@ If there is no such live buffer, return nil."
                (number (nthcdr 10 attributes))
                (list (buffer-list)) found)
           (and buffer-file-numbers-unique
-               number
+               (car-safe number)       ;Make sure the inode is not just nil.
                (while (and (not found) list)
                  (with-current-buffer (car list)
                    (if (and buffer-file-name
@@ -3729,7 +3731,13 @@ This requires the external program `diff' to be in your `exec-path'."
        ;; Return nil to ask about BUF again.
        nil)
      "view this file")
-    (?d diff-buffer-with-file
+    (?d (lambda (buf)
+          (save-window-excursion
+            (diff-buffer-with-file buf))
+          (view-buffer (get-buffer-create "*Diff*")
+                       (lambda (ignore) (exit-recursive-edit)))
+          (recursive-edit)
+          nil)
         "view changes in file"))
   "ACTION-ALIST argument used in call to `map-y-or-n-p'.")
 
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 60a4b3c00b1..1bae9cba362 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1168,7 +1168,12 @@ what properties to clear before refontifying a region.")
           ;; number of lines.
           ;; (setq beg (progn (goto-char beg) (line-beginning-position))
           ;;       end (progn (goto-char end) (line-beginning-position 2)))
-          )
+          (unless (eq end (point-max))
+            ;; Rounding up to a whole number of lines should include the
+            ;; line right after `end'.  Typical case: the first char of
+            ;; the line was deleted.  Or a \n was inserted in the middle
+            ;; of a line.
+            (setq end (1+ end))))
         (font-lock-fontify-region beg end)))))
 
 (defvar jit-lock-start) (defvar jit-lock-end)
@@ -1205,9 +1210,17 @@ This function does 2 things:
         (setq beg (or (previous-single-property-change
                        beg 'font-lock-multiline)
                       (point-min))))
-      (setq end (or (text-property-any end (point-max)
-                                       'font-lock-multiline nil)
-                    (point-max)))
+      (when (< end (point-max))
+        (setq end
+              (if (get-text-property end 'font-lock-multiline)
+                  (or (text-property-any end (point-max)
+                                         'font-lock-multiline nil)
+                      (point-max))
+                ;; Rounding up to a whole number of lines should include the
+                ;; line right after `end'.  Typical case: the first char of
+                ;; the line was deleted.  Or a \n was inserted in the middle
+                ;; of a line.
+                (1+ end))))
       ;; Finally, pre-enlarge the region to a whole number of lines, to try
       ;; and anticipate what font-lock-default-fontify-region will do, so as to
       ;; avoid double-redisplay.
@@ -1217,11 +1230,11 @@ This function does 2 things:
       (when (memq 'font-lock-extend-region-wholelines
                   font-lock-extend-region-functions)
         (goto-char beg)
-        (forward-line 0)
-        (setq jit-lock-start (min jit-lock-start (point)))
+        (setq jit-lock-start (min jit-lock-start (line-beginning-position)))
         (goto-char end)
-        (forward-line 1)
-        (setq jit-lock-end (max jit-lock-end (point)))))))
+        (setq jit-lock-end
+              (max jit-lock-end
+                   (if (bolp) (point) (line-beginning-position 2))))))))
 
 (defun font-lock-fontify-block (&optional arg)
   "Fontify some lines the way `font-lock-fontify-buffer' would.
@@ -1646,9 +1659,11 @@ If SYNTACTIC-KEYWORDS is non-nil, it means these keywords are used for
           (cons t (cons keywords
                         (mapcar 'font-lock-compile-keyword keywords))))
     (if (and (not syntactic-keywords)
-             (eq (or syntax-begin-function
-                     font-lock-beginning-of-syntax-function)
-                 'beginning-of-defun)
+             (let ((beg-function
+                    (or font-lock-beginning-of-syntax-function
+                        syntax-begin-function)))
+               (or (eq beg-function 'beginning-of-defun)
+                   (get beg-function 'font-lock-syntax-paren-check)))
              (not beginning-of-defun-function))
         ;; Try to detect when a string or comment contains something that
         ;; looks like a defun and would thus confuse font-lock.
diff --git a/lisp/frame.el b/lisp/frame.el
index 8f7fdf1fd5c..9aba8c54089 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -681,7 +681,7 @@ the user during startup."
         (nreverse frame-initial-geometry-arguments))
   (cdr param-list))
 
-(defcustom focus-follows-mouse t
+(defcustom focus-follows-mouse (not (eq window-system 'mac))
   "*Non-nil if window system changes focus when you move the mouse.
 You should set this variable to tell Emacs how your window manager
 handles focus, since there is no way in general for Emacs to find out
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index dbd88f32180..ad3c6ad919e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,16 @@
+2006-09-28  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gmm-utils.el (gmm): Adjust custom version.
+
+        * mm-util.el (mm-charset-override-alist, mm-charset-eval-alist): Adjust
+        custom version.
+
+        * gnus-draft.el (gnus-draft-mode): Don't call `mml-mode'.
+
+2006-09-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * gnus-demon.el (gnus-demon): Use with-local-quit to avoid hangs.
+
 2006-09-19  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
         * nnslashdot.el (nnslashdot-request-article): Update end-of-article
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index f314d0e81d7..e773aa3bfac 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -35,7 +35,7 @@
 (defgroup gmm nil
   "Utility functions for Gnus, Message and MML"
   :prefix "gmm-"
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :group 'lisp)
 
 ;; Helper functions from `gnus-utils.el': gmm-verbose, gmm-message, gmm-error
diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index 8df3a3b0e70..bf35f1ddee7 100644
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -218,7 +218,7 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
                    (< idle gnus-demon-idle-time)) ; Idle timed out.
                   (t (< 0 gnus-demon-idle-time)))) ; Or just need to be idle.
                ;; So we call the handler.
-               (progn
+               (with-local-quit
                  (ignore-errors (funcall (car handler)))
                  ;; And reset the timer.
                  (setcar (nthcdr 1 handler)
@@ -232,14 +232,15 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
                (gnus-demon-is-idle-p))
           ;; We want to call this handler each and every time that
           ;; Emacs is idle.
-          (ignore-errors (funcall (car handler))))
+          (with-local-quit
+            (ignore-errors (funcall (car handler)))))
          (t
           ;; We want to call this handler only if Emacs has been idle
           ;; for a specified number of timesteps.
           (and (not (memq (car handler) gnus-demon-idle-has-been-called))
                (< idle gnus-demon-idle-time)
                (gnus-demon-is-idle-p)
-               (progn
+               (with-local-quit
                  (ignore-errors (funcall (car handler)))
                  ;; Make sure the handler won't be called once more in
                  ;; this idle-cycle.
diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index 125e5bebd49..013be410632 100644
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -76,7 +76,6 @@
       (when (gnus-visual-p 'draft-menu 'menu)
         (gnus-draft-make-menu-bar))
       (gnus-add-minor-mode 'gnus-draft-mode " Draft" gnus-draft-mode-map)
-      (mml-mode)
       (gnus-run-hooks 'gnus-draft-mode-hook))))
 
 ;;; Commands
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 22bbecf7e39..8778d0a4b57 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -253,7 +253,7 @@ superset of iso-8859-1."
                        :tag "Other options"
                        (cons (symbol :tag "From charset")
                              (symbol :tag "To charset"))))
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :group 'mime)
 
 (defcustom mm-charset-eval-alist
@@ -270,7 +270,7 @@ If an article is encoded in an unknown CHARSET, FORM is
 evaluated.  This allows to load additional libraries providing
 charsets on demand.  If supported by your Emacs version, you
 could use `autoload-coding-system' here."
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :type '(list (set :inline t
                     (const (windows-1250 . (mm-codepage-setup 1250 t)))
                     (const (windows-1251 . (mm-codepage-setup 1251 t)))
diff --git a/lisp/help.el b/lisp/help.el
index fafe6e57ed0..b79e028b633 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -571,11 +571,9 @@ temporarily enables it to allow getting help on disabled items and buttons."
            ;; down-events on scroll bars and mode lines: the actual
            ;; event then is in the second element of the vector.
            (and (vectorp key)
-                (or (and (eventp (aref key 0))
-                         (memq 'down (event-modifiers (aref key 0))))
-                    (and (> (length key) 1)
-                         (eventp (aref key 1))
-                         (memq 'down (event-modifiers (aref key 1)))))
+                (let ((last-idx (1- (length key))))
+                  (and (eventp (aref key last-idx))
+                       (memq 'down (event-modifiers (aref key last-idx)))))
                 (read-event))
            (list
             key
@@ -643,11 +641,21 @@ temporarily enables it to allow getting help on disabled items and buttons."
            (list
             key
             (prefix-numeric-value current-prefix-arg)
-            ;; If KEY is a down-event, read the corresponding up-event
-            ;; and use it as the third argument.
+            ;; If KEY is a down-event, read and discard the
+            ;; corresponding up-event.  Note that there are also
+            ;; down-events on scroll bars and mode lines: the actual
+            ;; event then is in the second element of the vector.
             (and (vectorp key)
+                 (let ((last-idx (1- (length key))))
+                   (and (eventp (aref key last-idx))
+                        (memq 'down (event-modifiers (aref key last-idx)))))
                  (or (and (eventp (aref key 0))
-                          (memq 'down (event-modifiers (aref key 0))))
+                          (memq 'down (event-modifiers (aref key 0)))
+                          ;; However, for the C-down-mouse-2 popup
+                          ;; menu, there is no subsequent up-event.  In
+                          ;; this case, the up-event is the next
+                          ;; element in the supplied vector.
+                          (= (length key) 1))
                      (and (> (length key) 1)
                           (eventp (aref key 1))
                           (memq 'down (event-modifiers (aref key 1)))))
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 292e158c097..4ab7b9eda41 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -370,7 +370,11 @@ With numeric ARG, enable auto-update if and only if ARG is positive."
   "Evaluate FORM in each of the buffers.
 Does not display the buffer during evaluation. See
 `ibuffer-do-view-and-eval' for that."
-  (:interactive "xEval in buffers (form): "
+  (:interactive
+   (list
+    (read-from-minibuffer
+     "Eval in buffers (form): "
+     nil read-expression-map t 'read-expression-history))
    :opstring "evaluated in"
    :modifier-p :maybe)
   (eval form))
@@ -379,7 +383,11 @@ Does not display the buffer during evaluation. See
 (define-ibuffer-op view-and-eval (form)
   "Evaluate FORM while displaying each of the marked buffers.
 To evaluate a form without viewing the buffer, see `ibuffer-do-eval'."
-  (:interactive "xEval viewing buffers (form): "
+  (:interactive
+   (list
+    (read-from-minibuffer
+     "Eval viewing in buffers (form): "
+     nil read-expression-map t 'read-expression-history))
    :opstring "evaluated in"
    :complex t
    :modifier-p :maybe)
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index f53ef7c91d1..6687c13275b 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -157,6 +157,12 @@ is minibuffer."
                                          (< (length x) (length y))))
                                ", ")
                     ">"))))))
+;;;_  = icomplete-with-completion-tables
+(defvar icomplete-with-completion-tables '(internal-complete-buffer)
+  "Specialized completion tables with which icomplete should operate.
+
+Icomplete does not operate with any specialized completion tables
+except those on this list.")
 
 ;;;_ > icomplete-mode (&optional prefix)
 ;;;###autoload
@@ -184,8 +190,9 @@ Conditions are:
   (and (window-minibuffer-p (selected-window))
        (not executing-kbd-macro)
        minibuffer-completion-table
-       ;; (or minibuffer-completing-file-name
-       (not (functionp minibuffer-completion-table)))) ;; )
+       (or (not (functionp minibuffer-completion-table))
+           (member minibuffer-completion-table
+                   icomplete-with-completion-tables))))
 
 ;;;_ > icomplete-minibuffer-setup ()
 (defun icomplete-minibuffer-setup ()
diff --git a/lisp/ido.el b/lisp/ido.el
index 432347717f5..b68a4622ef8 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2224,7 +2224,6 @@ If INITIAL is non-nil, it specifies the initial input string."
   (let ((ido-current-directory (ido-expand-directory default))
         (ido-context-switch-command switch-cmd)
         ido-directory-nonreadable ido-directory-too-big
-        (minibuffer-completing-file-name t)
         filename)
 
     (if (or (not ido-mode) (ido-is-slow-ftp-host))
@@ -2268,9 +2267,10 @@ If INITIAL is non-nil, it specifies the initial input string."
 
       (unless filename
         (setq ido-saved-vc-hb vc-handled-backends)
-        (setq filename (ido-read-internal item
-                                          (or prompt "Find file: ")
-                                          'ido-file-history nil nil initial)))
+        (let ((minibuffer-completing-file-name t))
+          (setq filename (ido-read-internal item
+                                            (or prompt "Find file: ")
+                                            'ido-file-history nil nil initial))))
 
       ;; Choose the file name: either the text typed in, or the head
       ;; of the list of matches
diff --git a/lisp/isearch.el b/lisp/isearch.el
index b3455b13ab8..0d253211da4 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1803,8 +1803,6 @@ Isearch mode."
    ((eq   char ?|)       (isearch-fallback t nil t)))
 
   ;; Append the char to the search string, update the message and re-search.
-  (if (char-table-p translation-table-for-input)
-      (setq char (or (aref translation-table-for-input char) char)))
   (isearch-process-search-string
    (char-to-string char)
    (if (>= char ?\200)
@@ -1989,6 +1987,36 @@ Can be changed via `isearch-search-fun-function' for special needs."
      (t
       (if isearch-forward 'search-forward 'search-backward)))))
 
+(defun isearch-search-string (string bound noerror)
+  ;; Search for the first occurance of STRING or its translation.  If
+  ;; found, move point to the end of the occurance, update
+  ;; isearch-match-beg and isearch-match-end, and return point.
+  (let ((func (isearch-search-fun))
+        (len (length string))
+        pos1 pos2)
+    (setq pos1 (save-excursion (funcall func string bound noerror)))
+    (if (and (char-table-p translation-table-for-input)
+             (> (string-bytes string) len))
+        (let (translated match-data)
+          (dotimes (i len)
+            (let ((x (aref translation-table-for-input (aref string i))))
+              (when x
+                (or translated (setq translated (copy-sequence string)))
+                (aset translated i x))))
+          (when translated
+            (save-match-data
+              (save-excursion
+                (if (setq pos2 (funcall func translated bound noerror))
+                    (setq match-data (match-data t)))))
+            (when (and pos2
+                       (or (not pos1)
+                           (if isearch-forward (< pos2 pos1) (> pos2 pos1))))
+              (setq pos1 pos2)
+              (set-match-data match-data)))))
+    (if pos1
+        (goto-char pos1))
+    pos1))
+
 (defun isearch-search ()
   ;; Do the search with the current search string.
   (isearch-message nil t)
@@ -2004,9 +2032,7 @@ Can be changed via `isearch-search-fun-function' for special needs."
         (setq isearch-error nil)
         (while retry
           (setq isearch-success
-                (funcall
-                 (isearch-search-fun)
-                 isearch-string nil t))
+                (isearch-search-string isearch-string nil t))
           ;; Clear RETRY unless we matched some invisible text
           ;; and we aren't supposed to do that.
           (if (or (eq search-invisible t)
@@ -2349,7 +2375,7 @@ Attempt to do the search exactly the way the pending isearch would."
         (isearch-regexp isearch-lazy-highlight-regexp)
         (search-spaces-regexp search-whitespace-regexp))
     (condition-case nil
-        (funcall (isearch-search-fun)
+        (isearch-search-string
                  isearch-lazy-highlight-last-string
                  (if isearch-forward
                      (min (or isearch-lazy-highlight-end-limit (point-max))
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 4cbc7da4511..e049579d463 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -349,7 +349,7 @@ Defaults to the whole buffer.  END can be out of bounds."
          ;; Fontify chunks beginning at START.  The end of a
          ;; chunk is either `end', or the start of a region
          ;; before `end' that has already been fontified.
-         (while start
+         (while (and start (< start end))
            ;; Determine the end of this chunk.
            (setq next (or (text-property-any start end 'fontified t)
                           end))
@@ -397,16 +397,18 @@ Defaults to the whole buffer.  END can be out of bounds."
            ;; eagerly extend the refontified region with
            ;; jit-lock-after-change-extend-region-functions.
            (when (< start orig-start)
-             (run-with-timer 0 nil 'jit-lock-fontify-again
+             (run-with-timer 0 nil 'jit-lock-force-redisplay
                              (current-buffer) start orig-start))
 
            ;; Find the start of the next chunk, if any.
            (setq start (text-property-any next end 'fontified nil))))))))
 
-(defun jit-lock-fontify-again (buf start end)
-  "Fontify in buffer BUF from START to END."
+(defun jit-lock-force-redisplay (buf start end)
+  "Force the display engine to re-render buffer BUF from START to END."
   (with-current-buffer buf
     (with-buffer-prepared-for-jit-lock
+     ;; Don't cause refontification (it's already been done), but just do
+     ;; some random buffer change, so as to force redisplay.
      (put-text-property start end 'fontified t))))
 
 
diff --git a/lisp/lpr.el b/lisp/lpr.el
index dd39eb24349..2c2e8c872c4 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -141,7 +141,7 @@ See definition of `print-region-1' for calling conventions."
 ;; Berkeley systems support -F, and GNU pr supports both -f and -F,
 ;; So it looks like -F is a better default.
 (defcustom lpr-page-header-switches '("-h %s" "-F")
-  "List of strings to use as options for the page-header-generating program.
+  "*List of strings to use as options for the page-header-generating program.
 If `%s' appears in one of the strings, it is substituted by the page title.
 The variable `lpr-page-header-program' specifies the program to use."
   :type '(repeat string)
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 3fc0477a0a0..9557844a32a 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -541,7 +541,7 @@ This is relative to `smtpmail-queue-dir'.")
                  (decoded (base64-decode-string challenge))
                  (hash (rfc2104-hash 'md5 64 16 passwd decoded))
                  (response (concat (smtpmail-cred-user cred) " " hash))
-                 (encoded (base64-encode-string response)))
+                 (encoded (base64-encode-string response t)))
             (smtpmail-send-command process (format "%s" encoded))
             (if (or (null (car (setq ret (smtpmail-read-response process))))
                     (not (integerp (car ret)))
@@ -554,12 +554,12 @@ This is relative to `smtpmail-queue-dir'.")
                 (>= (car ret) 400))
             (throw 'done nil))
         (smtpmail-send-command
-         process (base64-encode-string (smtpmail-cred-user cred)))
+         process (base64-encode-string (smtpmail-cred-user cred) t))
         (if (or (null (car (setq ret (smtpmail-read-response process))))
                 (not (integerp (car ret)))
                 (>= (car ret) 400))
             (throw 'done nil))
-        (smtpmail-send-command process (base64-encode-string passwd))
+        (smtpmail-send-command process (base64-encode-string passwd t))
         (if (or (null (car (setq ret (smtpmail-read-response process))))
                 (not (integerp (car ret)))
                 (>= (car ret) 400))
@@ -576,7 +576,7 @@ This is relative to `smtpmail-queue-dir'.")
                                         (concat "\0"
                                                 (smtpmail-cred-user cred)
                                                 "\0"
-                                                passwd))))
+                                                passwd) t)))
         (if (or (null (car (setq ret (smtpmail-read-response process))))
                 (not (integerp (car ret)))
                 (not (equal (car ret) 235)))
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index a49e3b2a4a3..76875b2849b 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,18 @@
+2006-09-25  Stephen Gildea  <gildea@stop.mail-abuse.org>
+
+        * mh-junk.el (mh-spamassassin-whitelist): Add two missing
+        quotation marks, so that the last two arguments of sa-learn 
+        are separated properly (closes SF #1565460).
+        
+        * (mh-spamassassin-blacklist): In example .procmailrc, add
+        PATH element to find mhparam on Debian.
+        
+2006-09-24  Stephen Gildea  <gildea@stop.mail-abuse.org>
+
+        * mh-comp.el (mh-send-args): Initialize to "" instead of nil 
+        so that we always have a valid string for split-string even if
+        nothing is added in mh-send-letter (closes SF #1564742).
+
 2006-07-03  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 8.0.2.
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 7156b0cf318..a967a2c8d9e 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -127,7 +127,7 @@ Used by the \\[mh-edit-again] and \\[mh-extract-rejected-mail] commands.")
         (make-syntax-table text-mode-syntax-table))
   (modify-syntax-entry ?% "." mh-letter-mode-syntax-table))
 
-(defvar mh-send-args nil
+(defvar mh-send-args ""
   "Extra args to pass to \"send\" command.")
 
 (defvar mh-annotate-char nil
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index 9d02db0dc11..67f267d672f 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -115,6 +115,9 @@ http://spamassassin.org/.
 To use SpamAssassin, add the following recipes to
 \".procmailrc\":
 
+    # Append to $PATH the location of mhparam in some distros.
+    PATH=$PATH:/usr/bin/mh
+
     MAILDIR=$HOME/`mhparam Path`
 
     # Fight spam with SpamAssassin.
@@ -244,7 +247,7 @@ See `mh-spamassassin-blacklist' for more information."
       (when mh-sa-learn-executable
         (message "Recategorizing this message as ham...")
         (call-process mh-sa-learn-executable msg-file mh-temp-buffer nil
-                      "--single" "--ham" "--local --no-rebuild"))
+                      "--single" "--ham" "--local" "--no-rebuild"))
       (message "Whitelisting message %d..." msg)
       (setq from
             (car (mh-funcall-if-exists
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 18b16c6460d..0b6cccd86c6 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -778,7 +778,7 @@ If the click is in the echo area, display the `*Messages*' buffer."
 (defun mouse-posn-property (pos property)
   "Look for a property at click position.
 POS may be either a buffer position or a click position like
-those returned from `start-event'.  If the click position is on
+those returned from `event-start'.  If the click position is on
 a string, the text property PROPERTY is examined.
 If this is nil or the click is not on a string, then
 the corresponding buffer position is searched for PROPERTY.
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index a9105227bfd..1f2bad13dcd 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -618,7 +618,6 @@ If non-nil, NEW means to create a new buffer no matter what."
          (str (car hf))
          (done "")
          (tin (ewoc-nth cvs-cookies 0)))
-    (if (eq (length str) 2) (setq str ""))
     ;; look for the first *real* fileinfo (to determine emptyness)
     (while
         (and tin
@@ -626,14 +625,17 @@ If non-nil, NEW means to create a new buffer no matter what."
                    '(MESSAGE DIRCHANGE)))
       (setq tin (ewoc-next cvs-cookies tin)))
     (if add
-        (setq str (concat "-- Running " cmd " ...\n" str))
+        (progn
+          ;; Remove the default empty line, if applicable.
+          (if (not (string-match "." str)) (setq str "\n"))
+          (setq str (concat "-- Running " cmd " ...\n" str)))
       (if (not (string-match
                 (concat "^-- Running " (regexp-quote cmd) " \\.\\.\\.\n") str))
           (error "Internal PCL-CVS error while removing message")
         (setq str (replace-match "" t t str))
-        (if (zerop (length str)) (setq str "\n"))
-        (setq done (concat "-- last cmd: " cmd " --"))))
-    (setq str (concat str "\n") done (concat done "\n"))
+        ;; Re-add the default empty line, if applicable.
+        (if (not (string-match "." str)) (setq str "\n\n"))
+        (setq done (concat "-- last cmd: " cmd " --\n"))))
     ;; set the new header and footer
     (ewoc-set-hf cvs-cookies
                  str (concat "\n--------------------- "
diff --git a/lisp/printing.el b/lisp/printing.el
index 94be3dfbfab..18252155e49 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -5,10 +5,10 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2006-02-06 15:06:40 ttn>
+;; Time-stamp: <2006/09/15 18:53:14 vinicius>
 ;; Keywords: wp, print, PostScript
 ;; Version: 6.8.4
-;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
+;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 (defconst pr-version "6.8.4"
   "printing.el, v 6.8.4 <2005/06/11 vinicius>
@@ -2799,7 +2799,7 @@ See `pr-ps-printer-alist'.")
 
 
 (defalias 'pr-get-symbol
-  (if (fboundp 'easy-menu-intern)
+  (if (fboundp 'easy-menu-intern)       ; hacked from easymenu.el
       'easy-menu-intern
     (lambda (s) (if (stringp s) (intern s) s))))
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index e6a6a8ed9c5..7d9ce41229c 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1784,17 +1784,31 @@ and overlay is highlighted between MK and END-MK."
                                 (current-buffer)))
               (move-overlay compilation-highlight-overlay
                             (point) end (current-buffer)))
-            (if (numberp next-error-highlight)
-                (setq next-error-highlight-timer
-                      (run-at-time next-error-highlight nil 'delete-overlay
-                                   compilation-highlight-overlay)))
-            (if (not (or (eq next-error-highlight t)
-                         (numberp next-error-highlight)))
-                (delete-overlay compilation-highlight-overlay))))))
+            (if (or (eq next-error-highlight t)
+                    (numberp next-error-highlight))
+                ;; We want highlighting: delete overlay on next input.
+                (add-hook 'pre-command-hook
+                          'compilation-goto-locus-delete-o)
+              ;; We don't want highlighting: delete overlay now.
+              (delete-overlay compilation-highlight-overlay))
+            ;; We want highlighting for a limited time:
+            ;; set up a timer to delete it.
+            (when (numberp next-error-highlight)
+              (setq next-error-highlight-timer
+                    (run-at-time next-error-highlight nil
+                                 'compilation-goto-locus-delete-o)))))))
     (when (and (eq next-error-highlight 'fringe-arrow))
+      ;; We want a fringe arrow (instead of highlighting).
       (setq next-error-overlay-arrow-position
             (copy-marker (line-beginning-position))))))
 
+(defun compilation-goto-locus-delete-o ()
+  (delete-overlay compilation-highlight-overlay)
+  ;; Get rid of timer and hook that would try to do this again.
+  (if (timerp next-error-highlight-timer)
+      (cancel-timer next-error-highlight-timer))
+  (remove-hook 'pre-command-hook
+               'compilation-goto-locus-delete-o))
 
 (defun compilation-find-file (marker filename directory &rest formats)
   "Find a buffer for file FILENAME.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index ad44753f352..69f4549a0bf 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -3914,12 +3914,14 @@ CHARS is a string that contains good characters to have before us (however,
         (if (get-text-property (point) 'here-doc-group)
             (progn
               (goto-char
-               (previous-single-property-change (point) 'here-doc-group))
+               (or (previous-single-property-change (point) 'here-doc-group)
+                   (point)))
               (beginning-of-line 0)))
         (if (get-text-property (point) 'in-pod)
             (progn
               (goto-char
-               (previous-single-property-change (point) 'in-pod))
+               (or (previous-single-property-change (point) 'in-pod)
+                   (point)))
               (beginning-of-line 0)))
         (if (looking-at "^[ \t]*\\(#\\|$\\)") nil ; Only comment, skip
           ;; Else: last iteration, or a label
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index bce4381c614..9f27c8a60f1 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -5,10 +5,10 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2005-09-18 07:27:20 deego>
+;; Time-stamp: <2006/09/26 21:49:46 vinicius>
 ;; Keywords: wp, ebnf, PostScript
-;; Version: 4.2
-;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
+;; Version: 4.3
+;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 ;; This file is part of GNU Emacs.
 
@@ -27,8 +27,8 @@
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
-(defconst ebnf-version "4.2"
-  "ebnf2ps.el, v 4.2 <2004/04/04 vinicius>
+(defconst ebnf-version "4.3"
+  "ebnf2ps.el, v 4.3 <2006/09/26 vinicius>
 
 Vinicius's last change version.  When reporting bugs, please also
 report the version of Emacs, if any, that ebnf2ps was running with.
@@ -73,18 +73,18 @@ Please send all bug fixes and enhancements to
 ;; ebnf2ps provides the following commands for generating PostScript syntactic
 ;; chart images of Emacs buffers:
 ;;
-;;      ebnf-print-directory
-;;      ebnf-print-file
-;;      ebnf-print-buffer
-;;      ebnf-print-region
-;;      ebnf-spool-directory
-;;      ebnf-spool-file
-;;      ebnf-spool-buffer
-;;      ebnf-spool-region
-;;      ebnf-eps-directory
-;;      ebnf-eps-file
-;;      ebnf-eps-buffer
-;;      ebnf-eps-region
+;;    ebnf-print-directory
+;;    ebnf-print-file
+;;    ebnf-print-buffer
+;;    ebnf-print-region
+;;    ebnf-spool-directory
+;;    ebnf-spool-file
+;;    ebnf-spool-buffer
+;;    ebnf-spool-region
+;;    ebnf-eps-directory
+;;    ebnf-eps-file
+;;    ebnf-eps-buffer
+;;    ebnf-eps-region
 ;;
 ;; These commands all perform essentially the same function: they generate
 ;; PostScript syntactic chart images suitable for printing on a PostScript
@@ -94,14 +94,14 @@ Please send all bug fixes and enhancements to
 ;; The word "print", "spool" and "eps" in the command name determines when the
 ;; PostScript image is sent to the printer (or file):
 ;;
-;;      print  - The PostScript image is immediately sent to the printer;
+;;    print  - The PostScript image is immediately sent to the printer;
 ;;
-;;      spool  - The PostScript image is saved temporarily in an Emacs buffer.
-;;               Many images may be spooled locally before printing them.  To
-;;               send the spooled images to the printer, use the command
-;;               `ebnf-despool'.
+;;    spool  - The PostScript image is saved temporarily in an Emacs buffer.
+;;             Many images may be spooled locally before printing them.  To
+;;             send the spooled images to the printer, use the command
+;;             `ebnf-despool'.
 ;;
-;;      eps    - The PostScript image is immediately sent to a EPS file.
+;;    eps    - The PostScript image is immediately sent to a EPS file.
 ;;
 ;; The spooling mechanism is the same as used by ps-print and was designed for
 ;; printing lots of small files to save paper that would otherwise be wasted on
@@ -120,22 +120,22 @@ Please send all bug fixes and enhancements to
 ;; The word "directory", "file", "buffer" or "region" in the command name
 ;; determines how much of the buffer is printed:
 ;;
-;;      directory  - Read files in the directory and print them.
+;;    directory  - Read files in the directory and print them.
 ;;
-;;      file       - Read file and print it.
+;;    file       - Read file and print it.
 ;;
-;;      buffer     - Print the entire buffer.
+;;    buffer     - Print the entire buffer.
 ;;
-;;      region     - Print just the current region.
+;;    region     - Print just the current region.
 ;;
 ;; Two ebnf- command examples:
 ;;
-;;      ebnf-print-buffer  - translate and print the entire buffer, and send it
-;;                           immediately to the printer.
+;;    ebnf-print-buffer  - translate and print the entire buffer, and send it
+;;                         immediately to the printer.
 ;;
-;;      ebnf-spool-region  - translate and print just the current region, and
-;;                           spool the image in Emacs to send to the printer
-;;                           later.
+;;    ebnf-spool-region  - translate and print just the current region, and
+;;                         spool the image in Emacs to send to the printer
+;;                         later.
 ;;
 ;; Note that `ebnf-eps-directory', `ebnf-eps-file', `ebnf-eps-buffer' and
 ;; `ebnf-eps-region' never spool the EPS image, so they don't use the ps-print
@@ -148,13 +148,13 @@ Please send all bug fixes and enhancements to
 ;;
 ;; To translate and print your buffer, type
 ;;
-;;        M-x ebnf-print-buffer
+;;    M-x ebnf-print-buffer
 ;;
 ;; or substitute one of the other four ebnf- commands.  The command will
 ;; generate the PostScript image and print or spool it as specified.  By giving
 ;; the command a prefix argument
 ;;
-;;        C-u M-x ebnf-print-buffer
+;;    C-u M-x ebnf-print-buffer
 ;;
 ;; it will save the PostScript image to a file instead of sending it to the
 ;; printer; you will be prompted for the name of the file to save the image to.
@@ -162,7 +162,7 @@ Please send all bug fixes and enhancements to
 ;; you may save the spooled images to a file by giving a prefix argument to
 ;; `ebnf-despool':
 ;;
-;;        C-u M-x ebnf-despool
+;;    C-u M-x ebnf-despool
 ;;
 ;; When invoked this way, `ebnf-despool' will prompt you for the name of the
 ;; file to save to.
@@ -172,9 +172,9 @@ Please send all bug fixes and enhancements to
 ;;
 ;; Any of the `ebnf-' commands can be bound to keys.  Here are some examples:
 ;;
-;;   (global-set-key 'f22 'ebnf-print-buffer) ;f22 is prsc
-;;   (global-set-key '(shift f22) 'ebnf-print-region)
-;;   (global-set-key '(control f22) 'ebnf-despool)
+;;    (global-set-key 'f22 'ebnf-print-buffer) ;f22 is prsc
+;;    (global-set-key '(shift f22) 'ebnf-print-region)
+;;    (global-set-key '(control f22) 'ebnf-despool)
 ;;
 ;;
 ;; Invoking Ebnf2ps in Batch
@@ -523,14 +523,14 @@ Please send all bug fixes and enhancements to
 ;;
 ;; The following table summarizes the results:
 ;;
-;; EPS FILE NAME    NO SORT    ASCENDING SORT    DESCENDING SORT
-;; ebnf--AA.eps     A C        A C               C A
-;; ebnf--BB.eps     C B        B C               C B
-;; ebnf--CC.eps     A C B F    A B C F           F C B A
-;; ebnf--D.eps      D          D                 D
-;; ebnf--E.eps      E          E                 E
-;; ebnf--G.eps      G          G                 G
-;; ebnf--Z.eps      Z          Z                 Z
+;;    EPS FILE NAME    NO SORT    ASCENDING SORT    DESCENDING SORT
+;;    ebnf--AA.eps     A C        A C               C A
+;;    ebnf--BB.eps     C B        B C               C B
+;;    ebnf--CC.eps     A C B F    A B C F           F C B A
+;;    ebnf--D.eps      D          D                 D
+;;    ebnf--E.eps      E          E                 E
+;;    ebnf--G.eps      G          G                 G
+;;    ebnf--Z.eps      Z          Z                 Z
 ;;
 ;; As you can see if EPS actions is not used, each single production is
 ;; generated per EPS file.  To avoid overriding EPS files, use names in ;[ that
@@ -692,6 +692,11 @@ Please send all bug fixes and enhancements to
 ;;
 ;; `ebnf-line-color'                    Specify flow line color.
 ;;
+;; `ebnf-arrow-extra-width'             Specify extra width for arrow shape
+;;                                      drawing.
+;;
+;; `ebnf-arrow-scale'                   Specify the arrow scale.
+;;
 ;; `ebnf-user-arrow'                    Specify a sexp for user arrow shape (a
 ;;                                      PostScript code).
 ;;
@@ -824,6 +829,8 @@ Please send all bug fixes and enhancements to
 ;;    entry             is the vertical position used to know where it should
 ;;                      be drawn the flow line in the current element.
 ;;
+;;    extra             is given by `ebnf-arrow-extra-width'.
+;;
 ;;
 ;;    * SPECIAL, TERMINAL and NON-TERMINAL
 ;;
@@ -835,17 +842,17 @@ Please send all bug fixes and enhancements to
 ;;       :   |   :      :   |   :  } font height / 2           }
 ;;       :   +==============+...:...............................
 ;;       :   :   :      :   :   :
-;;       :   :   :      :   :   :......................
-;;       :   :   :      :   :      } font height      }
-;;       :   :   :      :   :.......                  }
-;;       :   :   :      :          } font height / 2  }
-;;       :   :   :      :...........                  }
-;;       :   :   :                 } text width       } width
-;;       :   :   :..................                  }
-;;       :   :                     } font height / 2  }
-;;       :   :......................                  }
-;;       :                         } font height      }
-;;       :.............................................
+;;       :   :   :      :   :   :.........................
+;;       :   :   :      :   :      } font height          }
+;;       :   :   :      :   :.......                      }
+;;       :   :   :      :          } font height / 2      }
+;;       :   :   :      :...........                      }
+;;       :   :   :                 } text width           } width
+;;       :   :   :..................                      }
+;;       :   :                     } font height / 2      }
+;;       :   :......................                      }
+;;       :                         } font height + extra  }
+;;       :.................................................
 ;;
 ;;
 ;;    * OPTIONAL
@@ -976,21 +983,21 @@ Please send all bug fixes and enhancements to
 ;;       :   |  :  :  :   :   |   :  } font height / 2           }
 ;;       :   +================+...:...............................
 ;;       :   :  :  :  :   :   :   :
-;;       :   :  :  :  :   :   :   :......................
-;;       :   :  :  :  :   :   :      } font height      }
-;;       :   :  :  :  :   :   :.......                  }
-;;       :   :  :  :  :   :          } font height / 2  }
-;;       :   :  :  :  :   :...........                  }
-;;       :   :  :  :  :              } X width          }
-;;       :   :  :  :  :...............                  }
-;;       :   :  :  :                 } font height / 2  } width
-;;       :   :  :  :..................                  }
-;;       :   :  :                    } text width       }
-;;       :   :  :.....................                  }
-;;       :   :                       } font height / 2  }
-;;       :   :........................                  }
-;;       :                           } font height      }
-;;       :...............................................
+;;       :   :  :  :  :   :   :   :..........................
+;;       :   :  :  :  :   :   :      } font height          }
+;;       :   :  :  :  :   :   :.......                      }
+;;       :   :  :  :  :   :          } font height / 2      }
+;;       :   :  :  :  :   :...........                      }
+;;       :   :  :  :  :              } X width              }
+;;       :   :  :  :  :...............                      }
+;;       :   :  :  :                 } font height / 2      } width
+;;       :   :  :  :..................                      }
+;;       :   :  :                    } text width           }
+;;       :   :  :.....................                      }
+;;       :   :                       } font height / 2      }
+;;       :   :........................                      }
+;;       :                           } font height + extra  }
+;;       :...................................................
 ;;
 ;;
 ;;    * EXCEPT
@@ -1003,21 +1010,21 @@ Please send all bug fixes and enhancements to
 ;;       :   |  :   :   :   :   |   :  } font height / 2           }
 ;;       :   +==================+...:...............................
 ;;       :   :  :   :   :   :   :   :
-;;       :   :  :   :   :   :   :   :......................
-;;       :   :  :   :   :   :   :      } font height      }
-;;       :   :  :   :   :   :   :.......                  }
-;;       :   :  :   :   :   :          } font height / 2  }
-;;       :   :  :   :   :   :...........                  }
-;;       :   :  :   :   :              } Y width          }
-;;       :   :  :   :   :...............                  }
-;;       :   :  :   :                  } font height      } width
-;;       :   :  :   :...................                  }
-;;       :   :  :                      } X width          }
-;;       :   :  :.......................                  }
-;;       :   :                         } font height / 2  }
-;;       :   :..........................                  }
-;;       :                             } font height      }
-;;       :.................................................
+;;       :   :  :   :   :   :   :   :..........................
+;;       :   :  :   :   :   :   :      } font height          }
+;;       :   :  :   :   :   :   :.......                      }
+;;       :   :  :   :   :   :          } font height / 2      }
+;;       :   :  :   :   :   :...........                      }
+;;       :   :  :   :   :              } Y width              }
+;;       :   :  :   :   :...............                      }
+;;       :   :  :   :                  } font height          } width
+;;       :   :  :   :...................                      }
+;;       :   :  :                      } X width              }
+;;       :   :  :.......................                      }
+;;       :   :                         } font height / 2      }
+;;       :   :..........................                      }
+;;       :                             } font height + extra  }
+;;       :.....................................................
 ;;
 ;;       NOTE: If Y element is empty, it's draw nothing at Y place.
 ;;
@@ -1089,7 +1096,8 @@ Please send all bug fixes and enhancements to
 ;; ----------------
 ;;
 ;; Thanks to Drew Adams <drew.adams@oracle.com> for suggestions:
-;;    - `ebnf-production-name-p', `ebnf-stop-on-error',
+;;    - `ebnf-arrow-extra-width', `ebnf-arrow-scale',
+;;      `ebnf-production-name-p', `ebnf-stop-on-error',
 ;;      `ebnf-file-suffix-regexp'and `ebnf-special-show-delimiter' variables.
 ;;    - `ebnf-delete-style', `ebnf-eps-file' and `ebnf-eps-directory'
 ;;      commands.
@@ -1911,6 +1919,29 @@ special."
   :group 'ebnf2ps)
 
 
+(defcustom ebnf-arrow-extra-width
+  (if (eq ebnf-arrow-shape 'none)
+      0.0
+    (* (sqrt 5.0) 0.65 ebnf-line-width))
+  "*Specify extra width for arrow shape drawing.
+
+The extra width is used to avoid that the arrowhead and the terminal border
+overlap.  It depens on `ebnf-arrow-shape' and `ebnf-line-width'."
+  :type 'number
+  :version "22"
+  :group 'ebnf-shape)
+
+
+(defcustom ebnf-arrow-scale 1.0
+  "*Specify the arrow scale.
+
+Values lower than 1.0, shrink the arrow.
+Values greater than 1.0, expand the arrow."
+  :type 'number
+  :version "22"
+  :group 'ebnf-shape)
+
+
 (defcustom ebnf-debug-ps nil
   "*Non-nil means to generate PostScript debug procedures.
 
@@ -2859,9 +2890,9 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
 /HeightNT FontHeight FontHeight add def
 
 /T HeightT HeightNT add 0.5 mul def
-/hT T 0.5 mul def
-/hT2 hT 0.5 mul def
-/hT4 hT 0.25 mul def
+/hT   T 0.5  mul def
+/hT2 hT 0.5  mul ArrowScale mul def
+/hT4 hT 0.25 mul ArrowScale mul def
 
 /Er 0.1 def     % Error factor
 
@@ -2947,6 +2978,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
  RA-vector ArrowShape get exec
  Gstroke
  moveto
+ ExtraWidth 0 rmoveto
 }def
 
 % rotation DrawArrow
@@ -3245,7 +3277,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
 % string width prepare-width |- string
 /prepare-width
 {/width exch def
- dup stringwidth pop space add space add width exch sub 0.5 mul
+ dup stringwidth pop space add space add width exch sub ExtraWidth sub 0.5 mul
  /w exch def
 }def
 
@@ -4877,7 +4909,6 @@ killed after process termination."
          (progn
            ;; adjust creator comment
            (end-of-line)
-           (backward-char)
            (insert " & ebnf2ps v" ebnf-version)
            ;; insert ebnf settings & engine
            (goto-char (point-max))
@@ -5066,6 +5097,10 @@ killed after process termination."
               (format "/ShadowR       %s def\n"
                       (ebnf-boolean ebnf-repeat-shadow))
               ;; miscellaneous
+              (format "/ExtraWidth    %s def\n"
+                      (ebnf-format-float ebnf-arrow-extra-width))
+              (format "/ArrowScale    %s def\n"
+                      (ebnf-format-float ebnf-arrow-scale))
               (format "/DefaultWidth  %s def\n"
                       (ebnf-format-float ebnf-default-width))
               (format "/LineWidth     %s def\n"
@@ -5152,7 +5187,7 @@ killed after process termination."
         (len    (length (ebnf-node-name node))))
     (ebnf-node-entry  node (* height 0.5))
     (ebnf-node-height node height)
-    (ebnf-node-width  node (+ ebnf-basic-width space
+    (ebnf-node-width  node (+ ebnf-basic-width ebnf-arrow-extra-width space
                               (* len font-width)
                               space ebnf-basic-width))))
 
@@ -5173,6 +5208,7 @@ killed after process termination."
                                      ebnf-font-height-S)
                                 ebnf-space-R ebnf-space-R))
     (ebnf-node-width  repeat (+ (ebnf-node-width element)
+                                ebnf-arrow-extra-width
                                 ebnf-space-R ebnf-space-R ebnf-space-R
                                 ebnf-horizontal-space
                                 (* (length times) ebnf-font-width-R)))))
@@ -5194,6 +5230,7 @@ killed after process termination."
                                 ebnf-space-E ebnf-space-E))
     (ebnf-node-width  except (+ (ebnf-node-width factor)
                                 (ebnf-node-width element)
+                                ebnf-arrow-extra-width
                                 ebnf-space-E ebnf-space-E
                                 ebnf-space-E ebnf-space-E
                                 ebnf-font-width-E
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 109455e9e61..c7341a9f871 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -836,8 +836,8 @@ Makefile mode can be configured by modifying the following variables:
           nil nil
           ((?$ . "."))
           backward-paragraph
-          (font-lock-syntactic-keywords . makefile-font-lock-syntactic-keywords)
-          (font-lock-support-mode)))    ; JIT breaks on long series of continuation lines.
+          (font-lock-syntactic-keywords
+           . makefile-font-lock-syntactic-keywords)))
 
   ;; Add-log.
   (make-local-variable 'add-log-current-defun-function)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index a08f999f089..ba10393a89f 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2472,34 +2472,43 @@ we go to the end of the previous line and do not check for continuations."
         (point))
         (skip-chars-backward " \t;")
         (unless (looking-at "\\s-*;;")
-        (skip-chars-backward "^)}];\"'`({[")
-        (setq c (char-before))))
-      (sh-debug "stopping at %d c is %s  start=%d min-point=%d"
-                (point) c start min-point)
-      (if (< (point) min-point)
-          (error "point %d < min-point %d" (point) min-point))
-      (cond
-       ((looking-at "\\s-*;;")
-        ;; (message "Found ;; !")
-       ";;")
-       ((or (eq c ?\n)
-            (eq c nil)
-            (eq c ?\;))
-       (save-excursion
-         ;; skip forward over white space newline and \ at eol
-         (skip-chars-forward " \t\n\\\\")
-         (sh-debug "Now at %d   start=%d" (point) start)
-         (if (>= (point) start)
-             (progn
-               (sh-debug "point: %d >= start: %d" (point) start)
-               nil)
-           (sh-get-word))
-         ))
-       (t
-        ;; c    -- return a string
-       (char-to-string c)
-       ))
-      )))
+          (skip-chars-backward "^)}];\"'`({[")
+          (setq c (char-before)))
+        (sh-debug "stopping at %d c is %s  start=%d min-point=%d"
+                  (point) c start min-point)
+        (if (< (point) min-point)
+            (error "point %d < min-point %d" (point) min-point))
+        (cond
+         ((looking-at "\\s-*;;")
+          ;; (message "Found ;; !")
+          ";;")
+         ((or (eq c ?\n)
+              (eq c nil)
+              (eq c ?\;))
+         (let (done kwd next
+               (boundary (point)))
+           (skip-chars-forward " \t\n\\\\")
+           (while (and (not done) (not (eobp)))
+             (if next (setq boundary next))
+             ;; skip forward over white space newline and \ at eol
+             (sh-debug "Now at %d   start=%d" (point) start)
+             (if (>= (point) start)
+                 (progn
+                   (sh-debug "point: %d >= start: %d" (point) start)
+                   nil)
+               (setq kwd (sh-get-word))
+               (unless (eobp) (forward-char 1))
+               (if (member kwd (sh-feature sh-leading-keywords))
+                   (setq next (point))
+                 (setq done t)))
+             (skip-chars-forward " \t\n\\\\"))
+           (goto-char boundary)
+           kwd))
+         (t
+          ;; c  -- return a string
+          (char-to-string c)
+          ))
+        ))))
 
 
 (defun sh-this-is-a-continuation ()
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 59605c22c5b..d072b905e4a 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -12,7 +12,7 @@
 ;; Keywords: wp, print, PostScript
 ;; Time-stamp: <2005/06/27 00:57:22 vinicius>
 ;; Version: 6.6.7
-;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
+;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 (defconst ps-print-version "6.6.7"
   "ps-print.el, v 6.6.7 <2005/06/27 vinicius>
diff --git a/lisp/ses.el b/lisp/ses.el
index fc594167187..85f6f8db378 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -237,13 +237,6 @@ Each function is called with ARG=1."
           ses-initial-file-trailer)
   "The initial contents of an empty spreadsheet.")
 
-(defconst ses-paramlines-plist
-  '(ses--col-widths  2 ses--col-printers  3 ses--default-printer  4
-    ses--header-row  5 ses--file-format   8 ses--numrows          9
-    ses--numcols    10)
-  "Offsets from last cell line to various parameter lines in the data area
-of a spreadsheet.")
-
 (defconst ses-box-prop '(:box (:line-width 2 :style released-button))
   "Display properties to create a raised box for cells in the header line.")
 
@@ -255,13 +248,19 @@ functions.  None of these standard-printer functions is suitable for use as a
 column printer or a global-default printer because they invoke the column or
 default printer and then modify its output.")
 
+
+;;----------------------------------------------------------------------------
+;; Local variables and constants
+;;----------------------------------------------------------------------------
+
 (eval-and-compile
   (defconst ses-localvars
     '(ses--blank-line ses--cells ses--col-printers ses--col-widths ses--curcell
       ses--curcell-overlay ses--default-printer ses--deferred-narrow
       ses--deferred-recalc ses--deferred-write ses--file-format
       ses--header-hscroll ses--header-row ses--header-string ses--linewidth
-      ses--numcols ses--numrows ses--symbolic-formulas
+      ses--numcols ses--numrows ses--symbolic-formulas ses--data-marker
+      ses--params-marker
       ;;Global variables that we override
       mode-line-process next-line-add-newlines transient-mark-mode)
     "Buffer-local variables used by SES."))
@@ -272,6 +271,13 @@ default printer and then modify its output.")
     (make-local-variable x)
     (set x nil)))
 
+(defconst ses-paramlines-plist
+  '(ses--col-widths  -5 ses--col-printers -4 ses--default-printer -3
+    ses--header-row  -2 ses--file-format   1 ses--numrows          2
+    ses--numcols      3)
+  "Offsets from 'Global parameters' line to various parameter lines in the
+data area of a spreadsheet.")
+
 
 ;;
 ;;  "Side-effect variables".  They are set in one function, altered in
@@ -408,6 +414,7 @@ for safety.  This is a macro to prevent propagate-on-load viruses."
   "Execute BODY repeatedly, with the variables `row' and `col' set to each
 cell in the range specified by CURCELL.  The range is available in the
 variables `minrow', `maxrow', `mincol', and `maxcol'."
+  (declare (indent defun) (debug (form body)))
   (let ((cur (make-symbol "cur"))
         (min (make-symbol "min"))
         (max (make-symbol "max"))
@@ -429,9 +436,6 @@ variables `minrow', `maxrow', `mincol', and `maxcol'."
              (setq col (+ ,c mincol))
              ,@body))))))
 
-(put 'ses-dorange 'lisp-indent-function 'defun)
-(def-edebug-spec ses-dorange (form body))
-
 ;;Support for coverage testing.
 (defmacro 1value (form)
   "For code-coverage testing, indicate that FORM is expected to always have
@@ -650,7 +654,7 @@ the old and FORCE is nil."
 (defun ses-update-cells (list &optional force)
   "Recalculate cells in LIST, checking for dependency loops.  Prints
 progress messages every second.  Dependent cells are not recalculated
-if the cell's value is unchanged if FORCE is nil."
+if the cell's value is unchanged and FORCE is nil."
   (let ((ses--deferred-recalc list)
         (nextlist             list)
         (pos                  (point))
@@ -709,7 +713,7 @@ if the cell's value is unchanged if FORCE is nil."
 
 (defun ses-in-print-area ()
   "Returns t if point is in print area of spreadsheet."
-  (eq (get-text-property (point) 'keymap) 'ses-mode-print-map))
+  (<= (point) ses--data-marker))
 
 ;;We turn off point-motion-hooks and explicitly position the cursor, in case
 ;;the intangible properties have gotten screwed up (e.g., when
@@ -953,14 +957,16 @@ is one of the symbols ses--col-widths, ses--col-printers,
 ses--default-printer, ses--numrows, or ses--numcols."
   (ses-widen)
   (let ((inhibit-point-motion-hooks t)) ;In case intangible attrs are wrong
-    (goto-char (point-min))
     (if col
-      ;;It's a cell
-      (forward-line (+ ses--numrows 2 (* def (1+ ses--numcols)) col))
-    ;;Convert def-symbol to offset
-    (setq def (plist-get ses-paramlines-plist def))
-    (or def (signal 'args-out-of-range nil))
-    (forward-line (+ (* ses--numrows (+ ses--numcols 2)) def)))))
+        ;;It's a cell
+        (progn
+          (goto-char ses--data-marker)
+          (forward-line (+ 1 (* def (1+ ses--numcols)) col)))
+      ;;Convert def-symbol to offset
+      (setq def (plist-get ses-paramlines-plist def))
+      (or def (signal 'args-out-of-range nil))
+      (goto-char ses--params-marker)
+      (forward-line def))))
 
 (defun ses-set-parameter (def value &optional elem)
   "Set parameter DEF to VALUE (with undo) and write the value to the data area.
@@ -1070,6 +1076,23 @@ or t to get a wrong-type-argument error when the first reference is found."
         ))))
   result-so-far)
 
+(defsubst ses-relocate-symbol (sym rowcol startrow startcol rowincr colincr)
+  "Relocate one symbol SYM, whichs corresponds to ROWCOL (a cons of ROW and
+COL).  Cells starting at (STARTROW,STARTCOL) are being shifted
+by (ROWINCR,COLINCR)."
+  (let ((row (car rowcol))
+        (col (cdr rowcol)))
+    (if (or (< row startrow) (< col startcol))
+        sym
+      (setq row (+ row rowincr)
+            col (+ col colincr))
+      (if (and (>= row startrow) (>= col startcol)
+               (< row ses--numrows) (< col ses--numcols))
+          ;;Relocate this variable
+          (ses-create-cell-symbol row col)
+        ;;Delete reference to a deleted cell
+        nil))))
+
 (defun ses-relocate-formula (formula startrow startcol rowincr colincr)
   "Produce a copy of FORMULA where all symbols that refer to cells in row
 STARTROW or above and col STARTCOL or above are altered by adding ROWINCR
@@ -1114,23 +1137,6 @@ Sets `ses-relocate-return' to 'delete if cell-references were removed."
                 result))))
       (nreverse result))))
 
-(defun ses-relocate-symbol (sym rowcol startrow startcol rowincr colincr)
-  "Relocate one symbol SYM, whichs corresponds to ROWCOL (a cons of ROW and
-COL).  Cells starting at (STARTROW,STARTCOL) are being shifted
-by (ROWINCR,COLINCR)."
-  (let ((row (car rowcol))
-        (col (cdr rowcol)))
-    (if (or (< row startrow) (< col startcol))
-        sym
-      (setq row (+ row rowincr)
-            col (+ col colincr))
-      (if (and (>= row startrow) (>= col startcol)
-               (< row ses--numrows) (< col ses--numcols))
-          ;;Relocate this variable
-          (ses-create-cell-symbol row col)
-        ;;Delete reference to a deleted cell
-        nil))))
-
 (defun ses-relocate-range (range startrow startcol rowincr colincr)
   "Relocate one RANGE, of the form '(ses-range min max).  Cells starting
 at (STARTROW,STARTCOL) are being shifted by (ROWINCR,COLINCR).  Result is the
@@ -1337,6 +1343,7 @@ execute cell formulas or print functions."
   (goto-char (point-max))
   (search-backward ";; Local Variables:\n" nil t)
   (backward-list 1)
+  (setq ses--params-marker (point-marker))
   (let ((params (condition-case nil (read (current-buffer)) (error nil))))
     (or (and (= (safe-length params) 3)
              (numberp (car params))
@@ -1366,7 +1373,9 @@ execute cell formulas or print functions."
   (forward-line ses--numrows)
   (or (looking-at ses-print-data-boundary)
       (error "Missing marker between print and data areas"))
-  (forward-char (length ses-print-data-boundary))
+  (forward-char 1)
+  (setq ses--data-marker (point-marker))
+  (forward-char (1- (length ses-print-data-boundary)))
   ;;Initialize printer and symbol lists
   (mapc 'ses-printer-record ses-standard-printer-functions)
   (setq ses--symbolic-formulas nil)
@@ -1573,10 +1582,7 @@ narrows the buffer now."
           ;;We're not allowed to narrow the buffer until after-find-file has
           ;;read the local variables at the end of the file.  Now it's safe to
           ;;do the narrowing.
-          (save-excursion
-            (goto-char (point-min))
-            (forward-line ses--numrows)
-            (narrow-to-region (point-min) (point)))
+          (narrow-to-region (point-min) ses--data-marker)
           (setq ses--deferred-narrow nil))
         ;;Update the modeline
         (let ((oldcell ses--curcell))
@@ -1803,11 +1809,17 @@ cells."
     (dotimes (row ses--numrows)
       (insert ses--blank-line))
     (insert ses-print-data-boundary)
+    (backward-char (1- (length ses-print-data-boundary)))
+    (setq ses--data-marker (point-marker))
+    (forward-char (1- (length ses-print-data-boundary)))
     ;;Placeholders for cell data
     (insert (make-string (* ses--numrows (1+ ses--numcols)) ?\n))
     ;;Placeholders for col-widths, col-printers, default-printer, header-row
     (insert "\n\n\n\n")
-    (insert ses-initial-global-parameters))
+    (insert ses-initial-global-parameters)
+    (backward-char (1- (length ses-initial-global-parameters)))
+    (setq ses--params-marker (point-marker))
+    (forward-char (1- (length ses-initial-global-parameters))))
   (ses-set-parameter 'ses--col-widths ses--col-widths)
   (ses-set-parameter 'ses--col-printers ses--col-printers)
   (ses-set-parameter 'ses--default-printer ses--default-printer)
@@ -2880,7 +2892,8 @@ TEST is evaluated."
     (cons 'list result)))
 
 ;;All standard formulas are safe
-(dolist (x '(ses-range ses-delete-blanks ses+ ses-average ses-select))
+(dolist (x '(ses-cell-value ses-range ses-delete-blanks ses+ ses-average
+             ses-select))
   (put x 'side-effect-free t))
 
 
diff --git a/lisp/simple.el b/lisp/simple.el
index a289f87f4d9..55f476213fd 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -128,7 +128,7 @@ If no other buffer exists, the buffer `*scratch*' is returned."
   :group 'next-error
   :version "22.1")
 
-(defcustom next-error-highlight 0.1
+(defcustom next-error-highlight 0.5
   "*Highlighting of locations in selected source buffers.
 If number, highlight the locus in `next-error' face for given time in seconds.
 If t, highlight the locus indefinitely until some other locus replaces it.
@@ -141,8 +141,8 @@ If `fringe-arrow', indicate the locus by the fringe arrow."
   :group 'next-error
   :version "22.1")
 
-(defcustom next-error-highlight-no-select 0.1
-  "*Highlighting of locations in non-selected source buffers.
+(defcustom next-error-highlight-no-select 0.5
+  "*Highlighting of locations in `next-error-no-select'.
 If number, highlight the locus in `next-error' face for given time in seconds.
 If t, highlight the locus indefinitely until some other locus replaces it.
 If nil, don't highlight the locus in the source buffer.
@@ -1501,8 +1501,7 @@ Call `undo-start' to get ready to undo recent changes,
 then call `undo-more' one or more times to undo them."
   (or (listp pending-undo-list)
       (error (concat "No further undo information"
-                     (and transient-mark-mode mark-active
-                          " for region"))))
+                     (and undo-in-region " for region"))))
   (let ((undo-in-progress t))
     (setq pending-undo-list (primitive-undo n pending-undo-list))
     (if (null pending-undo-list)
@@ -1649,12 +1648,12 @@ is not *inside* the region START...END."
         ((null (car undo-elt))
          ;; (nil PROPERTY VALUE BEG . END)
          (let ((tail (nthcdr 3 undo-elt)))
-           (not (or (< (car tail) end)
-                    (> (cdr tail) start)))))
+           (and (< (car tail) end)
+                (> (cdr tail) start))))
         ((integerp (car undo-elt))
          ;; (BEGIN . END)
-         (not (or (< (car undo-elt) end)
-                  (> (cdr undo-elt) start))))))
+         (and (< (car undo-elt) end)
+              (> (cdr undo-elt) start)))))
 
 ;; Return the first affected buffer position and the delta for an undo element
 ;; delta is defined as the change in subsequent buffer positions if we *did*
@@ -2659,7 +2658,7 @@ The argument is used for internal purposes; do not supply one."
 ;; This is actually used in subr.el but defcustom does not work there.
 (defcustom yank-excluded-properties
   '(read-only invisible intangible field mouse-face help-echo local-map keymap
-    yank-handler follow-link)
+    yank-handler follow-link fontified)
   "*Text properties to discard when yanking.
 The value should be a list of text properties to discard or t,
 which means to discard all text properties."
@@ -3496,11 +3495,9 @@ Outline mode sets this."
                 (>= rbot (frame-char-height))
                 (<= ypos (- (frame-char-height))))
         (unless lh
-          (let* ((wend (window-end nil t))
-                 (evis (or (pos-visible-in-window-p wend nil t)
-                           (pos-visible-in-window-p (1- wend) nil t))))
-            (setq rbot (nth 3 evis)
-                  vpos (nth 5 evis))))
+          (let ((wend (pos-visible-in-window-p t nil t)))
+            (setq rbot (nth 3 wend)
+                  vpos (nth 5 wend))))
         (cond
          ;; If last line of window is fully visible, move forward.
          ((or (null rbot) (= rbot 0))
@@ -3606,15 +3603,6 @@ Outline mode sets this."
                 (let ((inhibit-field-text-motion t))
                   (setq line-end (line-end-position)))
                 (goto-char (constrain-to-field line-end (point) t t))
-                ;; When moving a single line, update the goal-column
-                ;; if we couldn't move to the end of line due to a
-                ;; field boundary.  Otherwise we'll get stuck at the
-                ;; original position during the column motion in
-                ;; line-move-finish.
-                (and (/= line-end (point))
-                     (= orig-arg 1)
-                     (setq temporary-goal-column
-                           (max temporary-goal-column (current-column))))
                 ;; If there's no invisibility here, move over the newline.
                 (cond
                  ((eobp)
@@ -3681,6 +3669,7 @@ Outline mode sets this."
       (setq repeat nil)
 
       (let (new
+            (old (point))
             (line-beg (save-excursion (beginning-of-line) (point)))
             (line-end
              ;; Compute the end of the line
@@ -3695,6 +3684,17 @@ Outline mode sets this."
 
         ;; Move to the desired column.
         (line-move-to-column column)
+
+        ;; Corner case: suppose we start out in a field boundary in
+        ;; the middle of a continued line.  When we get to
+        ;; line-move-finish, point is at the start of a new *screen*
+        ;; line but the same text line; then line-move-to-column would
+        ;; move us backwards. Test using C-n with point on the "x" in
+        ;;   (insert "a" (propertize "x" 'field t) (make-string 89 ?y))
+        (and forward
+             (< (point) old)
+             (goto-char old))
+
         (setq new (point))
 
         ;; Process intangibility within a line.
@@ -3734,8 +3734,15 @@ Outline mode sets this."
         (goto-char opoint)
         (let ((inhibit-point-motion-hooks nil))
           (goto-char
-           (constrain-to-field new opoint t t
-                               'inhibit-line-move-field-capture)))
+           ;; Ignore field boundaries if the initial and final
+           ;; positions have the same `field' property, even if the
+           ;; fields are non-contiguous.  This seems to be "nicer"
+           ;; behavior in many situations.
+           (if (eq (get-char-property new 'field)
+                   (get-char-property opoint 'field))
+               new
+             (constrain-to-field new opoint t t
+                                 'inhibit-line-move-field-capture))))
 
         ;; If all this moved us to a different line,
         ;; retry everything within that new line.
diff --git a/lisp/startup.el b/lisp/startup.el
index 2b9dd02ab9b..ba740a721d5 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -779,6 +779,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
   (custom-reevaluate-setting 'mouse-wheel-up-event)
   (custom-reevaluate-setting 'file-name-shadow-mode)
   (custom-reevaluate-setting 'send-mail-function)
+  (custom-reevaluate-setting 'focus-follows-mouse)
   (custom-reevaluate-setting 'global-auto-composition-mode)
 
   ;; Register default TTY colors for the case the terminal hasn't a
@@ -1392,7 +1393,7 @@ mouse."
     (if (or (window-minibuffer-p)
             (window-dedicated-p (selected-window)))
         (pop-to-buffer (current-buffer))
-      (switch-to-buffer "GNU Emacs"))
+      (switch-to-buffer "*About GNU Emacs*"))
     (setq buffer-read-only nil)
     (erase-buffer)
     (if pure-space-overflow
@@ -1608,7 +1609,9 @@ Type \\[describe-distribution] for information on getting the latest version."))
             (error (pop-to-buffer (current-buffer))))))
       ;; Unwind ... ensure splash buffer is killed
       (if hide-on-input
-          (kill-buffer "GNU Emacs")))))
+          (kill-buffer "GNU Emacs")
+        (switch-to-buffer "GNU Emacs")
+        (rename-buffer "*About GNU Emacs*" t)))))
 
 
 (defun startup-echo-area-message ()
@@ -1627,8 +1630,9 @@ Type \\[describe-distribution] for information on getting the latest version."))
 (defun display-splash-screen (&optional hide-on-input)
   "Display splash screen according to display.
 Fancy splash screens are used on graphic displays,
-normal otherwise."
-  (interactive)
+normal otherwise.
+With a prefix argument, any user input hides the splash screen."
+  (interactive "P")
   (if (use-fancy-splash-screens-p)
       (fancy-splash-screens hide-on-input)
     (normal-splash-screen hide-on-input)))
diff --git a/lisp/subr.el b/lisp/subr.el
index b165e8e9ad3..0d0bf7c7cc3 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2053,7 +2053,8 @@ a system-dependent default device name is used."
 
 (defun shell-quote-argument (argument)
   "Quote an argument for passing as argument to an inferior shell."
-  (if (eq system-type 'ms-dos)
+  (if (or (eq system-type 'ms-dos)
+          (and (eq system-type 'windows-nt) (w32-shell-dos-semantics)))
       ;; Quote using double quotes, but escape any existing quotes in
       ;; the argument with backslashes.
       (let ((result "")
@@ -2067,19 +2068,17 @@ a system-dependent default device name is used."
                                    "\\" (substring argument end (1+ end)))
                     start (1+ end))))
         (concat "\"" result (substring argument start) "\""))
-    (if (eq system-type 'windows-nt)
-        (concat "\"" argument "\"")
-      (if (equal argument "")
-          "''"
-        ;; Quote everything except POSIX filename characters.
-        ;; This should be safe enough even for really weird shells.
-        (let ((result "") (start 0) end)
-          (while (string-match "[^-0-9a-zA-Z_./]" argument start)
-            (setq end (match-beginning 0)
-                  result (concat result (substring argument start end)
-                                 "\\" (substring argument end (1+ end)))
-                  start (1+ end)))
-          (concat result (substring argument start)))))))
+    (if (equal argument "")
+        "''"
+      ;; Quote everything except POSIX filename characters.
+      ;; This should be safe enough even for really weird shells.
+      (let ((result "") (start 0) end)
+        (while (string-match "[^-0-9a-zA-Z_./]" argument start)
+          (setq end (match-beginning 0)
+                result (concat result (substring argument start end)
+                               "\\" (substring argument end (1+ end)))
+                start (1+ end)))
+        (concat result (substring argument start))))))
 
 (defun string-or-null-p (object)
   "Return t if OBJECT is a string or nil.
@@ -2168,11 +2167,32 @@ If UNDO is present and non-nil, it is a function that will be called
   (let* ((handler (and (stringp string)
                        (get-text-property 0 'yank-handler string)))
          (param (or (nth 1 handler) string))
-         (opoint (point)))
+         (opoint (point))
+         end)
+
     (setq yank-undo-function t)
     (if (nth 0 handler) ;; FUNCTION
         (funcall (car handler) param)
       (insert param))
+    (setq end (point))
+
+    ;; What should we do with `font-lock-face' properties?
+    (if font-lock-defaults
+        ;; No, just wipe them.
+        (remove-list-of-text-properties opoint end '(font-lock-face))
+      ;; Convert them to `face'.
+      (save-excursion
+        (goto-char opoint)
+        (while (< (point) end)
+          (let ((face (get-text-property (point) 'font-lock-face))
+                run-end)
+            (setq run-end
+                  (next-single-property-change (point) 'font-lock-face nil end))
+            (when face
+              (remove-text-properties (point) run-end '(font-lock-face nil))
+              (put-text-property (point) run-end 'face face))
+            (goto-char run-end)))))
+
     (unless (nth 2 handler) ;; NOEXCLUDE
       (remove-yank-excluded-properties opoint (point)))
     (if (eq yank-undo-function t)  ;; not set by FUNCTION
@@ -3106,8 +3126,8 @@ Usually the separator is \".\", but it can be any other string.")
 
 (defvar version-regexp-alist
   '(("^[-_+ ]?a\\(lpha\\)?$"   . -3)
-    ("^[-_+]$" . -3)    ; treat "1.2.3-20050920" and "1.2-3" as alpha releases
-    ("^[-_+ ]cvs$" . -3)        ; treat "1.2.3-CVS" as alpha release
+    ("^[-_+]$"                 . -3)    ; treat "1.2.3-20050920" and "1.2-3" as alpha releases
+    ("^[-_+ ]cvs$"             . -3)    ; treat "1.2.3-CVS" as alpha release
     ("^[-_+ ]?b\\(eta\\)?$"    . -2)
     ("^[-_+ ]?\\(pre\\|rc\\)$" . -1))
   "*Specify association between non-numeric version part and a priority.
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 75b043af835..53cc61c48a2 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2583,8 +2583,9 @@ By just answering RET you can find out what the current dictionary is."
   (cond ((equal dict "")
          (ispell-internal-change-dictionary)
          (message "Using %s dictionary"
-                  (or ispell-local-dictionary ispell-dictionary "default")))
-        ((equal dict (or ispell-local-dictionary
+                  (or (and (not arg) ispell-local-dictionary)
+                      ispell-dictionary "default")))
+        ((equal dict (or (and (not arg) ispell-local-dictionary)
                          ispell-dictionary "default"))
          ;; Specified dictionary is the default already. Could reload
          ;; the dictionaries if needed.
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 64fbb0542ff..c8ecc3df63d 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -4569,7 +4569,7 @@ this heading. "
                 ;; Make the subtree visible
                 (show-subtree)
                 (org-end-of-subtree t)
-                (skip-chars-backward " \t\r\n]")
+                (skip-chars-backward " \t\r\n")
                 (and (looking-at "[ \t\r\n]*")
                      (replace-match "\n\n")))
             ;; No specific heading, just go to end of file.
@@ -8660,7 +8660,7 @@ are included in the output."
               (push txt rtn))
             ;; if we are to skip sublevels, jump to end of subtree
             (point)
-            (or org-tags-match-list-sublevels (org-end-of-subtree))))))
+            (or org-tags-match-list-sublevels (org-end-of-subtree t))))))
     (when (and (eq action 'sparse-tree)
                (not org-sparse-tree-open-archived-trees))
       (org-hide-archived-subtrees (point-min) (point-max)))
@@ -9816,7 +9816,7 @@ on the system \"/user@host:\"."
         ((fboundp 'tramp-handle-file-remote-p)
          (tramp-handle-file-remote-p file))
         ((and (boundp 'ange-ftp-name-format)
-              (string-match ange-ftp-name-format file))
+              (string-match (car ange-ftp-name-format) file))
          t)
         (t nil)))
 
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index fdd735193c9..a6afb0ba20f 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-dav.el (url-dav-file-attributes): Simplify.
+
+        * url-http.el (url-http-head-file-attributes): Add device "info".
+
 2006-09-18  Michael Olson  <mwolson@gnu.org>
 
         * url-methods.el (url-scheme-register-proxy): Handle case where
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 449d8a510b5..546d744558d 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -621,59 +621,56 @@ Returns t iff the lock was successfully released."
 (autoload 'url-http-head-file-attributes "url-http")
 
 (defun url-dav-file-attributes (url &optional id-format)
-  (let ((properties (cdar (url-dav-get-properties url)))
-        (attributes nil))
+  (let ((properties (cdar (url-dav-get-properties url))))
     (if (and properties
              (url-dav-http-success-p (plist-get properties 'DAV:status)))
         ;; We got a good DAV response back..
-        (setq attributes
-              (list
-               ;; t for directory, string for symbolic link, or nil
-               ;; Need to support DAV Bindings to figure out the
-               ;; symbolic link issues.
-               (if (memq 'DAV:collection (plist-get properties 'DAV:resourcetype)) t nil)
+        (list
+         ;; t for directory, string for symbolic link, or nil
+         ;; Need to support DAV Bindings to figure out the
+         ;; symbolic link issues.
+         (if (memq 'DAV:collection (plist-get properties 'DAV:resourcetype)) t nil)
 
-               ;; Number of links to file... Needs DAV Bindings.
-               1
+         ;; Number of links to file... Needs DAV Bindings.
+         1
 
-               ;; File uid - no way to figure out?
-               0
+         ;; File uid - no way to figure out?
+         0
 
-               ;; File gid - no way to figure out?
-               0
+         ;; File gid - no way to figure out?
+         0
 
-               ;; Last access time - ???
-               nil
+         ;; Last access time - ???
+         nil
 
-               ;; Last modification time
-               (plist-get properties 'DAV:getlastmodified)
+         ;; Last modification time
+         (plist-get properties 'DAV:getlastmodified)
 
-               ;; Last status change time... just reuse last-modified
-               ;; for now.
-               (plist-get properties 'DAV:getlastmodified)
+         ;; Last status change time... just reuse last-modified
+         ;; for now.
+         (plist-get properties 'DAV:getlastmodified)
 
-               ;; size in bytes
-               (or (plist-get properties 'DAV:getcontentlength) 0)
+         ;; size in bytes
+         (or (plist-get properties 'DAV:getcontentlength) 0)
 
-               ;; file modes as a string like `ls -l'
-               ;; 
-               ;; Should be able to build this up from the
-               ;; DAV:supportedlock attribute pretty easily.  Getting
-               ;; the group info could be impossible though.
-               (url-dav-file-attributes-mode-string properties)
+         ;; file modes as a string like `ls -l'
+         ;; 
+         ;; Should be able to build this up from the
+         ;; DAV:supportedlock attribute pretty easily.  Getting
+         ;; the group info could be impossible though.
+         (url-dav-file-attributes-mode-string properties)
 
-               ;; t iff file's gid would change if it were deleted &
-               ;; recreated.  No way for us to know that thru DAV.
-               nil
+         ;; t iff file's gid would change if it were deleted &
+         ;; recreated.  No way for us to know that thru DAV.
+         nil
 
-               ;; inode number - meaningless
-               nil
+         ;; inode number - meaningless
+         nil
 
-               ;; device number - meaningless
-               nil))
+         ;; device number - meaningless
+         nil)
       ;; Fall back to just the normal http way of doing things.
-      (setq attributes (url-http-head-file-attributes url id-format)))
-    attributes))
+      (url-http-head-file-attributes url id-format))))
 
 (defun url-dav-save-resource (url obj &optional content-type lock-token)
   "Save OBJ as URL using WebDAV.
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index a1d87e1bd31..1b8bc459f49 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1151,19 +1151,19 @@ CBARGS as the arguments."
 (defalias 'url-http-file-readable-p 'url-http-file-exists-p)
 
 (defun url-http-head-file-attributes (url &optional id-format)
-  (let ((buffer (url-http-head url))
-        (attributes nil))
+  (let ((buffer (url-http-head url)))
     (when buffer
-      (setq attributes (make-list 11 nil))
-      (setf (nth 1 attributes) 1)       ; Number of links to file
-      (setf (nth 2 attributes) 0)       ; file uid
-      (setf (nth 3 attributes) 0)       ; file gid
-      (setf (nth 7 attributes)          ; file size
-            (url-http-symbol-value-in-buffer 'url-http-content-length
-                                             buffer -1))
-      (setf (nth 8 attributes) (eval-when-compile (make-string 10 ?-)))
-      (kill-buffer buffer))
-    attributes))
+      (prog1
+          (list
+           nil                          ;dir / link / normal file
+           1                            ;number of links to file.
+           0 0                          ;uid ; gid
+           nil nil nil                  ;atime ; mtime ; ctime
+           (url-http-symbol-value-in-buffer 'url-http-content-length
+                                            buffer -1)
+           (eval-when-compile (make-string 10 ?-))
+           nil nil nil)          ;whether gid would change ; inode ; device.
+        (kill-buffer buffer)))))
 
 ;;;###autoload
 (defun url-http-file-attributes (url &optional id-format)
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index ba7a9b4a0a1..bef49d71a00 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -912,6 +912,10 @@ Recommended as a parent keymap for modes using widgets.")
 ;; backward-compatibility alias
 (put 'widget-button-pressed-face 'face-alias 'widget-button-pressed)
 
+(defvar widget-button-click-moves-point nil
+  "If non-nil, `widget-button-click' moves point to a button after invoking it.
+If nil, point returns to its original position after invoking a button.")
+
 (defun widget-button-click (event)
   "Invoke the button that the mouse is pointing at."
   (interactive "e")
@@ -922,7 +926,8 @@ Recommended as a parent keymap for modes using widgets.")
              (start (event-start event))
              (button (get-char-property
                       pos 'button (and (windowp (posn-window start))
-                                       (window-buffer (posn-window start))))))
+                                       (window-buffer (posn-window start)))))
+             newpoint)
         (when (or (null button)
                   (catch 'button-press-cancelled
               ;; Mouse click on a widget button.  Do the following
@@ -974,12 +979,15 @@ Recommended as a parent keymap for modes using widgets.")
 
                           ;; When mouse is released over the button, run
                           ;; its action function.
-                          (when (and pos
-                                     (eq (get-char-property pos 'button) button))
-                            (widget-apply-action button event)))
+                          (when (and pos (eq (get-char-property pos 'button) button))
+                            (goto-char pos)
+                            (widget-apply-action button event)
+                            (if widget-button-click-moves-point
+                                (setq newpoint (point)))))
                       (overlay-put overlay 'face face)
                       (overlay-put overlay 'mouse-face mouse-face))))
 
+                (if newpoint (goto-char newpoint))
                 ;; This loses if the widget action switches windows. -- cyd
                 ;; (unless (pos-visible-in-window-p (widget-event-point event))
                 ;;   (mouse-set-point event)
diff --git a/lisp/woman.el b/lisp/woman.el
index 3ee3e3f98d6..13fa3147487 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -438,6 +438,7 @@
 
 (eval-when-compile                      ; to avoid compiler warnings
   (require 'dired)
+  (require 'cl)
   (require 'apropos))
 
 (defun woman-mapcan (fn x)
@@ -2467,6 +2468,7 @@ Start at FROM and re-scan new text as appropriate."
         (woman0-search-regex
          (concat woman0-search-regex-start woman0-search-regex-end))
         woman0-rename-alist)
+    (set-marker-insertion-type woman0-if-to t)
     (while (re-search-forward woman0-search-regex nil t)
       (setq request (match-string 1))
       (cond ((string= request "ig") (woman0-ig))
@@ -2540,7 +2542,7 @@ REQUEST is the invoking directive without the leading dot."
         ;; String delimiter can be any non-numeric character,
         ;; including a special character escape:
         (looking-at "\\(\\\\(..\\|[^0-9]\\)\\(.*\\)\\1\\(.*\\)\\1\\'"))
-      (let ((end1 (copy-marker (match-end 2)))) ; end of first string
+      (let ((end1 (copy-marker (match-end 2) t))) ; End of first string.
         ;; Delete 2nd and 3rd delimiters to avoid processing them:
         (delete-region (match-end 3) woman0-if-to)
         (delete-region (match-end 2) (match-beginning 3))
@@ -2655,10 +2657,9 @@ If DELETE is non-nil then delete from point."
         (error "File `%s' not found" name))
     (beginning-of-line)
     (woman-delete-line 1)
-    (let ((from (point))
-          (to (make-marker))
-          (length (woman-insert-file-contents filename 0)))
-      (set-marker to (+ from length))
+    (let* ((from (point))
+           (length (woman-insert-file-contents filename 0))
+           (to (copy-marker (+ from length) t)))
       (woman-pre-process-region from to)
       (set-marker to nil)
       (goto-char from)
@@ -3442,9 +3443,7 @@ Also bound locally in `woman2-roff-buffer'.")
 (defsubst woman2-process-escapes-to-eol (&optional numeric)
   "Process remaining escape sequences up to eol.
 Handle numeric arguments specially if optional argument NUMERIC is non-nil."
-  (woman2-process-escapes
-   (save-excursion (end-of-line) (point-marker))
-   numeric))
+  (woman2-process-escapes (copy-marker (line-end-position) t) numeric))
 
 (defun woman2-nr (to)
   ".nr R +/-N M -- Assign +/-N (wrt to previous value, if any) to register R.
@@ -3645,6 +3644,7 @@ expression in parentheses.  Leaves point after the value."
         (woman-registers woman-registers)
         fn request translations
         tab-stop-list)
+    (set-marker-insertion-type to t)
     ;; ?roff does not squeeze multiple spaces, but does fill, so...
     (fset 'canonically-space-region 'ignore)
     ;; Try to avoid spaces inheriting underlines from preceding text!
@@ -3687,7 +3687,8 @@ expression in parentheses.  Leaves point after the value."
             ;; Call the appropriate function:
             (funcall fn to)))
       (if (not (eobp))                  ; This should not happen, but ...
-          (woman2-format-paragraphs (point-max-marker) woman-left-margin))
+          (woman2-format-paragraphs (copy-marker (point-max) t)
+                                    woman-left-margin))
       (fset 'canonically-space-region canonically-space-region)
       (fset 'set-text-properties set-text-properties)
       (fset 'insert-and-inherit insert-and-inherit)
@@ -3899,6 +3900,7 @@ Leave 1 blank line.  Format paragraphs upto TO."
 (defun woman2-process-escapes (to &optional numeric)
   "Process remaining escape sequences up to marker TO, preserving point.
 Optional argument NUMERIC, if non-nil, means the argument is numeric."
+  (assert (and (markerp to) (marker-insertion-type to)))
   ;; The first two cases below could be merged (maybe)!
   (let ((from (point)))
     ;; Discard zero width filler character used to hide leading dots
@@ -3968,15 +3970,13 @@ Optional argument NUMERIC, if non-nil, means the argument is numeric."
   (delete-char -1)
   (delete-char 1)
   (looking-at "\\(.\\)\\(.*\\)\\1")
-  (let ((to (make-marker)) from N c)
-    (set-marker to (match-end 2))
-    (delete-char 1)
-    (setq from (point)
-          N (woman-parse-numeric-arg))
-    (setq c (if (< (point) to) (following-char) ?_))
+  (forward-char 1)
+  (let* ((to (match-end 2))
+         (from (match-beginning 0))
+         (N (woman-parse-numeric-arg))
+         (c (if (< (point) to) (following-char) ?_)))
     (delete-region from to)
     (delete-char 1)
-    (set-marker to nil)
     (insert (make-string N c))
     ))