Merge from trunk.

5 files changed, 48 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68a85a43387..7f4462179ec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2011-10-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcmpl-unix.el (pcomplete/ssh): SSH does allow ganging.
+
+        * mpc.el (mpc-songs-jump-to): Don't burp if the user clicks in an
+        empty buffer.
+
+        * mouse.el (mouse-drag-mode-line-1): Modify the end-event we pushed on
+        unread-command-events rather than pushing yet-another event.
+
+2011-10-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/sendmail.el (sendmail-query-once): Improve the wording of
+        the explanation of the possible choices.  Make the options passed
+        to completing-read shorter.
+
 2011-10-13  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
 
         * textmodes/flyspell.el (flyspell-large-region): Make sure
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 4557bf0fb3f..d685b8b3e70 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -513,21 +513,34 @@ This also saves the value of `send-mail-function' via Customize."
   ;; a second time, probably because someone's using an old value
   ;; of send-mail-function.
   (when (eq send-mail-function 'sendmail-query-once)
-    (let* ((options `(("My favorite mail client" . mailclient-send-it)
-                      ("Configuring Emacs's SMTP variables" . smtpmail-send-it)
+    (let* ((options `(("Mail client" . mailclient-send-it)
                       ,@(when (and sendmail-program
                                    (executable-find sendmail-program))
-                          '(("The system's mail transport agent"
-                             . sendmail-send-it)))))
+                          '(("Mail transport agent" . sendmail-send-it)))
+                      ("SMTP server" . smtpmail-send-it)))
            (choice
             ;; Query the user.
             (with-temp-buffer
-              (rename-buffer "*Mail Help*" t)
-              (insert "Emacs has not been set up for sending mail.\n
-It can be told to send mail either via your favorite mail client,
-or via the system's mail transport agent (\"sendmail\"), if any,
-or it can send email on its own by configuring the SMTP parameters.\n
-To change your decision later, customize `send-mail-function'.\n")
+              (rename-buffer "*Emacs Mail Setup Help*" t)
+              (insert "\
+ Emacs is about to send an email message.  However, it was not configured
+ for sending email.  You can instruct Emacs to send email in one of the
+ following ways:
+
+ - Start your default mail client and pass to it the message text.
+   Type \"Mail client\" at the prompt below to select this option.\n\n")
+              (if (and sendmail-program
+                       (executable-find sendmail-program))
+                  (insert "\
+ - Invoke the system's mail transport agent (\"sendmail\").
+   Type \"Mail transport agent\" at the prompt below to select this option.\n\n"))
+              (insert "\
+ - Send mail directly by communicating with your mail server
+   (this requires setting up SMTP parameters).
+   Type \"SMTP server\" at the prompt below to select this option.
+
+ Emacs will record your selection and will use it thereafter.  To change
+ your selection later, customize the option `send-mail-function'.\n")
               (goto-char (point-min))
               (display-buffer (current-buffer))
               (let ((completion-ignore-case t))
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 8a74782250d..ff175288445 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -540,11 +540,13 @@ MODE-LINE-P non-nil means dragging a mode line; nil means a header line."
         ;; be `mouse-1', whereas if this did move the mouse, it should be
         ;; a `drag-mouse-1'.  In any case `on-link' would have been nulled
         ;; above if there had been any significant mouse movement.
-        (when (and on-link (eq 'mouse-1 (car-safe event)))
+        (when (and on-link
+                   (eq 'mouse-1 (car-safe (car unread-command-events))))
           ;; If mouse-2 has never been done by the user, it doesn't
           ;; have the necessary property to be interpreted correctly.
           (put 'mouse-2 'event-kind 'mouse-click)
-          (push (cons 'mouse-2 (cdr event)) unread-command-events))))))
+          (setcar unread-command-events
+                  (cons 'mouse-2 (cdar unread-command-events))))))))
 
 (defun mouse-drag-mode-line (start-event)
   "Change the height of a window by dragging on the mode line."
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 251e1864927..40ccb456400 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1996,12 +1996,14 @@ This is used so that they can be compared with `eq', which is needed for
        (list (get-text-property (point) 'mpc-file)
              posn))))
   (let* ((plbuf (mpc-proc-cmd "playlist"))
-         (re (concat "^\\([0-9]+\\):" (regexp-quote song-file) "$"))
+         (re (if song-file
+                 (concat "^\\([0-9]+\\):" (regexp-quote song-file) "$")))
          (sn (with-current-buffer plbuf
                (goto-char (point-min))
-               (when (re-search-forward re nil t)
+               (when (and re (re-search-forward re nil t))
                  (match-string 1)))))
     (cond
+     ((null re) (posn-set-point posn))
      ((null sn) (error "This song is not in the playlist"))
      ((null (with-current-buffer plbuf (re-search-forward re nil t)))
       ;; song-file only appears once in the playlist: no ambiguity,
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index b466c2cd899..a34458506e2 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -185,7 +185,7 @@ Uses both `pcmpl-ssh-config-file' and `pcmpl-ssh-known-hosts-file'."
 ;;;###autoload
 (defun pcomplete/ssh ()
   "Completion rules for the `ssh' command."
-  (pcomplete-opt "1246AaCfgKkMNnqsTtVvXxYbcDeFiLlmOopRSw" nil t)
+  (pcomplete-opt "1246AaCfgKkMNnqsTtVvXxYbcDeFiLlmOopRSw")
   (pcomplete-here (pcmpl-ssh-hosts)))
 
 ;;;###autoload