upstream

7 files changed, 99 insertions, 43 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68a85a43387..abae693d0c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,32 @@
+2011-10-15  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/ert.el (ert--explain-equal-rec, ert-select-tests):
+        Doc fixes.
+
+2011-10-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * net/network-stream.el (network-stream-open-starttls): Improve
+        detection of failure due to lack of TLS support.
+
+        * mail/sendmail.el (sendmail-query-once): Tweak prompt message,
+        putting the input text in front and in bold.
+
+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/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index b2e20843856..2afe42dc070 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -577,8 +577,7 @@ failed."
     (t x)))
 
 (defun ert--explain-equal-rec (a b)
-  "Returns a programmer-readable explanation of why A and B are not `equal'.
-
+  "Return a programmer-readable explanation of why A and B are not `equal'.
 Returns nil if they are."
   (if (not (equal (type-of a) (type-of b)))
       `(different-types ,a ,b)
@@ -1020,36 +1019,36 @@ t -- Always matches.
   (ert-test-result-type-p result (ert-test-expected-result-type test)))
 
 (defun ert-select-tests (selector universe)
-  "Return the tests that match SELECTOR.
-
-UNIVERSE specifies the set of tests to select from; it should be
-a list of tests, or t, which refers to all tests named by symbols
-in `obarray'.
+  "Return a list of tests that match SELECTOR.
 
-Returns the set of tests as a list.
+UNIVERSE specifies the set of tests to select from; it should be a list
+of tests, or t, which refers to all tests named by symbols in `obarray'.
 
-Valid selectors:
+Valid SELECTORs:
 
-nil -- Selects the empty set.
-t -- Selects UNIVERSE.
+nil  -- Selects the empty set.
+t    -- Selects UNIVERSE.
 :new -- Selects all tests that have not been run yet.
-:failed, :passed -- Select tests according to their most recent result.
+:failed, :passed       -- Select tests according to their most recent result.
 :expected, :unexpected -- Select tests according to their most recent result.
-a string -- Selects all tests that have a name that matches the string,
-            a regexp.
-a test -- Selects that test.
+a string -- A regular expression selecting all tests with matching names.
+a test   -- (i.e., an object of the ert-test data-type) Selects that test.
 a symbol -- Selects the test that the symbol names, errors if none.
-\(member TESTS...\) -- Selects TESTS, a list of tests or symbols naming tests.
+\(member TESTS...) -- Selects the elements of TESTS, a list of tests
+    or symbols naming tests.
 \(eql TEST\) -- Selects TEST, a test or a symbol naming a test.
-\(and SELECTORS...\) -- Selects the tests that match all SELECTORS.
-\(or SELECTORS...\) -- Selects the tests that match any SELECTOR.
-\(not SELECTOR\) -- Selects all tests that do not match SELECTOR.
+\(and SELECTORS...) -- Selects the tests that match all SELECTORS.
+\(or SELECTORS...)  -- Selects the tests that match any of the SELECTORS.
+\(not SELECTOR)     -- Selects all tests that do not match SELECTOR.
 \(tag TAG) -- Selects all tests that have TAG on their tags list.
-\(satisfies PREDICATE\) -- Selects all tests that satisfy PREDICATE.
+    A tag is an arbitrary label you can apply when you define a test.
+\(satisfies PREDICATE) -- Selects all tests that satisfy PREDICATE.
+    PREDICATE is a function that takes an ert-test object as argument,
+    and returns non-nil if it is selected.
 
 Only selectors that require a superset of tests, such
 as (satisfies ...), strings, :new, etc. make use of UNIVERSE.
-Selectors that do not, such as \(member ...\), just return the
+Selectors that do not, such as (member ...), just return the
 set implied by them without checking whether it is really
 contained in UNIVERSE."
   ;; This code needs to match the etypecase in
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 4557bf0fb3f..6044392d4e0 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -513,21 +513,40 @@ 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)))))
+                          '(("transport" . sendmail-send-it)))
+                      ("smtp" . 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, but it has not been
+ configured for sending email.  To tell Emacs how to send email:
+
+ - Type `"
+                      (propertize "mail client" 'face 'bold)
+                      "' to start your default email client and
+   pass it the message text.\n\n")
+              (and sendmail-program
+                   (executable-find sendmail-program)
+                   (insert "\
+ - Type `"
+                           (propertize "transport" 'face 'bold)
+                           "' to invoke the system's mail transport agent
+   (the `"
+                           sendmail-program
+                           "' program).\n\n"))
+              (insert "\
+ - Type `"
+                      (propertize "smtp" 'face 'bold)
+                      "' to send mail directly to an \"outgoing mail\" server.
+   (Emacs may prompt you for SMTP settings).
+
+ Emacs will record your selection and will use it thereafter.
+ To change it 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/net/network-stream.el b/lisp/net/network-stream.el
index 0c3d0285f91..e27b4541ab5 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -218,7 +218,7 @@ functionality.
          (resulting-type 'plain)
          (builtin-starttls (and (fboundp 'gnutls-available-p)
                                 (gnutls-available-p)))
-         starttls-command error)
+         starttls-available starttls-command error)
 
     ;; First check whether the server supports STARTTLS at all.
     (when (and capabilities success-string starttls-function)
@@ -227,10 +227,11 @@ functionality.
     ;; If we have built-in STARTTLS support, try to upgrade the
     ;; connection.
     (when (and starttls-command
-               (or builtin-starttls
-                   (and (or require-tls
-                            (plist-get parameters :use-starttls-if-possible))
-                        (starttls-available-p)))
+               (setq starttls-available
+                     (or builtin-starttls
+                         (and (or require-tls
+                                  (plist-get parameters :use-starttls-if-possible))
+                              (starttls-available-p))))
                (not (eq (plist-get parameters :type) 'plain)))
       ;; If using external STARTTLS, drop this connection and start
       ;; anew with `starttls-open-stream'.
@@ -298,9 +299,13 @@ functionality.
                ;; support, or no gnutls-cli installed.
                (eq resulting-type 'plain))
       (setq error
-            (if require-tls
+            (if starttls-available
                 "Server does not support TLS"
-              "Server supports STARTTLS, but Emacs does not have support for it"))
+              (concat "Emacs does not support TLS, and no external `"
+                      (if starttls-use-gnutls
+                          starttls-gnutls-program
+                        starttls-program)
+                      "' program was found")))
       (delete-process stream)
       (setq stream nil))
     ;; Return value:
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