Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-653
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-654
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656
   Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-662
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-663
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-664
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-665
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-666
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-670
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-671
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-64
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-65
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-66
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-67
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68
   Update from CVS

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

3 files changed, 79 insertions, 73 deletions

diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 1dbd97f0073..c5a2218e36e 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -596,10 +596,11 @@ for use in `interactive'."
         (not (eq (null browse-url-new-window-flag)
                  (null current-prefix-arg)))))
 
-;; interactive-p needs to be called at a function's top-level, hence
-;; the macro.
+;; called-interactive-p needs to be called at a function's top-level, hence
+;; this macro.  We use that rather than interactive-p because
+;; use in a keyboard macro should not change this behavior.
 (defmacro browse-url-maybe-new-window (arg)
-  `(if (not (interactive-p))
+  `(if (or noninteractive (not (called-interactively-p)))
        ,arg
      browse-url-new-window-flag))
 
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 6d12d5e6364..bcdd1d195bf 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -462,73 +462,73 @@ attribute name ATTR."
   "Display the record list RECORDS in a formatted buffer.
 If RAW-ATTR-NAMES is non-nil, the raw attribute names are displayed
 otherwise they are formatted according to `eudc-user-attribute-names-alist'."
-  (let ((buffer (get-buffer-create "*Directory Query Results*"))
-        inhibit-read-only
+  (let (inhibit-read-only
         precords
         (width 0)
         beg
         first-record
         attribute-name)
-    (switch-to-buffer buffer)
-    (setq buffer-read-only t)
-    (setq inhibit-read-only t)
-    (erase-buffer)
-    (insert "Directory Query Result\n")
-    (insert "======================\n\n\n")
-    (if (null records)
-        (insert "No match found.\n"
-                (if eudc-strict-return-matches
-                    "Try setting `eudc-strict-return-matches' to nil or change `eudc-default-return-attributes'.\n"
-                  ""))
-      ;; Replace field names with user names, compute max width
-      (setq precords
-            (mapcar
-             (function
-              (lambda (record)
+    (with-output-to-temp-buffer "*Directory Query Results*"
+      (with-current-buffer standard-output
+        (setq buffer-read-only t)
+        (setq inhibit-read-only t)
+        (erase-buffer)
+        (insert "Directory Query Result\n")
+        (insert "======================\n\n\n")
+        (if (null records)
+            (insert "No match found.\n"
+                    (if eudc-strict-return-matches
+                        "Try setting `eudc-strict-return-matches' to nil or change `eudc-default-return-attributes'.\n"
+                      ""))
+          ;; Replace field names with user names, compute max width
+          (setq precords
                 (mapcar
                  (function
-                  (lambda (field)
-                    (setq attribute-name
-                          (if raw-attr-names
-                              (symbol-name (car field))
-                            (eudc-format-attribute-name-for-display (car field))))
-                    (if (> (length attribute-name) width)
-                        (setq width (length attribute-name)))
-                    (cons attribute-name (cdr field))))
-                 record)))
-             records))
-      ;; Display the records
-      (setq first-record (point))
-      (mapcar
-       (function
-        (lambda (record)
-          (setq beg (point))
-          ;; Map over the record fields to print the attribute/value pairs
-          (mapcar (function
-                   (lambda (field)
-                     (eudc-print-record-field field width)))
-                  record)
-          ;; Store the record internal format in some convenient place
-          (overlay-put (make-overlay beg (point))
-                       'eudc-record
-                       (car records))
-          (setq records (cdr records))
-          (insert "\n")))
-       precords))
-    (insert "\n")
-    (widget-create 'push-button
-                   :notify (lambda (&rest ignore)
-                             (eudc-query-form))
-                   "New query")
-    (widget-insert " ")
-    (widget-create 'push-button
-                   :notify (lambda (&rest ignore)
-                             (kill-this-buffer))
-                   "Quit")
-    (eudc-mode)
-    (widget-setup)
-    (if first-record
-        (goto-char first-record))))
+                  (lambda (record)
+                    (mapcar
+                     (function
+                      (lambda (field)
+                        (setq attribute-name
+                              (if raw-attr-names
+                                  (symbol-name (car field))
+                                (eudc-format-attribute-name-for-display (car field))))
+                        (if (> (length attribute-name) width)
+                            (setq width (length attribute-name)))
+                        (cons attribute-name (cdr field))))
+                     record)))
+                 records))
+          ;; Display the records
+          (setq first-record (point))
+          (mapcar
+           (function
+            (lambda (record)
+              (setq beg (point))
+              ;; Map over the record fields to print the attribute/value pairs
+              (mapcar (function
+                       (lambda (field)
+                         (eudc-print-record-field field width)))
+                      record)
+              ;; Store the record internal format in some convenient place
+              (overlay-put (make-overlay beg (point))
+                           'eudc-record
+                           (car records))
+              (setq records (cdr records))
+              (insert "\n")))
+           precords))
+        (insert "\n")
+        (widget-create 'push-button
+                       :notify (lambda (&rest ignore)
+                                 (eudc-query-form))
+                       "New query")
+        (widget-insert " ")
+        (widget-create 'push-button
+                       :notify (lambda (&rest ignore)
+                                 (kill-this-buffer))
+                       "Quit")
+        (eudc-mode)
+        (widget-setup)
+        (if first-record
+            (goto-char first-record))))))
 
 (defun eudc-process-form ()
   "Process the query form in current buffer and display the results."
@@ -709,34 +709,36 @@ server for future sessions."
       (eudc-save-options)))
 
 ;;;###autoload
-(defun eudc-get-email (name)
-  "Get the email field of NAME from the directory server."
-  (interactive "sName: ")
+(defun eudc-get-email (name &optional error)
+  "Get the email field of NAME from the directory server.
+If ERROR is non-nil, report an error if there is none."
+  (interactive "sName: \np")
   (or eudc-server
       (call-interactively 'eudc-set-server))
   (let ((result (eudc-query (list (cons 'name name)) '(email)))
         email)
     (if (null (cdr result))
         (setq email (eudc-cdaar result))
-      (error "Multiple match. Use the query form"))
-    (if (interactive-p)
+      (error "Multiple match--use the query form"))
+    (if error
         (if email
             (message "%s" email)
           (error "No record matching %s" name)))
     email))
 
 ;;;###autoload
-(defun eudc-get-phone (name)
-  "Get the phone field of NAME from the directory server."
-  (interactive "sName: ")
+(defun eudc-get-phone (name &optional error)
+  "Get the phone field of NAME from the directory server.
+If ERROR is non-nil, report an error if there is none."
+  (interactive "sName: \np")
   (or eudc-server
       (call-interactively 'eudc-set-server))
   (let ((result (eudc-query (list (cons 'name name)) '(phone)))
         phone)
     (if (null (cdr result))
         (setq phone (eudc-cdaar result))
-      (error "Multiple match. Use the query form"))
-    (if (interactive-p)
+      (error "Multiple match--use the query form"))
+    (if error
         (if phone
             (message "%s" phone)
           (error "No record matching %s" name)))
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 5f57c084f9b..1b58760c17c 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -67,18 +67,21 @@ after successful negotiation."
 
 (defcustom tls-process-connection-type nil
   "*Value for `process-connection-type' to use when starting TLS process."
+  :version "21.4"
   :type 'boolean
   :group 'tls)
 
 (defcustom tls-success "- Handshake was completed"
   "*Regular expression indicating completed TLS handshakes.
 The default is what GNUTLS's \"gnutls-cli\" outputs."
+  :version "21.4"
   :type 'regexp
   :group 'tls)
 
 (defcustom tls-certtool-program (executable-find "certtool")
   "Name of  GnuTLS certtool.
 Used by `tls-certificate-information'."
+  :version "21.4"
   :type '(repeat string)
   :group 'tls)