Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-592
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-593
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-594
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-595
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-596
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-597
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-598
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-186
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-187
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-188
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-189
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-190
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-191
   Update from CVS

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

29 files changed, 350 insertions, 184 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1825190c1a..f24de58fbb7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,87 @@
+2007-01-10  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ediff-init.el (ediff-autostore-merges):
+        * textmodes/fill.el (fill-region): Doc fix.
+
+2007-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * server.el (server-ensure-safe-dir): UIDs may be floats.
+
+2007-01-10  Richard Stallman  <rms@gnu.org>
+
+        * battery.el (battery-linux-proc-acpi): Use ignore-errors
+        around calls to directory-files.
+
+        * subr.el (momentary-string-display): Use save-excursion.
+
+        * emacs-lisp/pp.el (pp-eval-expression): Once again eval the
+        argument, but read it as `X' does.
+
+2007-01-09  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-fontify-node): Don't hide node names of index entries.
+
+        * faces.el (momentary): Change :group to basic-faces where all
+        basic faces belong to.  Add :version.
+
+2007-01-09  Lennart Borgman  <lennart.borgman.073@student.lu.se>
+
+        * tutorial.el (tutorial--display-changes): Show M-x sequence if no
+        keybinding is found.
+        (tutorial--find-changed-keys): Never treat null keybinding as a
+        remapping.
+
+2007-01-09  Martin Rudalics  <rudalics@gmx.at>
+
+        * wdired.el (wdired-xcase-word): Skip non-word read-only characters.
+
+2007-01-09  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule-cmds.el
+        (select-safe-coding-system-interactively): Fix message.
+
+2007-01-09  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-process-one-action): Remove `with-timeout'.
+        (tramp-process-actions): Add optional parameter TIMEOUT.
+        (tramp-open-connection-telnet, tramp-open-connection-rsh)
+        (tramp-open-connection-su): Add timeout of 60".
+
+2007-01-09  Richard Stallman  <rms@gnu.org>
+
+        * progmodes/compile.el (compile): Doc fix.
+
+2007-01-09  Markus Triska  <markus.triska@gmx.at>
+
+        * tumme.el (tumme-display-thumb): Doc fix.
+
+2007-01-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * battery.el (battery-search-for-one-match-in-files):
+        * bindings.el (mode-line-minor-mode-help):
+        * x-dnd.el (x-dnd-types-alist):
+        * calendar/icalendar.el (icalendar-import-buffer):
+        * term/mac-win.el (mac-dnd-types-alist): Fix typo in docstring.
+
+        * progmodes/vhdl-mode.el (vhdl-save-caches): Fix typo in error message.
+
+2007-01-07  Chris Moore  <christopher.ian.moore@gmail.com>  (tiny change)
+
+        * replace.el (replace-regexp): Fix typo in docstring.
+
+2007-01-07  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-langs.el (c-operators, c-filter-ops):
+        Amend doc-string and comments.
+
+2007-01-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.el (abbreviate-file-name): Doc fix.
+
+2007-01-06  Markus Triska  <triska@gmx.at>
+
+        * subr.el (split-string): Remove spurious ")" from doc string.
+
 2007-01-05  Takaaki Ota  <Takaaki.Ota@am.sony.com>
 
         * textmodes/table.el (table--warn-incompatibility):
@@ -275,6 +359,11 @@
 2006-12-27  Kenichi Handa  <handa@m17n.org>
 
         * international/mule-cmds.el (select-safe-coding-system-interactively):
+        Use face `link' for problematic chars.
+
+2006-12-27  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule-cmds.el (select-safe-coding-system-interactively):
         Improve the message in *Warning* buffer.
 
 2006-12-27  Kim F. Storm  <storm@cua.dk>
diff --git a/lisp/battery.el b/lisp/battery.el
index a4c72df0bbb..aec6865dc06 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -357,15 +357,17 @@ The following %-sequences are provided:
     (list (cons ?c (or (and capacity (number-to-string capacity)) "N/A"))
           (cons ?L (or (battery-search-for-one-match-in-files
                         (mapcar (lambda (e) (concat e "/state"))
-                                (directory-files "/proc/acpi/ac_adapter/"
-                                                 t "\\`[^.]"))
+                                (ignore-errors
+                                  (directory-files "/proc/acpi/ac_adapter/"
+                                                   t "\\`[^.]")))
                         "state: +\\(.*\\)$" 1)
 
                        "N/A"))
           (cons ?d (or (battery-search-for-one-match-in-files
                         (mapcar (lambda (e) (concat e "/temperature"))
-                                (directory-files "/proc/acpi/thermal_zone/"
-                                                 t "\\`[^.]"))
+                                (ignore-errors
+                                  (directory-files "/proc/acpi/thermal_zone/"
+                                                   t "\\`[^.]")))
                         "temperature: +\\([0-9]+\\) C$" 1)
 
                        "N/A"))
@@ -455,7 +457,7 @@ The following %-sequences are provided:
 
 (defun battery-search-for-one-match-in-files (files regexp match-num)
   "Search REGEXP in the content of the files listed in FILES.
-If a match occured, return the parenthesized expression numbered by
+If a match occurred, return the parenthesized expression numbered by
 MATCH-NUM in the match.  Otherwise, return nil."
   (with-temp-buffer
     (catch 'found
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 1d64612d8ca..690431a99e6 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -476,7 +476,7 @@ Menu of mode operations in the mode line.")
   (x-popup-menu event mode-line-mode-menu))
 
 (defun mode-line-minor-mode-help (event)
-  "Describe minor mode for EVENT occured on minor modes area of the mode line."
+  "Describe minor mode for EVENT occurred on minor modes area of the mode line."
   (interactive "@e")
   (let ((indicator (car (nth 4 (car (cdr event))))))
     (describe-minor-mode-from-indicator indicator)))
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 6fecc86bf34..9de4d1f3954 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -709,7 +709,7 @@ would be \"pm\"."
   "Export diary file to iCalendar format.
 All diary entries in the file DIARY-FILENAME are converted to iCalendar
 format.  The result is appended to the file ICAL-FILENAME."
-  (interactive "FExport diary data from file: 
+  (interactive "FExport diary data from file:
 Finto iCalendar file: ")
   (save-current-buffer
     (set-buffer (find-file diary-filename))
@@ -1453,8 +1453,8 @@ Argument ICAL-FILENAME output iCalendar file.
 Argument DIARY-FILENAME input `diary-file'.
 Optional argument NON-MARKING determines whether events are created as
 non-marking or not."
-  (interactive "fImport iCalendar data from file: 
-Finto diary file: 
+  (interactive "fImport iCalendar data from file:
+Finto diary file:
 p")
   ;; clean up the diary file
   (save-current-buffer
@@ -1479,7 +1479,7 @@ NON-MARKING determines whether diary events are created as
 non-marking.
 
 Return code t means that importing worked well, return code nil
-means that an error has occured.  Error messages will be in the
+means that an error has occurred.  Error messages will be in the
 buffer `*icalendar-errors*'."
   (interactive)
   (save-current-buffer
@@ -1508,7 +1508,7 @@ buffer `*icalendar-errors*'."
                   (set-buffer b)
                   (save-buffer)))))
           (message "Converting icalendar...done")
-          ;; return t if no error occured
+          ;; return t if no error occurred
           (not ical-errors))
       (message
        "Current buffer does not contain icalendar contents!")
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 2fc0ceefe4d..75b2fdc6fc5 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1410,9 +1410,10 @@ This property can be toggled interactively."
 
 (defcustom ediff-autostore-merges  'group-jobs-only
   "*Save the results of merge jobs automatically.
-nil means don't save automatically.  t means always save.  Anything else
-means save automatically only if the merge job is part of a group of jobs, such
-as `ediff-merge-directory' or `ediff-merge-directory-revisions'."
+With value nil, don't save automatically.  With value t, always
+save.  Anything else means save automatically only if the merge
+job is part of a group of jobs, such as `ediff-merge-directory'
+or `ediff-merge-directory-revisions'."
   :type '(choice (const nil) (const t) (const group-jobs-only))
   :group 'ediff-merge)
 (make-variable-buffer-local 'ediff-autostore-merges)
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 77f8854e022..27cb936c598 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -97,16 +97,13 @@ Output stream is STREAM, or value of `standard-output' (which see)."
   (princ (pp-to-string object) (or stream standard-output)))
 
 ;;;###autoload
-(defun pp-eval-expression (expval)
-  "Evaluate an expression, then pretty-print value EXPVAL into a new buffer.
-If pretty-printed EXPVAL fits on one line, display it in the echo
-area instead.  Also add EXPVAL to the front of the list
-in the variable `values'.
-
-Non-interactively, the argument is the value, EXPVAL, not the expression
-to evaluate."
-  (interactive "XPp-eval: ")
-  (setq values (cons expval values))
+(defun pp-eval-expression (expression)
+  "Evaluate EXPRESSION and pretty-print its value.
+Also add the value to the front of the list in the variable `values'."
+  (interactive
+   (list (read-from-minibuffer "Eval: " nil read-expression-map t
+                               'read-expression-history)))
+  (setq values (cons (eval expression) values))
   (let* ((old-show-function temp-buffer-show-function)
          ;; Use this function to display the buffer.
          ;; This function either decides not to display it at all
diff --git a/lisp/faces.el b/lisp/faces.el
index a3d0e8b6de6..0736cda2993 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2179,17 +2179,18 @@ terminal type to a different value."
   :version "21.1"
   :group 'basic-faces)
 
-(defface momentary
-  '((t (:inherit mode-line)))
-  "Face for momentarily displaying text in the current buffer."
-  :group 'display)
-
 (defface vertical-border
   '((((type tty)) :inherit mode-line-inactive))
   "Face used for vertical window dividers on ttys."
   :version "22.1"
   :group 'basic-faces)
 
+(defface momentary
+  '((t (:inherit mode-line)))
+  "Face for momentarily displaying text in the current buffer."
+  :version "22.1"
+  :group 'basic-faces)
+
 (defface minibuffer-prompt
   '((((background dark)) :foreground "cyan")
     ;; Don't use blue because many users of the MS-DOS port customize
diff --git a/lisp/files.el b/lisp/files.el
index 3834424ed4e..3b28f28b59b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1289,8 +1289,9 @@ Choose the buffer's name using `generate-new-buffer-name'."
 
 (defun abbreviate-file-name (filename)
   "Return a version of FILENAME shortened using `directory-abbrev-alist'.
-This also substitutes \"~\" for the user's home directory and
-removes automounter prefixes (see the variable `automount-dir-prefix')."
+This also substitutes \"~\" for the user's home directory (unless the
+home directory is a root directory) and removes automounter prefixes
+\(see the variable `automount-dir-prefix')."
   ;; Get rid of the prefixes added by the automounter.
   (save-match-data
     (if (and automount-dir-prefix
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ec7476b8758..a56f9ff1536 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,8 +1,38 @@
+2007-01-07  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-soup.el: Add missing :group in previous change.
+
 2007-01-05  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-soup.el (gnus-soup): New custom group.  Make user variables
         customizable.
 
+2007-01-03  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * nnweb.el (nnweb-gmane-create-mapping): Put back code to merge the
+        headers read from disk with the ones newly found in the current search.
+        This should no longer cause problems, because the article numbers in
+        Gmane's `nov.php' output are ignored since the previous change.
+
+2006-01-03  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * nnweb.el (nnweb-gmane-create-mapping): Keep the mapping stable for
+        solid groups.
+
+2006-01-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnweb.el (nnweb-gmane-create-mapping): Use the article number from
+        the headers when creating the mapping to avoid mismappings.
+        (nnweb-gmane-create-mapping): Always nix out old mapping.
+
+2007-01-02  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * gmm-utils.el (gmm-tool-bar-style): Fix custom type.
+
+2007-01-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-decode.el (mm-display-external): Use itimer function for XEmacs.
+
 2006-12-30  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
         * gnus-sum.el (gnus-summary-insert-dormant-articles): Fix typo in
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 59d02927008..18b1a528c29 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -203,8 +203,8 @@ This is copy of the `lazy' widget in Emacs 22.1 provided for compatibility."
       'gnome
     'retro)
   "Prefered tool bar style."
-  :type '(choice (const :tag "GNOME style" 'gnome)
-                 (const :tag "Retro look"  'retro))
+  :type '(choice (const :tag "GNOME style" gnome)
+                 (const :tag "Retro look"  retro))
   :group 'gmm)
 
 (defvar tool-bar-map)
diff --git a/lisp/gnus/gnus-soup.el b/lisp/gnus/gnus-soup.el
index 31074cb8c77..d5b1a9fad88 100644
--- a/lisp/gnus/gnus-soup.el
+++ b/lisp/gnus/gnus-soup.el
@@ -45,18 +45,21 @@
 (defcustom gnus-soup-directory (nnheader-concat gnus-home-directory "SoupBrew/")
   "Directory containing an unpacked SOUP packet."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'directory)
+  :type 'directory
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-replies-directory
   (nnheader-concat gnus-soup-directory "SoupReplies/")
   "Directory where Gnus will do processing of replies."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'directory)
+  :type 'directory
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-prefix-file "gnus-prefix"
   "Name of the file where Gnus stores the last used prefix."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'file)
+  :type 'file
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-packer "tar cf - %s | gzip > $HOME/Soupout%d.tgz"
   "Format string command for packing a SOUP packet.
@@ -64,28 +67,33 @@ The SOUP files will be inserted where the %s is in the string.
 This string MUST contain both %s and %d.  The file number will be
 inserted where %d appears."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'string)
+  :type 'string
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-unpacker "gunzip -c %s | tar xvf -"
   "Format string command for unpacking a SOUP packet.
 The SOUP packet file name will be inserted at the %s."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'string)
+  :type 'string
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-packet-directory gnus-home-directory
   "Where gnus-soup will look for REPLIES packets."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'directory)
+  :type 'directory
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-packet-regexp "Soupin"
   "Regular expression matching SOUP REPLIES packets in `gnus-soup-packet-directory'."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'regexp)
+  :type 'regexp
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-ignored-headers "^Xref:"
   "Regexp to match headers to be removed when brewing SOUP packets."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'regexp)
+  :type 'regexp
+  :group 'gnus-soup)
 
 ;;; Internal Variables:
 
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 7e6f93be1f1..361c83cfa7c 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -883,13 +883,21 @@ external if displayed external."
                           ;; a vector in Emacs but is a list in XEmacs)
                           ;; requires that it is lexically scoped.
                           (timer (run-at-time 2.0 nil 'ignore)))
-                       (lambda (process state)
-                         (when (eq 'exit (process-status process))
-                           (if (memq timer timer-list)
-                               (timer-set-function timer fn)
-                             (funcall fn))
-                           (ignore-errors (eval fm))
-                           (message "%s" done))))))
+                       (if (boundp 'itimer-list)
+                           (lambda (process state)
+                             (when (eq 'exit (process-status process))
+                               (if (memq timer itimer-list)
+                                   (set-itimer-function timer fn)
+                                 (funcall fn))
+                               (ignore-errors (eval fm))
+                               (message "%s" done)))
+                         (lambda (process state)
+                           (when (eq 'exit (process-status process))
+                             (if (memq timer timer-list)
+                                 (timer-set-function timer fn)
+                               (funcall fn))
+                             (ignore-errors (eval fm))
+                             (message "%s" done)))))))
                 (mm-handle-set-external-undisplayer
                  handle (cons file buffer)))
               (message "Displaying %s..." command))
diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index d020d533aea..54c57879d5b 100644
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -480,7 +480,7 @@ Valid types include `google', `dejanews', and `gmane'.")
                     (from (mail-header-from header))
                     (subject (mail-header-subject header))
                     (rfc2047-encoding-type 'mime))
-                (when (string-match " \\([^:]+\\):\\([0-9]+\\)" xref)
+                (when (string-match " \\([^:]+\\)[:/]\\([0-9]+\\)" xref)
                   (mail-header-set-xref
                    header
                    (format "http://article.gmane.org/%s/%s/raw"
@@ -496,11 +496,8 @@ Valid types include `google', `dejanews', and `gmane'.")
                                          (rfc2047-encode-string subject))
 
                 (unless (nnweb-get-hashtb (mail-header-xref header))
-                  (push
-                   (list
-                    (incf (cdr active))
-                    header)
-                   map)
+                  (mail-header-set-number header (incf (cdr active)))
+                  (push (list (mail-header-number header) header) map)
                   (nnweb-set-hashtb (cadar map) (car map))))))
           (forward-line 1)))
       (nnheader-message 7 "Searching Gmane...done")
diff --git a/lisp/info.el b/lisp/info.el
index 6d966da3317..880b659faa6 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3996,7 +3996,9 @@ the variable `Info-file-list-for-emacs'."
                                     (setq res (car hl) hl nil)
                                   (setq hl (cdr hl))))
                               res))) 'info-xref-visited 'info-xref)))
-              (when (and not-fontified-p (memq Info-hide-note-references '(t hide)))
+              (when (and not-fontified-p
+                         (memq Info-hide-note-references '(t hide))
+                         (not (Info-index-node)))
                 (put-text-property (match-beginning 2) (1- (match-end 6))
                                    'invisible t)
                 ;; Unhide the file name in parens
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 65c3f6fe5ff..41f6b376995 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -788,10 +788,10 @@ e.g., for sending an email message.\n ")
                                           (car coding)))))
                     (setq i (1+ i))))
                 (insert "\n"))
-              (insert "\
+              (insert (substitute-command-keys "\
 
-Click on a character to jump to the place it appears,\n"
-                      (substitute-command-keys "\
+Click on a character (or switch to this window by `\\[other-window]'\n\
+and select the characters by RET) to jump to the place it appears,\n\
 where `\\[universal-argument] \\[what-cursor-position]' will give information about it.\n"))))
           (insert (substitute-command-keys "\nSelect \
 one of the safe coding systems listed below,\n\
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 18248771da0..80e2f978f58 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -5782,8 +5782,8 @@ suggest to customize that face, if it's customizable.
 
 \(fn &optional FACE)" t nil)
 
-(autoload (quote customize-customized) "cus-edit" "\
-Customize all user options set since the last save in this session.
+(autoload (quote customize-unsaved) "cus-edit" "\
+Customize all user options set in this session but not saved.
 
 \(fn)" t nil)
 
@@ -6029,11 +6029,10 @@ This function is designed to be added to hooks, for example:
 Non-nil if Global-Cwarn mode is enabled.
 See the command `global-cwarn-mode' for a description of this minor-mode.
 Setting this variable directly does not take effect;
-use either \\[customize] or the function `global-cwarn-mode'.")
-
-(custom-autoload (quote global-cwarn-mode) "cwarn")
+either customize it (see the info node `Easy Customization')
+or call the function `global-cwarn-mode'.")
 
-(put (quote global-cwarn-mode) (quote custom-set) (quote custom-set-minor-mode))
+(custom-autoload (quote global-cwarn-mode) "cwarn" nil)
 
 (autoload (quote global-cwarn-mode) "cwarn" "\
 Toggle Cwarn mode in every buffer.
@@ -6407,11 +6406,10 @@ no args, if that value is non-nil.
 Non-nil if Delete-Selection mode is enabled.
 See the command `delete-selection-mode' for a description of this minor-mode.
 Setting this variable directly does not take effect;
-use either \\[customize] or the function `delete-selection-mode'.")
-
-(custom-autoload (quote delete-selection-mode) "delsel")
+either customize it (see the info node `Easy Customization')
+or call the function `delete-selection-mode'.")
 
-(put (quote delete-selection-mode) (quote custom-set) (quote custom-set-minor-mode))
+(custom-autoload (quote delete-selection-mode) "delsel" nil)
 
 (autoload (quote delete-selection-mode) "delsel" "\
 Toggle Delete Selection mode.
@@ -7973,6 +7971,10 @@ If MAP is specified, it should normally be a keymap; nil stands for the local
 menu-bar keymap.  It can also be a symbol, which has earlier been used as the
 first argument in a call to `easy-menu-define', or the value of such a symbol.
 
+If MAP is specified, it should normally be a keymap; nil stands for the local
+menu-bar keymap.  It can also be a symbol, which has earlier been used as the
+first argument in a call to `easy-menu-define', or the value of such a symbol.
+
 If the menu located by PATH has no submenu named NAME, add one.
 If the optional argument BEFORE is present, add it just before
 the submenu named BEFORE, otherwise add it at the end of the menu.
@@ -9690,7 +9692,7 @@ Use the `etags' program to make a tags table file.")
 A value of t means case-insensitive, a value of nil means case-sensitive.
 Any other value means use the setting of `case-fold-search'.")
 
-(custom-autoload (quote tags-case-fold-search) "etags")
+(custom-autoload (quote tags-case-fold-search) "etags" t)
 
 (defvar tags-table-list nil "\
 *List of file names of tags tables to search.
@@ -9699,7 +9701,7 @@ To switch to a new list of tags tables, setting this variable is sufficient.
 If you set this variable, do not also set `tags-file-name'.
 Use the `etags' program to make a tags table file.")
 
-(custom-autoload (quote tags-table-list) "etags")
+(custom-autoload (quote tags-table-list) "etags" t)
 
 (defvar tags-compression-info-list (quote ("" ".Z" ".bz2" ".gz" ".tgz")) "\
 *List of extensions tried by etags when jka-compr is used.
@@ -9708,7 +9710,7 @@ These extensions will be tried only if jka-compr was activated
 \(i.e. via customize of `auto-compression-mode' or by calling the function
 `auto-compression-mode').")
 
-(custom-autoload (quote tags-compression-info-list) "etags")
+(custom-autoload (quote tags-compression-info-list) "etags" t)
 
 (defvar tags-add-tables (quote ask-user) "\
 *Control whether to add a new tags table to the current list.
@@ -9716,14 +9718,14 @@ t means do; nil means don't (always start a new list).
 Any other value means ask the user whether to add a new tags table
 to the current list (as opposed to starting a new list).")
 
-(custom-autoload (quote tags-add-tables) "etags")
+(custom-autoload (quote tags-add-tables) "etags" t)
 
 (defvar find-tag-hook nil "\
 *Hook to be run by \\[find-tag] after finding a tag.  See `run-hooks'.
 The value in the buffer in which \\[find-tag] is done is used,
 not the value in the buffer \\[find-tag] goes to.")
 
-(custom-autoload (quote find-tag-hook) "etags")
+(custom-autoload (quote find-tag-hook) "etags" t)
 
 (defvar find-tag-default-function nil "\
 *A function of no arguments used by \\[find-tag] to pick a default tag.
@@ -9731,7 +9733,7 @@ If nil, and the symbol that is the value of `major-mode'
 has a `find-tag-default-function' property (see `put'), that is used.
 Otherwise, `find-tag-default' is used.")
 
-(custom-autoload (quote find-tag-default-function) "etags")
+(custom-autoload (quote find-tag-default-function) "etags" t)
 
 (autoload (quote tags-table-mode) "etags" "\
 Major mode for tags table file buffers.
@@ -13360,11 +13362,10 @@ is found.  A mode is excluded if it's in the list `hi-lock-exclude-modes'.
 Non-nil if Global-Hi-Lock mode is enabled.
 See the command `global-hi-lock-mode' for a description of this minor-mode.
 Setting this variable directly does not take effect;
-use either \\[customize] or the function `global-hi-lock-mode'.")
-
-(custom-autoload (quote global-hi-lock-mode) "hi-lock")
+either customize it (see the info node `Easy Customization')
+or call the function `global-hi-lock-mode'.")
 
-(put (quote global-hi-lock-mode) (quote custom-set) (quote custom-set-minor-mode))
+(custom-autoload (quote global-hi-lock-mode) "hi-lock" nil)
 
 (autoload (quote global-hi-lock-mode) "hi-lock" "\
 Toggle Hi-Lock mode in every buffer.
@@ -15009,6 +15010,15 @@ This function is intended to be used from `magic-mode-alist' (which see).
 
 \(fn)" nil nil)
 
+(autoload (quote image-type-auto-detected-p) "image" "\
+Return t iff the current buffer contains an auto-detectable image.
+Whether image types are auto-detectable or not depends on the setting
+of the variable `image-type-auto-detectable'.
+
+This function is intended to be used from `magic-mode-alist' (which see).
+
+\(fn)" nil nil)
+
 (autoload (quote create-image) "image" "\
 Create an image.
 FILE-OR-DATA is an image file name or image data.
@@ -15136,7 +15146,7 @@ setting this variable directly does not take effect unless
 `auto-image-file-mode' is re-enabled; this happens automatically when
 the variable is set using \\[customize].")
 
-(custom-autoload (quote image-file-name-extensions) "image-file")
+(custom-autoload (quote image-file-name-extensions) "image-file" nil)
 
 (defvar image-file-name-regexps nil "\
 *List of regexps matching image-file filenames.
@@ -15148,7 +15158,7 @@ enabled, setting this variable directly does not take effect unless
 `auto-image-file-mode' is re-enabled; this happens automatically when
 the variable is set using \\[customize].")
 
-(custom-autoload (quote image-file-name-regexps) "image-file")
+(custom-autoload (quote image-file-name-regexps) "image-file" nil)
 
 (autoload (quote image-file-name-regexp) "image-file" "\
 Return a regular expression matching image-file filenames.
@@ -15166,11 +15176,10 @@ the command `insert-file-contents'.
 Non-nil if Auto-Image-File mode is enabled.
 See the command `auto-image-file-mode' for a description of this minor-mode.
 Setting this variable directly does not take effect;
-use either \\[customize] or the function `auto-image-file-mode'.")
-
-(custom-autoload (quote auto-image-file-mode) "image-file")
+either customize it (see the info node `Easy Customization')
+or call the function `auto-image-file-mode'.")
 
-(put (quote auto-image-file-mode) (quote custom-set) (quote custom-set-minor-mode))
+(custom-autoload (quote auto-image-file-mode) "image-file" nil)
 
 (autoload (quote auto-image-file-mode) "image-file" "\
 Toggle visiting of image files as images.
@@ -15391,12 +15400,12 @@ Input matching this regexp is not saved on the input history in Inferior Lisp
 mode.  Default is whitespace followed by 0 or 1 single-letter colon-keyword
 \(as in :a, :c, etc.)")
 
-(custom-autoload (quote inferior-lisp-filter-regexp) "inf-lisp")
+(custom-autoload (quote inferior-lisp-filter-regexp) "inf-lisp" t)
 
 (defvar inferior-lisp-program "lisp" "\
 *Program name for invoking an inferior Lisp in Inferior Lisp mode.")
 
-(custom-autoload (quote inferior-lisp-program) "inf-lisp")
+(custom-autoload (quote inferior-lisp-program) "inf-lisp" t)
 
 (defvar inferior-lisp-load-command "(load \"%s\")\n" "\
 *Format-string for building a Lisp expression to load a file.
@@ -15407,7 +15416,7 @@ The string \"(progn (load \\\"%s\\\" :verbose nil :print t) (values))\\n\"
 produces cosmetically superior output for this application,
 but it works only in Common Lisp.")
 
-(custom-autoload (quote inferior-lisp-load-command) "inf-lisp")
+(custom-autoload (quote inferior-lisp-load-command) "inf-lisp" t)
 
 (defvar inferior-lisp-prompt "^[^> \n]*>+:? *" "\
 Regexp to recognize prompts in the Inferior Lisp mode.
@@ -15425,7 +15434,7 @@ kcl: \"^>+ *\"
 
 This is a fine thing to set in your .emacs file or through Custom.")
 
-(custom-autoload (quote inferior-lisp-prompt) "inf-lisp")
+(custom-autoload (quote inferior-lisp-prompt) "inf-lisp" t)
 
 (defvar inferior-lisp-mode-hook (quote nil) "\
 *Hook for customising Inferior Lisp mode.")
@@ -16322,28 +16331,28 @@ Specifies the keypad setup for unshifted keypad keys when NumLock is off.
 When selecting the plain numeric keypad setup, the character returned by the
 decimal key must be specified.")
 
-(custom-autoload (quote keypad-setup) "keypad")
+(custom-autoload (quote keypad-setup) "keypad" nil)
 
 (defvar keypad-numlock-setup nil "\
 Specifies the keypad setup for unshifted keypad keys when NumLock is on.
 When selecting the plain numeric keypad setup, the character returned by the
 decimal key must be specified.")
 
-(custom-autoload (quote keypad-numlock-setup) "keypad")
+(custom-autoload (quote keypad-numlock-setup) "keypad" nil)
 
 (defvar keypad-shifted-setup nil "\
 Specifies the keypad setup for shifted keypad keys when NumLock is off.
 When selecting the plain numeric keypad setup, the character returned by the
 decimal key must be specified.")
 
-(custom-autoload (quote keypad-shifted-setup) "keypad")
+(custom-autoload (quote keypad-shifted-setup) "keypad" nil)
 
 (defvar keypad-numlock-shifted-setup nil "\
 Specifies the keypad setup for shifted keypad keys when NumLock is off.
 When selecting the plain numeric keypad setup, the character returned by the
 decimal key must be specified.")
 
-(custom-autoload (quote keypad-numlock-shifted-setup) "keypad")
+(custom-autoload (quote keypad-numlock-shifted-setup) "keypad" nil)
 
 (autoload (quote keypad-setup) "keypad" "\
 Set keypad bindings in function-key-map according to SETUP.
@@ -17286,7 +17295,7 @@ This function normally would be called when the message is sent.
 Otherwise, (the default) use a smaller, somewhat faster, and
 often correct parser.")
 
-(custom-autoload (quote mail-use-rfc822) "mail-utils")
+(custom-autoload (quote mail-use-rfc822) "mail-utils" t)
 
 (autoload (quote mail-file-babyl-p) "mail-utils" "\
 Not documented
@@ -23124,7 +23133,7 @@ SENDERS is a string of names separated by commas.
 
 By default, `identity' is set.")
 
-(custom-autoload (quote rmail-summary-line-decoder) "rmailsum")
+(custom-autoload (quote rmail-summary-line-decoder) "rmailsum" t)
 
 (defvar rmail-user-mail-address-regexp nil "\
 *Regexp matching user mail addresses.
@@ -23567,7 +23576,7 @@ Mode for automatic saving of minibuffer history.
 Set this by calling the `savehist-mode' function or using the customize
 interface.")
 
-(custom-autoload (quote savehist-mode) "savehist")
+(custom-autoload (quote savehist-mode) "savehist" nil)
 
 (autoload (quote savehist-mode) "savehist" "\
 Toggle savehist-mode.
@@ -24682,7 +24691,7 @@ For example, the form
 
 would give military-style times like `21:07 (UTC)'.")
 
-(custom-autoload (quote calendar-time-display-form) "solar")
+(custom-autoload (quote calendar-time-display-form) "solar" t)
 
 (defvar calendar-latitude nil "\
 *Latitude of `calendar-location-name' in degrees.
@@ -24694,7 +24703,7 @@ York City.
 
 This variable should be set in `site-start'.el.")
 
-(custom-autoload (quote calendar-latitude) "solar")
+(custom-autoload (quote calendar-latitude) "solar" t)
 
 (defvar calendar-longitude nil "\
 *Longitude of `calendar-location-name' in degrees.
@@ -24706,7 +24715,7 @@ York City.
 
 This variable should be set in `site-start'.el.")
 
-(custom-autoload (quote calendar-longitude) "solar")
+(custom-autoload (quote calendar-longitude) "solar" t)
 
 (defvar calendar-location-name (quote (let ((float-output-format "%.1f")) (format "%s%s, %s%s" (if (numberp calendar-latitude) (abs calendar-latitude) (+ (aref calendar-latitude 0) (/ (aref calendar-latitude 1) 60.0))) (if (numberp calendar-latitude) (if (> calendar-latitude 0) "N" "S") (if (equal (aref calendar-latitude 2) (quote north)) "N" "S")) (if (numberp calendar-longitude) (abs calendar-longitude) (+ (aref calendar-longitude 0) (/ (aref calendar-longitude 1) 60.0))) (if (numberp calendar-longitude) (if (> calendar-longitude 0) "E" "W") (if (equal (aref calendar-longitude 2) (quote east)) "E" "W"))))) "\
 *Expression evaluating to name of `calendar-longitude', `calendar-latitude'.
@@ -24715,7 +24724,7 @@ pair.
 
 This variable should be set in `site-start'.el.")
 
-(custom-autoload (quote calendar-location-name) "solar")
+(custom-autoload (quote calendar-location-name) "solar" t)
 
 (autoload (quote sunrise-sunset) "solar" "\
 Local time of sunrise and sunset for today.  Accurate to a few seconds.
@@ -28017,7 +28026,7 @@ Not documented
 (autoload (quote tramp-completion-handle-file-name-all-completions) "tramp" "\
 Like `file-name-all-completions' for partial tramp files.
 
-\(fn FILENAME DIRECTORY)" nil nil)
+\(fn FILENAME DIRECTORY &optional PREDICATE)" nil nil)
 
 (autoload (quote tramp-completion-handle-file-name-completion) "tramp" "\
 Like `file-name-completion' for tramp files.
@@ -30532,7 +30541,8 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
 Non-nil if Which-Function mode is enabled.
 See the command `which-function-mode' for a description of this minor-mode.
 Setting this variable directly does not take effect;
-use either \\[customize] or the function `which-function-mode'.")
+either customize it (see the info node `Easy Customization')
+or call the function `which-function-mode'.")
 
 (custom-autoload (quote which-function-mode) "which-func" nil)
 
@@ -30778,7 +30788,7 @@ Toggle Winner mode.
 Setting this variable directly does not take effect;
 use either \\[customize] or the function `winner-mode'.")
 
-(custom-autoload (quote winner-mode) "winner")
+(custom-autoload (quote winner-mode) "winner" nil)
 
 (autoload (quote winner-mode) "winner" "\
 Toggle Winner mode.
@@ -31150,10 +31160,9 @@ Zone out, completely.
 ;;;;;;  "net/eudcb-bbdb.el" "net/eudcb-ldap.el" "net/eudcb-mab.el"
 ;;;;;;  "net/eudcb-ph.el" "net/ldap.el" "net/netrc.el" "net/tls.el"
 ;;;;;;  "net/tramp-smb.el" "net/tramp-util.el" "net/tramp-uu.el"
-;;;;;;  "net/tramp-vc.el" "net/trampver.el" "obsolete/bg-mouse.el"
-;;;;;;  "obsolete/hilit19.el" "obsolete/sc.el" "obsolete/uncompress.el"
-;;;;;;  "patcomp.el" "paths.el" "pcvs-info.el" "pcvs-parse.el" "pcvs-util.el"
-;;;;;;  "pgg-def.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el"
+;;;;;;  "net/tramp-vc.el" "net/trampver.el" "patcomp.el" "paths.el"
+;;;;;;  "pcvs-info.el" "pcvs-parse.el" "pcvs-util.el" "pgg-def.el"
+;;;;;;  "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el"
 ;;;;;;  "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el"
 ;;;;;;  "progmodes/cc-align.el" "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el"
 ;;;;;;  "progmodes/cc-cmds.el" "progmodes/cc-defs.el" "progmodes/cc-fonts.el"
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 822a995230e..4d3ee29c4d6 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2,7 +2,7 @@
 ;;; tramp.el --- Transparent Remote Access, Multiple Protocol
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net>
 ;;         Michael Albinus <michael.albinus@gmx.de>
@@ -5540,32 +5540,36 @@ The terminal type can be configured with `tramp-terminal-type'."
   (let (found item pattern action todo)
     (erase-buffer)
     (tramp-message 9 "Waiting 60s for prompt from remote shell")
-    (with-timeout (60 (throw 'tramp-action 'timeout))
-      (while (not found)
-        (tramp-accept-process-output p 1)
+    (while (not found)
+      (tramp-accept-process-output p 1)
+      (goto-char (point-min))
+      (setq todo actions)
+      (while todo
         (goto-char (point-min))
-        (setq todo actions)
-        (while todo
-          (goto-char (point-min))
-          (setq item (pop todo))
-          (setq pattern (symbol-value (nth 0 item)))
-          (setq action (nth 1 item))
-          (tramp-message 10 "Looking for regexp \"%s\" from remote shell"
-                         pattern)
-          (when (re-search-forward (concat pattern "\\'") nil t)
-            (setq found (funcall action p multi-method method user host)))))
-      found)))
+        (setq item (pop todo))
+        (setq pattern (symbol-value (nth 0 item)))
+        (setq action (nth 1 item))
+        (tramp-message 10 "Looking for regexp \"%s\" from remote shell"
+                       pattern)
+        (when (re-search-forward (concat pattern "\\'") nil t)
+          (setq found (funcall action p multi-method method user host)))))
+    found))
 
-(defun tramp-process-actions (p multi-method method user host actions)
-  "Perform actions until success."
+(defun tramp-process-actions
+  (p multi-method method user host actions &optional timeout)
+  "Perform actions until success or TIMEOUT."
   (tramp-message 10 "%s" (mapconcat 'identity (process-command p) " "))
   (let (exit)
     (while (not exit)
       (tramp-message 9 "Waiting for prompts from remote shell")
       (setq exit
             (catch 'tramp-action
-              (tramp-process-one-action
-               p multi-method method user host actions)
+              (if timeout
+                  (with-timeout (timeout)
+                    (tramp-process-one-action
+                     p multi-method method user host actions))
+                (tramp-process-one-action
+                 p multi-method method user host actions))
               nil)))
     (unless (eq exit 'ok)
       (tramp-clear-passwd user host)
@@ -5689,7 +5693,7 @@ Maybe the different regular expressions need to be tuned.
         (set-buffer (tramp-get-buffer multi-method method user host))
         (erase-buffer)
         (tramp-process-actions p multi-method method user host
-                               tramp-actions-before-shell)
+                               tramp-actions-before-shell 60)
         (tramp-open-connection-setup-interactive-shell
          p multi-method method user host)
         (tramp-post-connection multi-method method user host)))))
@@ -5762,7 +5766,7 @@ arguments, and xx will be used as the host name to connect to.
 
         (set-buffer buf)
         (tramp-process-actions p multi-method method user host
-                               tramp-actions-before-shell)
+                               tramp-actions-before-shell 60)
         (tramp-message 7 "Initializing remote shell")
         (tramp-open-connection-setup-interactive-shell
          p multi-method method user host)
@@ -5823,7 +5827,7 @@ prompt than you do, so it is not at all unlikely that the variable
         (tramp-set-process-query-on-exit-flag p nil)
         (set-buffer (tramp-get-buffer multi-method method user host))
         (tramp-process-actions p multi-method method user host
-                               tramp-actions-before-shell)
+                               tramp-actions-before-shell 60)
         (tramp-open-connection-setup-interactive-shell
          p multi-method method user host)
         (tramp-post-connection multi-method method
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index b3c0a578649..6907b56d6c6 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -208,23 +208,31 @@ the evaluated constant value at compile time."
   ;; Some helper functions used when building the language constants.
 
   (defun c-filter-ops (ops opgroup-filter op-filter &optional xlate)
-    ;; Used to filter operators from the list OPS in a DWIM:ey way:
-    ;; OPS either has the structure of `c-operators', as a single
+    ;; Extract a subset of the operators in the list OPS in a DWIM:ey
+    ;; way.  The return value is a plain list of operators:  
+    ;; 
+    ;; OPS either has the structure of `c-operators', is a single
     ;; group in `c-operators', or is a plain list of operators.
-    ;; OPGROUP-FILTER is used filter out the operator groups.  It can
-    ;; be t to choose all groups, a list of the group type symbols to
-    ;; accept, or a function which will be called with the group
-    ;; symbol for each group and should return non-nil for those to
-    ;; include.  OP-FILTER filters the individual operators in each
-    ;; group.  It can be t to choose all operators, a regexp to test
-    ;; against each operator, or a function which will be called for
-    ;; each operator and should return non-nil for those to include.
+    ;; 
+    ;; OPGROUP-FILTER specifies how to select the operator groups.  It
+    ;; can be t to choose all groups, a list of group type symbols
+    ;; (such as 'prefix) to accept, or a function which will be called
+    ;; with the group symbol for each group and should return non-nil
+    ;; if that group is to be included.
+    ;;
+    ;; OP-FILTER filters the individual operators in each group.  It
+    ;; can be t to choose all operators, a regexp to test against each
+    ;; operator, or a function which will be called for each operator
+    ;; and should return non-nil for those to include.
+    ;;
     ;; If XLATE is given, it's a function which is called for each
     ;; matching operator and its return value is collected instead.
     ;; If it returns a list, the elements are spliced directly into
     ;; the final result, which is returned as a list with duplicates
-    ;; removed using `equal'.  `c-mode-syntax-table' for the current
-    ;; mode is in effect during the whole procedure.
+    ;; removed using `equal'.
+    ;;
+    ;; `c-mode-syntax-table' for the current mode is in effect during
+    ;; the whole procedure.
     (unless (listp (car-safe ops))
       (setq ops (list ops)))
     (cond ((eq opgroup-filter t)
@@ -719,11 +727,11 @@ expression."
 (c-lang-defconst c-operators
   "List describing all operators, along with their precedence and
 associativity.  The order in the list corresponds to the precedence of
-the operators: The operators in each element is a group with the same
+the operators: The operators in each element are a group with the same
 precedence, and the group has higher precedence than the groups in all
-following elements.  The car of each element describes the type of of
-the operator group, and the cdr is a list of the operator tokens in
-it.  The operator group types are:
+following elements.  The car of each element describes the type of the
+operator group, and the cdr is a list of the operator tokens in it.
+The operator group types are:
 
 'prefix         Unary prefix operators.
 'postfix        Unary postfix operators.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 04a5cf9cad7..c6876fb5d79 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -876,12 +876,12 @@ FMTS is a list of format specs for transforming the file name.
 Runs COMMAND, a shell command, in a separate process asynchronously
 with output going to the buffer `*compilation*'.
 
-If optional second arg COMINT is t the buffer will be in Comint mode with
-`compilation-shell-minor-mode'.
-
 You can then use the command \\[next-error] to find the next error message
 and move to the source code that caused it.
 
+If optional second arg COMINT is t the buffer will be in Comint mode with
+`compilation-shell-minor-mode'.
+
 Interactively, prompts for the command if `compilation-read-command' is
 non-nil; otherwise uses `compile-command'.  With prefix arg, always prompts.
 Additionally, with universal prefix arg, compilation buffer will be in
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 3bf4227a82f..cc58a09ec59 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -13851,7 +13851,7 @@ entity ENT-KEY."
             (vhdl-save-cache (car project-list))
             (setq project-list (cdr project-list)))
           (message "Saving hierarchy caches...done")))
-    (error (progn (vhdl-warning "ERROR:  An error occured while saving the hierarchy caches")
+    (error (progn (vhdl-warning "ERROR:  An error occurred while saving the hierarchy caches")
                   (sit-for 2)))))
 
 (defun vhdl-save-cache (key)
diff --git a/lisp/replace.el b/lisp/replace.el
index 610fd9d2e9f..c51985c3e4a 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -467,10 +467,9 @@ at the given position for each replacement.
 In interactive calls, the replacement text may contain `\\,'
 followed by a Lisp expression used as part of the replacement
 text.  Inside of that expression, `\\&' is a string denoting the
-whole match, `\\N' a partial matches, `\\#&' and `\\#N' the
-respective numeric values from `string-to-number', and `\\#'
-itself for `replace-count', the number of replacements occured so
-far.
+whole match, `\\N' a partial match, `\\#&' and `\\#N' the respective
+numeric values from `string-to-number', and `\\#' itself for
+`replace-count', the number of replacements occurred so far.
 
 If your Lisp expression is an identifier and the next letter in
 the replacement string would be interpreted as part of it, you
diff --git a/lisp/server.el b/lisp/server.el
index 7a4179e85f6..dd64bb6cf89 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1,7 +1,7 @@
 ;;; server.el --- Lisp code for GNU Emacs running as server process
 
 ;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: William Sommerfeld <wesommer@athena.mit.edu>
 ;; Maintainer: FSF
@@ -435,7 +435,7 @@ Creates the directory if necessary and makes sure:
       (letf (((default-file-modes) ?\700)) (make-directory dir t))
       (setq attrs (file-attributes dir)))
     ;; Check that it's safe for use.
-    (unless (and (eq t (car attrs)) (eq (nth 2 attrs) (user-uid))
+    (unless (and (eq t (car attrs)) (eql (nth 2 attrs) (user-uid))
                  (or (eq system-type 'windows-nt)
                      (zerop (logand ?\077 (file-modes dir)))))
       (error "The directory %s is unsafe" dir))))
diff --git a/lisp/subr.el b/lisp/subr.el
index b48fa1a9f35..18f4ad65686 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1905,11 +1905,11 @@ If MESSAGE is nil, instructions to type EXIT-CHAR are displayed there."
               (recenter (/ (window-height) 2)))
           ;; If that pushed message start off the screen,
           ;; scroll to start it at the top of the screen.
-          (move-to-window-line 0)
-          (if (> (point) pos)
-              (progn
+          (save-excursion
+            (move-to-window-line 0)
+            (if (> (point) pos)
                 (goto-char pos)
-                (recenter 0)))
+              (recenter 0)))
           (message (or message "Type %s to continue editing.")
                    (single-key-description exit-char))
           (let (char)
@@ -2695,7 +2695,7 @@ are effectively trimmed).  If nil, all zero-length substrings are retained,
 which correctly parses CSV format, for example.
 
 Note that the effect of `(split-string STRING)' is the same as
-`(split-string STRING split-string-default-separators t)').  In the rare
+`(split-string STRING split-string-default-separators t)'.  In the rare
 case that you wish to retain zero-length substrings when splitting on
 whitespace, use `(split-string STRING split-string-default-separators)'.
 
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index f35bf080bbb..700ad57029b 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -2177,7 +2177,7 @@ either in the current buffer or in the echo area."
     ("TIFF" . mac-dnd-insert-TIFF))
   "Which function to call to handle a drop of that type.
 The function takes three arguments, WINDOW, ACTION and DATA.
-WINDOW is where the drop occured, ACTION is always `private' on
+WINDOW is where the drop occurred, ACTION is always `private' on
 Mac.  DATA is the drop data.  Unlike the x-dnd counterpart, the
 return value of the function is not significant.
 
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 21ee585ec11..65c8067d48a 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -743,7 +743,7 @@ space does not end a sentence, so don't break a line there."
 
 (defun fill-minibuffer-function (arg)
   "Fill a paragraph in the minibuffer, ignoring the prompt."
-  (save-restriction 
+  (save-restriction
     (narrow-to-region (minibuffer-prompt-end) (point-max))
     (fill-paragraph arg)))
 
@@ -838,18 +838,22 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
              (commark
               (comment-string-strip (buffer-substring comstart comin) nil t))
              (comment-re
-              ;; `commark' is surrounded with arbitrary text (`\0' and `a')
-              ;;  to make sure it can be used as an optimization of
-              ;; `comment-start-skip' in the middle of a line.  For example,
-              ;; `commark' can't be used with the "@c" in TeXinfo (hence
-              ;; the `a') or with the "C" at BOL in Fortran (hence the `\0').
-              (if (string-match comment-start-skip (concat "\0" commark "a"))
-                  (concat "[ \t]*" (regexp-quote commark)
-                          ;; Make sure we only match comments that use
-                          ;; the exact same comment marker.
-                          "[^" (substring commark -1) "]")
-                (concat "[ \t]*\\(?:" comment-start-skip "\\)")))
-             (comment-fill-prefix       ; Compute a fill prefix.
+              ;; A regexp more specialized than comment-start-skip, that only
+              ;; matches the current commark rather than any valid commark.
+              ;;
+              ;; The specialized regexp only works for "normal" comment
+              ;; syntax, not for Texinfo's "@c" (which can't be immediately
+              ;; followed by word-chars) or Fortran's "C" (which needs to be
+              ;; at bol), so check that comment-start-skip indeed allows the
+              ;; commark to appear in the middle of the line and followed by
+              ;; word chars.  The choice of "\0" and "a" is mostly arbitrary.
+              (if (string-match comment-start-skip (concat "\0" commark "a"))
+                  (concat "[ \t]*" (regexp-quote commark)
+                          ;; Make sure we only match comments that
+                          ;; use the exact same comment marker.
+                          "[^" (substring commark -1) "]")
+                (concat "[ \t]*\\(?:" comment-start-skip "\\)")))
+             (comment-fill-prefix       ; Compute a fill prefix.
               (save-excursion
                 (goto-char comstart)
                 (if has-code-and-comment
@@ -944,13 +948,13 @@ Ordinarily the variable `fill-column' controls the width.
 
 Noninteractively, the third argument JUSTIFY specifies which
 kind of justification to do: `full', `left', `right', `center',
-or `none' (equivalent to nil).  t means handle each paragraph
-as specified by its text properties.
+or `none' (equivalent to nil).  A value of t means handle each
+paragraph as specified by its text properties.
 
-The fourth arg NOSQUEEZE non-nil means to leave
-whitespace other than line breaks untouched, and fifth arg TO-EOP
-non-nil means to keep filling to the end of the paragraph (or next
-hard newline, if variable `use-hard-newlines' is on).
+The fourth arg NOSQUEEZE non-nil means to leave whitespace other
+than line breaks untouched, and fifth arg TO-EOP non-nil means
+to keep filling to the end of the paragraph (or next hard newline,
+if variable `use-hard-newlines' is on).
 
 Return the fill-prefix used for filling the last paragraph.
 
diff --git a/lisp/tumme.el b/lisp/tumme.el
index 788a29958a8..2fc6eff2458 100644
--- a/lisp/tumme.el
+++ b/lisp/tumme.el
@@ -1646,7 +1646,7 @@ Ask user for number of images to show and the delay in between."
 
 ;;;###autoload
 (defun tumme-display-thumb ()
-  "Shorthard for `tumme-display-thumbs' with prefix argument."
+  "Shorthand for `tumme-display-thumbs' with prefix argument."
   (interactive)
   (tumme-display-thumbs t nil t))
 
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index cf9a391e5a6..53f41c95646 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -446,7 +446,8 @@ where
             (cond ((eq key-fun def-fun)
                    ;; No rebinding, return t
                    t)
-                  ((eq key-fun (command-remapping def-fun))
+                  ((and key-fun
+                        (eq key-fun (command-remapping def-fun)))
                    ;; Just a remapping, return t
                    t)
                   ;; cua-mode specials:
@@ -571,6 +572,8 @@ with some explanatory links."
                   (where   (nth 3 ck))
                   s1 s2 help-string)
              (unless (string= where "Same key")
+               (when (string= where "")
+                 (setq where (format "M-x %s" def-fun)))
                (setq tutorial--point-after-chkeys (point-marker)
                      s1 (get-lang-string tutorial--lang 'tut-chgdkey)
                      s2 (get-lang-string tutorial--lang 'tut-chgdkey2)
diff --git a/lisp/wdired.el b/lisp/wdired.el
index 5a925e5d031..2c43b6f1552 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -576,8 +576,11 @@ If OLD, return the old target.  If MOVE, move point before it."
             (funcall command 1)
             (setq arg (1- arg)))
         (error
-         (if (not (forward-word 1))
-             (setq arg 0)))))))
+         (if (forward-word)
+             ;; Skip any non-word characters to avoid triggering a read-only
+             ;; error which would cause skipping the next word characters too.
+             (skip-syntax-forward "^w")
+           (setq arg 0)))))))
 
 (defun wdired-downcase-word (arg)
   "WDired version of `downcase-word'.
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 717fcf207da..1c72d0a65fe 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -70,7 +70,7 @@ The default value for this variable is `x-dnd-default-test-function'."
   "Which function to call to handle a drop of that type.
 If the type for the drop is not present, or the function is nil,
 the drop is rejected.  The function takes three arguments, WINDOW, ACTION
-and DATA.  WINDOW is where the drop occured, ACTION is the action for
+and DATA.  WINDOW is where the drop occurred, ACTION is the action for
 this drop (copy, move, link, private or ask) as determined by a previous
 call to `x-dnd-test-function'.  DATA is the drop data.
 The function shall return the action used (copy, move, link or private) if drop