merge trunk

15 files changed, 386 insertions, 293 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0cbf007771..484ae6529c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,48 @@
+2010-05-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        Add TeX open-block and close-block keybindings to SGML, and vice
+        versa.
+
+        * textmodes/tex-mode.el (tex-mode-map): Bind C-c C-t to
+        latex-open-block and C-c / to latex-close-block.
+
+        * textmodes/sgml-mode.el (sgml-mode-map): Bind C-c C-o to sgml-tag
+        and C-c C-e to sgml-close-tag.
+
+2010-05-13  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (with-progress-reporter): Create reporter object
+        only when the message would be displayed.  Handled nested calls.
+        (tramp-handle-load, tramp-handle-file-local-copy)
+        (tramp-handle-insert-file-contents, tramp-handle-write-region)
+        (tramp-maybe-send-script, tramp-find-shell): Use
+        `with-progress-reporter'.
+        (tramp-handle-dired-compress-file, tramp-maybe-open-connection):
+        Fix message text.
+
+        * net/tramp-smb.el (tramp-smb-handle-copy-file)
+        (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file)
+        (tramp-smb-handle-write-region, tramp-smb-maybe-open-connection):
+        Use `with-progress-reporter'.
+
+2010-05-13  Agustín Martín  <agustin.martin@hispalinux.es>
+
+        * ispell.el (ispell-init-process): Do not kill ispell process
+        everytime when spellchecking from the minibuffer (bug#6143).
+
+2010-05-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/sh-script.el (sh-mode): Use define-derived-mode.
+
+        * dos-fns.el: Add "dos-" prefix for namespace control.
+        (convert-standard-filename): Define as alias for
+        dos-convert-standard-filename but only if applicable.
+
+2010-05-12  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-cmds.el (c-beginning-of-defun, c-end-of-defun):
+        Push the mark at the start of these functions when appropriate.
+
 2010-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * minibuffer.el (completion-cycle-threshold): New custom var.
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index c1c2517bc22..5834afae8bc 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -31,7 +31,7 @@
 (declare-function msdos-long-file-names "msdos.c")
 
 ;; This overrides a trivial definition in files.el.
-(defun convert-standard-filename (filename)
+(defun dos-convert-standard-filename (filename)
   "Convert a standard file's name to something suitable for the current OS.
 This means to guarantee valid names and perhaps to canonicalize
 certain patterns.
@@ -48,7 +48,7 @@ shell requires it (see `w32-shell-dos-semantics')."
     (let ((flen (length filename)))
       ;; If FILENAME has a trailing slash, remove it and recurse.
       (if (memq (aref filename (1- flen)) '(?/ ?\\))
-          (concat (convert-standard-filename
+          (concat (dos-convert-standard-filename
                    (substring filename 0 (1- flen)))
                   "/")
         (let* (;; ange-ftp gets in the way for names like "/foo:bar".
@@ -122,12 +122,17 @@ shell requires it (see `w32-shell-dos-semantics')."
                 (aset string (1- (length string)) lastchar))))
           (concat (if (and (stringp dir)
                            (memq (aref dir dlen-m-1) '(?/ ?\\)))
-                      (concat (convert-standard-filename
+                      (concat (dos-convert-standard-filename
                                (substring dir 0 dlen-m-1))
                               "/")
-                    (convert-standard-filename dir))
+                    (dos-convert-standard-filename dir))
                   string))))))
 
+;; Only redirect convert-standard-filename if it has a chance of working,
+;; otherwise loading dos-fns.el might make your non-DOS Emacs misbehave.
+(when (fboundp 'msdos-long-file-names)
+  (defalias 'convert-standard-filename 'dos-convert-standard-filename))
+
 (defun dos-8+3-filename (filename)
   "Truncate FILENAME to DOS 8+3 limits."
   (if (or (not (stringp filename))
@@ -188,12 +193,12 @@ shell requires it (see `w32-shell-dos-semantics')."
 
 ;; This is for the sake of standard file names elsewhere in Emacs that
 ;; are defined as constant strings or via defconst, and whose
-;; conversion via `convert-standard-filename' does not give good
+;; conversion via `dos-convert-standard-filename' does not give good
 ;; enough results.
 (defun dosified-file-name (file-name)
   "Return a variant of FILE-NAME that is valid on MS-DOS filesystems.
 
-This function is for those rare cases where `convert-standard-filename'
+This function is for those rare cases where `dos-convert-standard-filename'
 does not do a job that is good enough, e.g. if you need to preserve the
 file-name extension.  It recognizes only certain specific file names
 that are used in Emacs Lisp sources; any other file name will be
@@ -209,13 +214,13 @@ returned unaltered."
 (defvar msdos-shells)
 
 ;; Override settings chosen at startup.
-(defun set-default-process-coding-system ()
+(defun dos-set-default-process-coding-system ()
   (setq default-process-coding-system
         (if (default-value 'enable-multibyte-characters)
             '(undecided-dos . undecided-dos)
           '(raw-text-dos . raw-text-dos))))
 
-(add-hook 'before-init-hook 'set-default-process-coding-system)
+(add-hook 'before-init-hook 'dos-set-default-process-coding-system)
 
 ;; File names defined in preloaded packages can be incorrect or
 ;; invalid if long file names were available during dumping, but not
@@ -232,17 +237,17 @@ returned unaltered."
 
 (add-hook 'before-init-hook 'dos-reevaluate-defcustoms)
 
-(defvar register-name-alist
+(defvar dos-register-name-alist
   '((ax . 0) (bx . 1) (cx . 2) (dx . 3) (si . 4) (di . 5)
     (cflag . 6) (flags . 7)
     (al . (0 . 0)) (bl . (1 . 0)) (cl . (2 . 0)) (dl . (3 . 0))
     (ah . (0 . 1)) (bh . (1 . 1)) (ch . (2 . 1)) (dh . (3 . 1))))
 
-(defun make-register ()
+(defun dos-make-register ()
   (make-vector 8 0))
 
-(defun register-value (regs name)
-  (let ((where (cdr (assoc name register-name-alist))))
+(defun dos-register-value (regs name)
+  (let ((where (cdr (assoc name dos-register-name-alist))))
     (cond ((consp where)
            (let ((tem (aref regs (car where))))
              (if (zerop (cdr where))
@@ -252,10 +257,10 @@ returned unaltered."
            (aref regs where))
           (t nil))))
 
-(defun set-register-value (regs name value)
+(defun dos-set-register-value (regs name value)
   (and (numberp value)
        (>= value 0)
-       (let ((where (cdr (assoc name register-name-alist))))
+       (let ((where (cdr (assoc name dos-register-name-alist))))
          (cond ((consp where)
                 (let ((tem (aref regs (car where)))
                       (value (logand value 255)))
@@ -268,18 +273,18 @@ returned unaltered."
                 (aset regs where (logand value 65535))))))
   regs)
 
-(defsubst intdos (regs)
+(defsubst dos-intdos (regs)
   (int86 33 regs))
 
 ;; Backward compatibility for obsolescent functions which
 ;; set screen size.
 
-(defun mode25 ()
+(defun dos-mode25 ()
   "Changes the number of screen rows to 25."
   (interactive)
   (set-frame-size (selected-frame) 80 25))
 
-(defun mode4350 ()
+(defun dos-mode4350 ()
   "Changes the number of rows to 43 or 50.
 Emacs always tries to set the screen height to 50 rows first.
 If this fails, it will try to set it to 43 rows, on the assumption
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 194d2036c3f..0b7eaf7ed72 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,25 @@
+2010-05-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mml1991.el (mml1991-mailcrypt-encrypt, mml1991-gpg-encrypt)
+        * mml2015.el (mml2015-gpg-encrypt): Disable multibyte in buffers
+        generated within the mm-with-unibyte-current-buffer macro.
+
+2010-05-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-bind-safe-url-regexp): Bind mm-w3m-safe-url-regexp
+        to nil when we're in a mml-preview buffer and no group is selected.
+
+2010-05-12  Andreas Seltenreich  <seltenreich@gmx.de>
+
+        * gnus-sum.el (gnus-summary-read-group-1): Don't jump to next group
+        when catching the `C-g'.  Reported by: "Leo"
+
+2010-05-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * message.el (message-forward-make-body-plain)
+        (message-forward-make-body-mml): Use mm-multibyte-string-p instead of
+        multibyte-string-p.
+
 2010-05-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * message.el (message-forward-make-body-mml): Assume original message
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 5f899b3067a..0659ee893de 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4822,7 +4822,11 @@ General format specifiers can also be used.  See Info node
                            (with-current-buffer gnus-article-current-summary
                              gnus-newsgroup-name)
                          gnus-newsgroup-name)))
-            (if (cond ((stringp gnus-safe-html-newsgroups)
+            (if (cond ((not group)
+                       ;; Maybe we're in a mml-preview buffer
+                       ;; and no group is selected.
+                       t)
+                      ((stringp gnus-safe-html-newsgroups)
                        (string-match gnus-safe-html-newsgroups group))
                       ((consp gnus-safe-html-newsgroups)
                        (member group gnus-safe-html-newsgroups)))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index a0943493844..3a2c944ed2f 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -3931,7 +3931,6 @@ If NO-DISPLAY, don't generate a summary buffer."
           (progn
             (set-buffer gnus-group-buffer)
             (gnus-group-jump-to-group group)
-            (gnus-group-next-unread-group 1)
             (gnus-configure-windows 'group 'force))
         (gnus-handle-ephemeral-exit quit-config))
       ;; Finally signal the quit.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 897fe695288..947b1bd53e8 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7165,7 +7165,7 @@ Optional DIGEST will use digest to forward."
         (contents (with-current-buffer forward-buffer (buffer-string)))
         e)
     (unless (featurep 'xemacs)
-      (unless (multibyte-string-p contents)
+      (unless (mm-multibyte-string-p contents)
         (error "Attempt to insert unibyte string from the buffer \"%s\"\
  to the multibyte buffer \"%s\""
                (if (bufferp forward-buffer)
@@ -7220,7 +7220,7 @@ Optional DIGEST will use digest to forward."
     (if (not message-forward-decoded-p)
         (let ((contents (with-current-buffer forward-buffer (buffer-string))))
           (unless (featurep 'xemacs)
-            (unless (multibyte-string-p contents)
+            (unless (mm-multibyte-string-p contents)
               (error "Attempt to insert unibyte string from the buffer \"%s\"\
  to the multibyte buffer \"%s\""
                      (if (bufferp forward-buffer)
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index a3ada29fa66..3ba479574fd 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -145,6 +145,7 @@ Whether the passphrase is cached at all is controlled by
       (delete-region (point-min) (point)))
     (mm-with-unibyte-current-buffer
       (with-temp-buffer
+        (inline (mm-disable-multibyte))
         (setq cipher (current-buffer))
         (insert-buffer-substring text)
         (unless (mc-encrypt-generic
@@ -225,6 +226,7 @@ Whether the passphrase is cached at all is controlled by
       (delete-region (point-min) (point)))
     (mm-with-unibyte-current-buffer
       (with-temp-buffer
+        (inline (mm-disable-multibyte))
         (flet ((gpg-encrypt-func
                 (sign plaintext ciphertext result recipients &optional
                       passphrase sign-with-key armor textmode)
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 130a3ca86a5..977f4dabb67 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -680,6 +680,7 @@ Whether the passphrase is cached at all is controlled by
         cipher)
     (mm-with-unibyte-current-buffer
       (with-temp-buffer
+        (mm-disable-multibyte)
         ;; set up a function to call the correct gpg encrypt routine
         ;; with the right arguments. (FIXME: this should be done
         ;; differently.)
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 434c2bad20d..00b282b83e3 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -334,41 +334,41 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server.
 PRESERVE-UID-GID is completely ignored."
   (setq filename (expand-file-name filename)
         newname (expand-file-name newname))
+  (with-progress-reporter
+      (tramp-dissect-file-name (if (file-remote-p filename) filename newname))
+      0 (format "Copying %s to %s" filename newname)
+
+    (let ((tmpfile (file-local-copy filename)))
+
+      (if tmpfile
+          ;; Remote filename.
+          (condition-case err
+              (rename-file tmpfile newname ok-if-already-exists)
+            ((error quit)
+             (tramp-compat-delete-file tmpfile 'force)
+             (signal (car err) (cdr err))))
+
+        ;; Remote newname.
+        (when (file-directory-p newname)
+          (setq newname
+                (expand-file-name (file-name-nondirectory filename) newname)))
+
+        (with-parsed-tramp-file-name newname nil
+          (when (and (not ok-if-already-exists)
+                     (file-exists-p newname))
+            (tramp-error v 'file-already-exists newname))
 
-  (let ((tmpfile (file-local-copy filename)))
-
-    (if tmpfile
-        ;; Remote filename.
-        (condition-case err
-            (rename-file tmpfile newname ok-if-already-exists)
-          ((error quit)
-           (tramp-compat-delete-file tmpfile 'force)
-           (signal (car err) (cdr err))))
-
-      ;; Remote newname.
-      (when (file-directory-p newname)
-        (setq newname (expand-file-name
-                       (file-name-nondirectory filename) newname)))
-
-      (with-parsed-tramp-file-name newname nil
-        (when (and (not ok-if-already-exists)
-                   (file-exists-p newname))
-          (tramp-error v 'file-already-exists newname))
-
-        ;; We must also flush the cache of the directory, because
-        ;; `file-attributes' reads the values from there.
-        (tramp-flush-file-property v (file-name-directory localname))
-        (tramp-flush-file-property v localname)
-        (unless (tramp-smb-get-share v)
-          (tramp-error
-           v 'file-error "Target `%s' must contain a share name" newname))
-        (tramp-message v 0 "Copying file %s to file %s..." filename newname)
-        (if (tramp-smb-send-command
-             v (format "put \"%s\" \"%s\""
-                       filename (tramp-smb-get-localname v)))
-            (tramp-message
-             v 0 "Copying file %s to file %s...done" filename newname)
-          (tramp-error v 'file-error "Cannot copy `%s'" filename)))))
+          ;; We must also flush the cache of the directory, because
+          ;; `file-attributes' reads the values from there.
+          (tramp-flush-file-property v (file-name-directory localname))
+          (tramp-flush-file-property v localname)
+          (unless (tramp-smb-get-share v)
+            (tramp-error
+             v 'file-error "Target `%s' must contain a share name" newname))
+          (unless (tramp-smb-send-command
+                   v (format "put \"%s\" \"%s\""
+                             filename (tramp-smb-get-localname v)))
+            (tramp-error v 'file-error "Cannot copy `%s'" filename))))))
 
   ;; KEEP-DATE handling.
   (when keep-date (set-file-times newname (nth 5 (file-attributes filename)))))
@@ -605,15 +605,15 @@ PRESERVE-UID-GID is completely ignored."
        v 'file-error
        "Cannot make local copy of non-existing file `%s'" filename))
     (let ((tmpfile (tramp-compat-make-temp-file filename)))
-      (tramp-message v 4 "Fetching %s to tmp file %s..." filename tmpfile)
-      (if (tramp-smb-send-command
-           v (format "get \"%s\" \"%s\"" (tramp-smb-get-localname v) tmpfile))
-          (tramp-message
-           v 4 "Fetching %s to tmp file %s...done" filename tmpfile)
-        ;; Oops, an error.  We shall cleanup.
-        (tramp-compat-delete-file tmpfile 'force)
-        (tramp-error
-         v 'file-error "Cannot make local copy of file `%s'" filename))
+      (with-progress-reporter
+          v 3 (format "Fetching %s to tmp file %s" filename tmpfile)
+        (unless (tramp-smb-send-command
+                 v (format "get \"%s\" \"%s\""
+                           (tramp-smb-get-localname v) tmpfile))
+          ;; Oops, an error.  We shall cleanup.
+          (tramp-compat-delete-file tmpfile 'force)
+          (tramp-error
+           v 'file-error "Cannot make local copy of file `%s'" filename)))
       tmpfile)))
 
 ;; This function should return "foo/" for directories and "bar" for
@@ -850,38 +850,39 @@ target of the symlink differ."
   "Like `rename-file' for Tramp files."
   (setq filename (expand-file-name filename)
         newname (expand-file-name newname))
+  (with-progress-reporter
+      (tramp-dissect-file-name (if (file-remote-p filename) filename newname))
+      0 (format "Renaming %s to %s" filename newname)
+
+    (let ((tmpfile (file-local-copy filename)))
+
+      (if tmpfile
+          ;; Remote filename.
+          (condition-case err
+              (rename-file tmpfile newname ok-if-already-exists)
+            ((error quit)
+             (tramp-compat-delete-file tmpfile 'force)
+             (signal (car err) (cdr err))))
+
+        ;; Remote newname.
+        (when (file-directory-p newname)
+          (setq newname (expand-file-name
+                         (file-name-nondirectory filename) newname)))
+
+        (with-parsed-tramp-file-name newname nil
+          (when (and (not ok-if-already-exists)
+                     (file-exists-p newname))
+            (tramp-error v 'file-already-exists newname))
+          ;; We must also flush the cache of the directory, because
+          ;; `file-attributes' reads the values from there.
+          (tramp-flush-file-property v (file-name-directory localname))
+          (tramp-flush-file-property v localname)
+          (unless (tramp-smb-send-command
+                   v (format "put %s \"%s\""
+                             filename (tramp-smb-get-localname v)))
+            (tramp-error v 'file-error "Cannot rename `%s'" filename)))))
 
-  (let ((tmpfile (file-local-copy filename)))
-
-    (if tmpfile
-        ;; Remote filename.
-        (condition-case err
-            (rename-file tmpfile newname ok-if-already-exists)
-          ((error quit)
-           (tramp-compat-delete-file tmpfile 'force)
-           (signal (car err) (cdr err))))
-
-      ;; Remote newname.
-      (when (file-directory-p newname)
-        (setq newname (expand-file-name
-                      (file-name-nondirectory filename) newname)))
-
-      (with-parsed-tramp-file-name newname nil
-        (when (and (not ok-if-already-exists)
-                   (file-exists-p newname))
-          (tramp-error v 'file-already-exists newname))
-        ;; We must also flush the cache of the directory, because
-        ;; `file-attributes' reads the values from there.
-        (tramp-flush-file-property v (file-name-directory localname))
-        (tramp-flush-file-property v localname)
-        (tramp-message v 0 "Copying file %s to file %s..." filename newname)
-        (if (tramp-smb-send-command
-             v (format "put %s \"%s\"" filename (tramp-smb-get-localname v)))
-            (tramp-message
-             v 0 "Copying file %s to file %s...done" filename newname)
-          (tramp-error v 'file-error "Cannot rename `%s'" filename)))))
-
-  (tramp-compat-delete-file filename 'force))
+    (tramp-compat-delete-file filename 'force)))
 
 (defun tramp-smb-handle-set-file-modes (filename mode)
   "Like `set-file-modes' for Tramp files."
@@ -938,14 +939,14 @@ errors for shares like \"C$/\", which are common in Microsoft Windows."
            (list start end tmpfile append 'no-message lockname confirm)
          (list start end tmpfile append 'no-message lockname)))
 
-      (tramp-message v 5 "Writing tmp file %s to file %s..." tmpfile filename)
-      (unwind-protect
-          (if (tramp-smb-send-command
-               v (format "put %s \"%s\"" tmpfile (tramp-smb-get-localname v)))
-              (tramp-message
-               v 5 "Writing tmp file %s to file %s...done" tmpfile filename)
-            (tramp-error v 'file-error "Cannot write `%s'" filename))
-        (tramp-compat-delete-file tmpfile 'force))
+      (with-progress-reporter
+          v 3 (format "Moving tmp file %s to %s" tmpfile filename)
+        (unwind-protect
+            (unless (tramp-smb-send-command
+                     v (format "put %s \"%s\""
+                               tmpfile (tramp-smb-get-localname v)))
+              (tramp-error v 'file-error "Cannot write `%s'" filename))
+          (tramp-compat-delete-file tmpfile 'force)))
 
       (unless (equal curbuf (current-buffer))
         (tramp-error
@@ -1302,60 +1303,57 @@ connection if a previous connection has died for some reason."
             (setq args (append args (list "-s" tramp-smb-conf))))
 
           ;; OK, let's go.
-          (tramp-message
-           vec 3 "Opening connection for //%s%s/%s..."
-           (if (not (zerop (length user))) (concat user "@") "")
-           host (or share ""))
-
-          (let* ((coding-system-for-read nil)
-                 (process-connection-type tramp-process-connection-type)
-                 (p (let ((default-directory
-                            (tramp-compat-temporary-file-directory)))
-                      (apply #'start-process
-                             (tramp-buffer-name vec) (tramp-get-buffer vec)
-                             tramp-smb-program args))))
-
-            (tramp-message
-             vec 6 "%s" (mapconcat 'identity (process-command p) " "))
-            (tramp-set-process-query-on-exit-flag p nil)
-
-            ;; Set variables for computing the prompt for reading password.
-            (setq tramp-current-method tramp-smb-method
-                  tramp-current-user user
-                  tramp-current-host host)
-
-            ;; Play login scenario.
-            (tramp-process-actions
-             p vec
-             (if share
-                 tramp-smb-actions-with-share
-               tramp-smb-actions-without-share))
-
-            ;; Check server version.
-            (with-current-buffer (tramp-get-connection-buffer vec)
-              (goto-char (point-min))
-              (search-forward-regexp
-               "Domain=\\[[^]]*\\] OS=\\[[^]]*\\] Server=\\[[^]]*\\]" nil t)
-              (let ((smbserver-version (match-string 0)))
-                (unless
-                    (string-equal
-                     smbserver-version
-                     (tramp-get-connection-property
-                      vec "smbserver-version" smbserver-version))
-                  (tramp-flush-directory-property vec "")
-                  (tramp-flush-connection-property vec))
-                (tramp-set-connection-property
-                 vec "smbserver-version" smbserver-version)))
-
-            ;; Set chunksize.  Otherwise, `tramp-send-string' might
-            ;; try it itself.
-            (tramp-set-connection-property p "smb-share" share)
-            (tramp-set-connection-property p "chunksize" tramp-chunksize)
-
-            (tramp-message
-             vec 3 "Opening connection for //%s%s/%s...done"
-             (if (not (zerop (length user))) (concat user "@") "")
-             host (or share ""))))))))
+          (with-progress-reporter
+              vec 3
+              (format "Opening connection for //%s%s/%s"
+                      (if (not (zerop (length user))) (concat user "@") "")
+                      host (or share ""))
+
+            (let* ((coding-system-for-read nil)
+                   (process-connection-type tramp-process-connection-type)
+                   (p (let ((default-directory
+                              (tramp-compat-temporary-file-directory)))
+                        (apply #'start-process
+                               (tramp-buffer-name vec) (tramp-get-buffer vec)
+                               tramp-smb-program args))))
+
+              (tramp-message
+               vec 6 "%s" (mapconcat 'identity (process-command p) " "))
+              (tramp-set-process-query-on-exit-flag p nil)
+
+              ;; Set variables for computing the prompt for reading password.
+              (setq tramp-current-method tramp-smb-method
+                    tramp-current-user user
+                    tramp-current-host host)
+
+              ;; Play login scenario.
+              (tramp-process-actions
+               p vec
+               (if share
+                   tramp-smb-actions-with-share
+                 tramp-smb-actions-without-share))
+
+              ;; Check server version.
+              (with-current-buffer (tramp-get-connection-buffer vec)
+                (goto-char (point-min))
+                (search-forward-regexp
+                 "Domain=\\[[^]]*\\] OS=\\[[^]]*\\] Server=\\[[^]]*\\]" nil t)
+                (let ((smbserver-version (match-string 0)))
+                  (unless
+                      (string-equal
+                       smbserver-version
+                       (tramp-get-connection-property
+                        vec "smbserver-version" smbserver-version))
+                    (tramp-flush-directory-property vec "")
+                    (tramp-flush-connection-property vec))
+                  (tramp-set-connection-property
+                   vec "smbserver-version" smbserver-version)))
+
+              ;; Set chunksize.  Otherwise, `tramp-send-string' might
+              ;; try it itself.
+              (tramp-set-connection-property p "smb-share" share)
+              (tramp-set-connection-property
+               p "chunksize" tramp-chunksize))))))))
 
 ;; We don't use timeouts.  If needed, the caller shall wrap around.
 (defun tramp-smb-wait-for-output (vec)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2da11bda834..c5addae8e5d 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2271,14 +2271,18 @@ FILE must be a local file name on a connection identified via VEC."
      (tramp-message ,vec ,level "%s..." ,message)
      ;; We start a pulsing progress reporter after 3 seconds.  Feature
      ;; introduced in Emacs 24.1.
-     (when (<= ,level tramp-verbose)
+     (when (and tramp-message-show-message
+                ;; Display only when there is a minimum level.
+                (<= ,level (min tramp-verbose 3)))
        (condition-case nil
            (setq pr (tramp-compat-funcall 'make-progress-reporter ,message)
                  tm (if pr (run-at-time 3 0.1 'progress-reporter-update pr)))
          (error nil)))
      (unwind-protect
          ;; Execute the body.
-         (progn ,@body)
+         (let ((tramp-message-show-message
+                (and tramp-message-show-message (not tm))))
+           ,@body)
        ;; Stop progress reporter.
        (if tm (tramp-compat-funcall 'cancel-timer tm))
        (tramp-message ,vec ,level "%s...done" ,message))))
@@ -2558,13 +2562,13 @@ target of the symlink differ."
         (tramp-error v 'file-error "Cannot load nonexistent file `%s'" file)))
     (if (not (file-exists-p file))
         nil
-      (unless nomessage (tramp-message v 0 "Loading %s..." file))
-      (let ((local-copy (file-local-copy file)))
-        ;; MUST-SUFFIX doesn't exist on XEmacs, so let it default to nil.
-        (unwind-protect
-            (load local-copy noerror t t)
-          (tramp-compat-delete-file local-copy 'force)))
-      (unless nomessage (tramp-message v 0 "Loading %s...done" file))
+      (let ((tramp-message-show-message (not nomessage)))
+        (with-progress-reporter v 0 (format "Loading %s" file)
+          (let ((local-copy (file-local-copy file)))
+            ;; MUST-SUFFIX doesn't exist on XEmacs, so let it default to nil.
+            (unwind-protect
+                (load local-copy noerror t t)
+              (tramp-compat-delete-file local-copy 'force)))))
       t)))
 
 ;; Localname manipulation functions that grok Tramp localnames...
@@ -4153,7 +4157,7 @@ This is like `dired-recursive-delete-directory' for Tramp files."
                nil)
               ((and suffix (nth 2 suffix))
                ;; We found an uncompression rule.
-               (with-progress-reporter v 0 (format "Uncompressing %s..." file)
+               (with-progress-reporter v 0 (format "Uncompressing %s" file)
                  (when (zerop
                         (tramp-send-command-and-check
                          v (concat (nth 2 suffix) " "
@@ -4165,7 +4169,7 @@ This is like `dired-recursive-delete-directory' for Tramp files."
               (t
                ;; We don't recognize the file as compressed, so compress it.
                ;; Try gzip.
-               (with-progress-reporter v 0 (format "Compressing %s..." file)
+               (with-progress-reporter v 0 (format "Compressing %s" file)
                  (when (zerop
                         (tramp-send-command-and-check
                          v (concat "gzip -f "
@@ -4747,11 +4751,11 @@ Lisp error raised when PROGRAM is nil is trapped also, returning 1."
            ;; Use inline encoding for file transfer.
            (rem-enc
             (save-excursion
-              (tramp-message v 5 "Encoding remote file %s..." filename)
-              (tramp-barf-unless-okay
-               v (format rem-enc (tramp-shell-quote-argument localname))
-               "Encoding remote file failed")
-              (tramp-message v 5 "Encoding remote file %s...done" filename)
+              (with-progress-reporter
+               v 5 (format "Encoding remote file %s" filename)
+               (tramp-barf-unless-okay
+                v (format rem-enc (tramp-shell-quote-argument localname))
+                "Encoding remote file failed"))
 
               (if (functionp loc-dec)
                   ;; If local decoding is a function, we call it.  We
@@ -4761,15 +4765,15 @@ Lisp error raised when PROGRAM is nil is trapped also, returning 1."
                   (with-temp-buffer
                     (set-buffer-multibyte nil)
                     (insert-buffer-substring (tramp-get-buffer v))
-                    (tramp-message
-                     v 5 "Decoding remote file %s with function %s..."
-                     filename loc-dec)
-                    (funcall loc-dec (point-min) (point-max))
-                    ;; Unset `file-name-handler-alist'.  Otherwise,
-                    ;; epa-file gets confused.
-                    (let (file-name-handler-alist
-                          (coding-system-for-write 'binary))
-                      (write-region (point-min) (point-max) tmpfile)))
+                    (with-progress-reporter
+                        v 3 (format "Decoding remote file %s with function %s"
+                                    filename loc-dec)
+                      (funcall loc-dec (point-min) (point-max))
+                      ;; Unset `file-name-handler-alist'.  Otherwise,
+                      ;; epa-file gets confused.
+                      (let (file-name-handler-alist
+                            (coding-system-for-write 'binary))
+                        (write-region (point-min) (point-max) tmpfile))))
 
                 ;; If tramp-decoding-function is not defined for this
                 ;; method, we invoke tramp-decoding-command instead.
@@ -4779,14 +4783,14 @@ Lisp error raised when PROGRAM is nil is trapped also, returning 1."
                   (let (file-name-handler-alist
                         (coding-system-for-write 'binary))
                     (write-region (point-min) (point-max) tmpfile2))
-                  (tramp-message
-                   v 5 "Decoding remote file %s with command %s..."
-                   filename loc-dec)
-                  (unwind-protect
-                      (tramp-call-local-coding-command loc-dec tmpfile2 tmpfile)
-                    (tramp-compat-delete-file tmpfile2 'force))))
+                  (with-progress-reporter
+                      v 3 (format "Decoding remote file %s with command %s"
+                                  filename loc-dec)
+                    (unwind-protect
+                        (tramp-call-local-coding-command
+                         loc-dec tmpfile2 tmpfile)
+                      (tramp-compat-delete-file tmpfile2 'force)))))
 
-              (tramp-message v 5 "Decoding remote file %s...done" filename)
               ;; Set proper permissions.
               (set-file-modes tmpfile (tramp-default-file-modes filename))
               ;; Set local user ownership.
@@ -4842,7 +4846,7 @@ coding system might not be determined.  This function repairs it."
   "Like `insert-file-contents' for Tramp files."
   (barf-if-buffer-read-only)
   (setq filename (expand-file-name filename))
-  (let (coding-system-used result local-copy remote-copy)
+  (let (result local-copy remote-copy)
     (with-parsed-tramp-file-name filename nil
       (unwind-protect
           (if (not (file-exists-p filename))
@@ -4913,27 +4917,16 @@ coding system might not be determined.  This function repairs it."
                 (setq tramp-temp-buffer-file-name local-copy)
                 (put 'tramp-temp-buffer-file-name 'permanent-local t))
 
-              (tramp-message
-               v 4 "Inserting local temp file `%s'..." local-copy)
-
-              ;; We must ensure that `file-coding-system-alist'
-              ;; matches `local-copy'.
-              (let ((file-coding-system-alist
-                     (tramp-find-file-name-coding-system-alist
-                      filename local-copy)))
-                (setq result
-                      (insert-file-contents
-                       local-copy nil nil nil replace))
-                ;; Now `last-coding-system-used' has right value.
-                ;; Remember it.
-                (when (boundp 'last-coding-system-used)
-                  (setq coding-system-used
-                        (symbol-value 'last-coding-system-used))))
-
-              (tramp-message
-               v 4 "Inserting local temp file `%s'...done" local-copy)
-              (when (boundp 'last-coding-system-used)
-                (set 'last-coding-system-used coding-system-used))))
+              (with-progress-reporter
+                  v 3 (format "Inserting local temp file `%s'" local-copy)
+                ;; We must ensure that `file-coding-system-alist'
+                ;; matches `local-copy'.
+                (let ((file-coding-system-alist
+                       (tramp-find-file-name-coding-system-alist
+                        filename local-copy)))
+                  (setq result
+                        (insert-file-contents
+                         local-copy nil nil nil replace))))))
 
         ;; Save exit.
         (progn
@@ -5193,15 +5186,14 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
              ;; Use inline file transfer.
              (rem-dec
               ;; Encode tmpfile.
-              (tramp-message v 5 "Encoding region...")
               (unwind-protect
                   (with-temp-buffer
                     (set-buffer-multibyte nil)
                     ;; Use encoding function or command.
                     (if (functionp loc-enc)
-                        (progn
-                          (tramp-message
-                           v 5 "Encoding region using function `%s'..." loc-enc)
+                        (with-progress-reporter
+                            v 3 (format "Encoding region using function `%s'"
+                                        loc-enc)
                           (let ((coding-system-for-read 'binary))
                             (insert-file-contents-literally tmpfile))
                           ;; The following `let' is a workaround for the
@@ -5217,59 +5209,61 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
                                   (tramp-compat-temporary-file-directory)))
                             (funcall loc-enc (point-min) (point-max))))
 
-                      (tramp-message
-                       v 5 "Encoding region using command `%s'..." loc-enc)
-                      (unless (zerop (tramp-call-local-coding-command
-                                      loc-enc tmpfile t))
-                        (tramp-error
-                         v 'file-error
-                         "Cannot write to `%s', local encoding command `%s' failed"
-                         filename loc-enc)))
+                      (with-progress-reporter
+                          v 3 (format "Encoding region using command `%s'"
+                                      loc-enc)
+                        (unless (zerop (tramp-call-local-coding-command
+                                        loc-enc tmpfile t))
+                          (tramp-error
+                           v 'file-error
+                           (concat "Cannot write to `%s', "
+                                   "local encoding command `%s' failed")
+                           filename loc-enc))))
 
                     ;; Send buffer into remote decoding command which
                     ;; writes to remote file.  Because this happens on
                     ;; the remote host, we cannot use the function.
-                    (goto-char (point-max))
-                    (unless (bolp) (newline))
-                    (tramp-message
-                     v 5 "Decoding region into remote file %s..." filename)
-                    (tramp-send-command
-                     v
-                     (format
-                      (concat rem-dec " <<'EOF'\n%sEOF")
-                      (tramp-shell-quote-argument localname)
-                      (buffer-string)))
-                    (tramp-barf-unless-okay
-                     v nil
-                     "Couldn't write region to `%s', decode using `%s' failed"
-                     filename rem-dec)
-                    ;; When `file-precious-flag' is set, the region is
-                    ;; written to a temporary file.  Check that the
-                    ;; checksum is equal to that from the local tmpfile.
-                    (when file-precious-flag
-                      (erase-buffer)
-                      (and
-                       ;; cksum runs locally, if possible.
-                       (zerop (tramp-local-call-process "cksum" tmpfile t))
-                       ;; cksum runs remotely.
-                       (zerop
-                        (tramp-send-command-and-check
-                         v
-                         (format
-                          "cksum <%s" (tramp-shell-quote-argument localname))))
-                       ;; ... they are different.
-                       (not
-                        (string-equal
-                         (buffer-string)
-                         (with-current-buffer (tramp-get-buffer v)
-                           (buffer-string))))
-                       (tramp-error
-                        v 'file-error
-                        (concat "Couldn't write region to `%s',"
-                                " decode using `%s' failed")
-                        filename rem-dec)))
-                    (tramp-message
-                     v 5 "Decoding region into remote file %s...done" filename))
+                    (with-progress-reporter
+                        v 3
+                        (format "Decoding region into remote file %s" filename)
+                      (goto-char (point-max))
+                      (unless (bolp) (newline))
+                      (tramp-send-command
+                       v
+                       (format
+                        (concat rem-dec " <<'EOF'\n%sEOF")
+                        (tramp-shell-quote-argument localname)
+                        (buffer-string)))
+                      (tramp-barf-unless-okay
+                       v nil
+                       "Couldn't write region to `%s', decode using `%s' failed"
+                       filename rem-dec)
+                      ;; When `file-precious-flag' is set, the region is
+                      ;; written to a temporary file.  Check that the
+                      ;; checksum is equal to that from the local tmpfile.
+                      (when file-precious-flag
+                        (erase-buffer)
+                        (and
+                         ;; cksum runs locally, if possible.
+                         (zerop (tramp-local-call-process "cksum" tmpfile t))
+                         ;; cksum runs remotely.
+                         (zerop
+                          (tramp-send-command-and-check
+                           v
+                           (format
+                            "cksum <%s"
+                            (tramp-shell-quote-argument localname))))
+                         ;; ... they are different.
+                         (not
+                          (string-equal
+                           (buffer-string)
+                           (with-current-buffer (tramp-get-buffer v)
+                             (buffer-string))))
+                         (tramp-error
+                          v 'file-error
+                          (concat "Couldn't write region to `%s',"
+                                  " decode using `%s' failed")
+                          filename rem-dec)))))
 
                 ;; Save exit.
                 (tramp-compat-delete-file tmpfile 'force)))
@@ -6286,14 +6280,13 @@ Only send the definition if it has not already been done."
   (let* ((p (tramp-get-connection-process vec))
          (scripts (tramp-get-connection-property p "scripts" nil)))
     (unless (member name scripts)
-      (tramp-message vec 5 "Sending script `%s'..." name)
-      ;; The script could contain a call of Perl.  This is masked with `%s'.
-      (tramp-send-command-and-check
-       vec
-       (format "%s () {\n%s\n}" name
-               (format script (tramp-get-remote-perl vec))))
-      (tramp-set-connection-property p "scripts" (cons name scripts))
-      (tramp-message vec 5 "Sending script `%s'...done." name))))
+      (with-progress-reporter vec 5 (format "Sending script `%s'" name)
+        ;; The script could contain a call of Perl.  This is masked with `%s'.
+        (tramp-send-command-and-check
+         vec
+         (format "%s () {\n%s\n}" name
+                 (format script (tramp-get-remote-perl vec))))
+        (tramp-set-connection-property p "scripts" (cons name scripts))))))
 
 (defun tramp-set-auto-save ()
   (when (and ;; ange-ftp has its own auto-save mechanism
@@ -6572,7 +6565,7 @@ file exists and nonzero exit status otherwise."
                 (setq extra-args (cdr item))))
             (when extra-args (setq shell (concat shell " " extra-args))))
           (tramp-message
-           vec 5 "Starting remote shell `%s' for tilde expansion..." shell)
+           vec 5 "Starting remote shell `%s' for tilde expansion" shell)
           (let ((tramp-end-of-output tramp-initial-end-of-output))
             (tramp-send-command
              vec
@@ -6580,13 +6573,12 @@ file exists and nonzero exit status otherwise."
                      (shell-quote-argument tramp-end-of-output) shell)
              t))
           ;; Setting prompts.
-          (tramp-message vec 5 "Setting remote shell prompt...")
-          (tramp-send-command
-           vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
-          (tramp-send-command vec "PS2=''" t)
-          (tramp-send-command vec "PS3=''" t)
-          (tramp-send-command vec "PROMPT_COMMAND=''" t)
-          (tramp-message vec 5 "Setting remote shell prompt...done"))
+          (with-progress-reporter vec 5 (format "Setting remote shell prompt")
+            (tramp-send-command
+             vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
+            (tramp-send-command vec "PS2=''" t)
+            (tramp-send-command vec "PS3=''" t)
+            (tramp-send-command vec "PROMPT_COMMAND=''" t)))
 
          (t (tramp-message
              vec 5 "Remote `%s' groks tilde expansion, good"
@@ -7423,11 +7415,11 @@ connection if a previous connection has died for some reason."
         (tramp-get-buffer vec)
         (if (zerop (length (tramp-file-name-user vec)))
             (tramp-message
-             vec 3 "Opening connection for %s using %s..."
+             vec 3 "Opening connection for %s using %s"
              (tramp-file-name-host vec)
              (tramp-file-name-method vec))
           (tramp-message
-           vec 3 "Opening connection for %s@%s using %s..."
+           vec 3 "Opening connection for %s@%s using %s"
            (tramp-file-name-user vec)
            (tramp-file-name-host vec)
            (tramp-file-name-method vec)))
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 56fc8032541..10267a6b2dc 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1501,6 +1501,11 @@ defun."
   (interactive "p")
   (or arg (setq arg 1))
 
+  (or (not (eq this-command 'c-beginning-of-defun))
+      (eq last-command 'c-beginning-of-defun)
+      (and transient-mark-mode mark-active)
+      (push-mark))
+
   (c-save-buffer-state
       (beginning-of-defun-function end-of-defun-function
        (start (point))
@@ -1604,6 +1609,11 @@ the open-parenthesis that starts a defun; see `beginning-of-defun'."
   (interactive "p")
   (or arg (setq arg 1))
 
+  (or (not (eq this-command 'c-end-of-defun))
+      (eq last-command 'c-end-of-defun)
+      (and transient-mark-mode mark-active)
+      (push-mark))
+
   (c-save-buffer-state
       (beginning-of-defun-function end-of-defun-function
        (start (point))
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 610fa14489a..eca6d5fbe7b 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1480,7 +1480,7 @@ frequently editing existing scripts with different styles.")
 ;; mode-command and utility functions
 
 ;;;###autoload
-(defun sh-mode ()
+(define-derived-mode sh-mode prog-mode "Shell-script"
   "Major mode for editing shell scripts.
 This mode works for many shells, since they all have roughly the same syntax,
 as far as commands, arguments, variables, pipes, comments etc. are concerned.
@@ -1533,11 +1533,6 @@ indicate what shell it is use `sh-alias-alist' to translate.
 
 If your shell gives error messages with line numbers, you can use \\[executable-interpret]
 with your script for an edit-interpret-debug cycle."
-  (interactive)
-  (kill-all-local-variables)
-  (setq major-mode 'sh-mode
-        mode-name "Shell-script")
-  (use-local-map sh-mode-map)
   (make-local-variable 'skeleton-end-hook)
   (make-local-variable 'paragraph-start)
   (make-local-variable 'paragraph-separate)
@@ -1613,8 +1608,7 @@ with your script for an edit-interpret-debug cycle."
           "sh")
          (t
           sh-shell-file))
-   nil nil)
-  (run-mode-hooks 'sh-mode-hook))
+   nil nil))
 
 ;;;###autoload
 (defalias 'shell-script-mode 'sh-mode)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index c88b32f64cc..94eb721e4cf 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2630,11 +2630,22 @@ Keeps argument list for future ispell invocations for no async support."
              (or ispell-local-dictionary ispell-dictionary "default"))
     (sit-for 0)
     (setq ispell-library-directory (ispell-check-version)
-          ispell-process-directory default-directory
           ispell-process (ispell-start-process)
           ispell-filter nil
-          ispell-filter-continue nil
-          ispell-process-buffer-name (buffer-name))
+          ispell-filter-continue nil)
+    ;; When spellchecking minibuffer contents, make sure ispell process
+    ;; is not restarted every time the minibuffer is killed.
+    (if (window-minibuffer-p)
+        (if (fboundp 'minibuffer-selected-window)
+            ;; Assign ispell process to parent buffer
+            (setq ispell-process-directory default-directory
+                  ispell-process-buffer-name (window-buffer (minibuffer-selected-window)))
+          ;; Force `ispell-process-directory' to $HOME and use a dummy name
+          (setq ispell-process-directory (expand-file-name "~/")
+                ispell-process-buffer-name " * Minibuffer-has-spellcheck-enabled"))
+      ;; Not in a minibuffer
+      (setq ispell-process-directory default-directory
+            ispell-process-buffer-name (buffer-name)))
     (if ispell-async-processp
         (set-process-filter ispell-process 'ispell-filter))
     ;; protect against bogus binding of `enable-multibyte-characters' in XEmacs
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index b9d52acdeba..6cd4121bd10 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -101,6 +101,11 @@ This takes effect when first loading the `sgml-mode' library.")
     (define-key map "\C-c\^?" 'sgml-delete-tag)
     (define-key map "\C-c?" 'sgml-tag-help)
     (define-key map "\C-c/" 'sgml-close-tag)
+
+    ;; Redundant keybindings, for consistency with TeX mode.
+    (define-key map "\C-c\C-o" 'sgml-tag)
+    (define-key map "\C-c\C-e" 'sgml-close-tag)
+
     (define-key map "\C-c8" 'sgml-name-8bit-mode)
     (define-key map "\C-c\C-v" 'sgml-validate)
     (when sgml-quick-keys
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 5fc92a92d37..da0c5396f2c 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -808,6 +808,11 @@ END is the position of the first delimiter after \verb."
     (define-key map "\C-c\C-c" 'tex-compile)
     (define-key map "\C-c\C-i" 'tex-bibtex-file)
     (define-key map "\C-c\C-o" 'latex-insert-block)
+
+    ;; Redundant keybindings, for consistency with SGML mode.
+    (define-key map "\C-c\C-t" 'latex-insert-block)
+    (define-key map "\C-c/" 'latex-close-block)
+
     (define-key map "\C-c\C-e" 'latex-close-block)
     (define-key map "\C-c\C-u" 'tex-goto-last-unclosed-latex-block)
     (define-key map "\C-c\C-m" 'tex-feed-input)