Merged from miles@gnu.org--gnu-2005 (patch 66, 266-268)

Patches applied:

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

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

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

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

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

9 files changed, 98 insertions, 86 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b97c774aaa..4d8e8c6dd52 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,33 @@
+2005-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * isearch.el (isearch-edit-string): Make the search-ring available for
+        minibuffer history commands.
+        (minibuffer-local-isearch-map): Remove bindings for M-p and M-n,
+        the default history commands now work just as well.
+        (isearch-ring-retreat-edit, isearch-ring-advance-edit): Remove.
+
+2005-04-18  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/cua-base.el (cua--pre-command-handler): Add more
+        elaborate check for shift modifier on non-window systems.
+
+2005-04-18  Lars Hansen  <larsh@math.ku.dk>
+
+        * desktop.el: Make "--no-desktop" turn off `desktop-save-mode'.
+
+2005-04-18  Kim F. Storm  <storm@cua.dk>
+
+        * tooltip.el (tooltip-show): Change second arg to USE-ECHO-AREA
+        and make it optional.  Don't test tooltip-gud-echo-area here.
+        (tooltip-gud-process-output, gdb-tooltip-print):
+        Pass tooltip-gud-echo-area to tooltip-show.
+        (tooltip-help-tips): Remove second optional arg to tooltip-show.
+
+2005-04-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * tooltip.el (tooltip-mode): `emacs-quick-startup' and
+        `display-graphic-p' may not be bound yet.
+
 2005-04-17  Luc Teirlinck  <teirllm@auburn.edu>
 
         * startup.el (command-line): No longer enable Xterm Mouse mode by
diff --git a/lisp/desktop.el b/lisp/desktop.el
index ed663d375d5..8e81e8826fe 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1030,9 +1030,10 @@ If there are no buffers left to create, kill the timer."
   'after-init-hook
   '(lambda ()
     (let ((key "--no-desktop"))
-      (if (member key command-line-args)
-        (delete key command-line-args)
-        (when desktop-save-mode (desktop-read))))))
+      (when (member key command-line-args)
+        (setq command-line-args (delete key command-line-args))
+        (setq desktop-save-mode nil)))
+    (when desktop-save-mode (desktop-read))))
 
 (provide 'desktop)
 
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 77e8f636931..6aeb4bab5a2 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1066,10 +1066,20 @@ If ARG is the atom `-', scroll upward by nearly full screen."
         ;; If rectangle is active, expand rectangle in specified direction and ignore the movement.
         (if movement
             (cond
-             ((memq 'shift (event-modifiers
-                            (aref (if window-system
-                                      (this-single-command-raw-keys)
-                                    (this-single-command-keys)) 0)))
+             ((if window-system
+                  (memq 'shift (event-modifiers
+                                (aref (this-single-command-raw-keys) 0)))
+                (or
+                 (memq 'shift (event-modifiers
+                               (aref (this-single-command-keys) 0)))
+                 ;; See if raw escape sequence maps to a shifted event, e.g. S-up or C-S-home.
+                 (and (boundp 'function-key-map)
+                      function-key-map
+                      (let ((ev (lookup-key function-key-map
+                                           (this-single-command-raw-keys))))
+                        (and (vector ev)
+                             (symbolp (setq ev (aref ev 0)))
+                             (string-match "S-" (symbol-name ev)))))))
               (unless mark-active
                 (push-mark-command nil t))
               (setq cua--last-region-shifted t)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2ec1e0bc62e..f08f21fadb7 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * qp.el (quoted-printable-encode-region): Save excursion.
+
 2005-04-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (gnus-mime-inline-part): Use mm-string-to-multibyte.
diff --git a/lisp/gnus/qp.el b/lisp/gnus/qp.el
index 3789e0efda8..1004abeb02b 100644
--- a/lisp/gnus/qp.el
+++ b/lisp/gnus/qp.el
@@ -1,6 +1,7 @@
 ;;; qp.el --- Quoted-Printable functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, extensions
@@ -100,15 +101,15 @@ You should probably avoid non-ASCII characters in this arg.
 If `mm-use-ultra-safe-encoding' is set, fold lines unconditionally and
 encode lines starting with \"From\"."
   (interactive "r")
-  (goto-char from)
-  (if (re-search-forward (mm-string-to-multibyte "[^\x0-\x7f\x80-\xff]")
-                         to t)
-      (error "Multibyte character in QP encoding region"))
   (unless class
     ;; Avoid using 8bit characters. = is \075.
     ;; Equivalent to "^\000-\007\013\015-\037\200-\377="
     (setq class "\010-\012\014\040-\074\076-\177"))
   (save-excursion
+    (goto-char from)
+    (if (re-search-forward (mm-string-to-multibyte "[^\x0-\x7f\x80-\xff]")
+                           to t)
+        (error "Multibyte character in QP encoding region"))
     (save-restriction
       (narrow-to-region from to)
       ;; Encode all the non-ascii and control characters.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index dfd50b2a8a1..e01f2c0c0ec 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -405,12 +405,6 @@ A value of nil means highlight all matches."
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map minibuffer-local-map)
     (define-key map "\r"    'isearch-nonincremental-exit-minibuffer)
-    (define-key map "\M-n"  'isearch-ring-advance-edit)
-    (define-key map [next]  'isearch-ring-advance-edit)
-    (define-key map [down]  'isearch-ring-advance-edit)
-    (define-key map "\M-p"  'isearch-ring-retreat-edit)
-    (define-key map [prior] 'isearch-ring-retreat-edit)
-    (define-key map [up]    'isearch-ring-retreat-edit)
     (define-key map "\M-\t" 'isearch-complete-edit)
     (define-key map "\C-s"  'isearch-forward-exit-minibuffer)
     (define-key map "\C-r"  'isearch-reverse-exit-minibuffer)
@@ -937,8 +931,6 @@ The following additional command keys are active while editing.
 \\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search.
 \\[isearch-forward-exit-minibuffer] to resume isearching forward.
 \\[isearch-reverse-exit-minibuffer] to resume isearching backward.
-\\[isearch-ring-advance-edit] to replace the search string with the next item in the search ring.
-\\[isearch-ring-retreat-edit] to replace the search string with the previous item in the search ring.
 \\[isearch-complete-edit] to complete the search string using the search ring.
 \\<isearch-mode-map>
 If first char entered is \\[isearch-yank-word-or-char], then do word search instead."
@@ -1024,12 +1016,12 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
                   (isearch-unread e))
                 (setq cursor-in-echo-area nil)
                 (setq isearch-new-string
-                      (let (junk-ring)
-                        (read-from-minibuffer
-                         (isearch-message-prefix nil nil isearch-nonincremental)
-                         isearch-string
-                         minibuffer-local-isearch-map nil
-                         'junk-ring nil t))
+                      (read-from-minibuffer
+                       (isearch-message-prefix nil nil isearch-nonincremental)
+                       isearch-string
+                       minibuffer-local-isearch-map nil
+                       (if isearch-regexp 'regexp-search-ring 'search-ring)
+                       nil t)
                       isearch-new-message
                       (mapconcat 'isearch-text-char-description
                                  isearch-new-string "")))
@@ -1860,49 +1852,6 @@ Obsolete."
   (interactive)
   (isearch-ring-adjust nil))
 
-(defun isearch-ring-advance-edit (n)
-  "Insert the next element of the search history into the minibuffer.
-With prefix arg N, insert the Nth element."
-  (interactive "p")
-  (let* ((yank-pointer-name (if isearch-regexp
-                                'regexp-search-ring-yank-pointer
-                              'search-ring-yank-pointer))
-         (yank-pointer (eval yank-pointer-name))
-         (ring (if isearch-regexp regexp-search-ring search-ring))
-         (length (length ring)))
-    (if (zerop length)
-        ()
-      (set yank-pointer-name
-           (setq yank-pointer
-                 (mod (- (or yank-pointer 0) n)
-                      length)))
-
-      (delete-field)
-      (insert (nth yank-pointer ring))
-      (goto-char (point-max)))))
-
-(defun isearch-ring-retreat-edit (n)
-  "Insert the previous element of the search history into the minibuffer.
-With prefix arg N, insert the Nth element."
-  (interactive "p")
-  (isearch-ring-advance-edit (- n)))
-
-;;(defun isearch-ring-adjust-edit (advance)
-;;  "Use the next or previous search string in the ring while in minibuffer."
-;;  (isearch-ring-adjust1 advance)
-;;  (erase-buffer)
-;;  (insert isearch-string))
-
-;;(defun isearch-ring-advance-edit ()
-;;  (interactive)
-;;  (isearch-ring-adjust-edit 'advance))
-
-;;(defun isearch-ring-retreat-edit ()
-;;  "Retreat to the previous search string in the ring while in the minibuffer."
-;;  (interactive)
-;;  (isearch-ring-adjust-edit nil))
-
-
 (defun isearch-complete1 ()
   ;; Helper for isearch-complete and isearch-complete-edit
   ;; Return t if completion OK, nil if no completion exists.
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index c903dbac523..d70e20e5b6b 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -188,8 +188,9 @@ With ARG, turn tooltip mode on if and only if ARG is positive."
   ;; If you change the :init-value below, you also need to change the
   ;; corresponding code in startup.el.
   :init-value (not (or noninteractive
-                       emacs-quick-startup
-                       (not (display-graphic-p))
+                       (and (boundp 'emacs-quick-startup) emacs-quick-startup)
+                       (not (and (fboundp 'display-graphic-p)
+                                 (display-graphic-p)))
                        (not (fboundp 'x-show-tip))))
   :group 'tooltip
   (unless (or (null tooltip-mode) (fboundp 'x-show-tip))
@@ -289,7 +290,7 @@ change the existing association.  Value is the resulting alist."
       (push (cons key value) alist))
     alist))
 
-(defun tooltip-show (text gud-tip)
+(defun tooltip-show (text &optional use-echo-area)
   "Show a tooltip window displaying TEXT.
 
 Text larger than `x-max-tooltip-size' is clipped.
@@ -300,8 +301,9 @@ is displayed.  Otherwise, the tooltip pops at offsets specified by
 `tooltip-x-offset' and `tooltip-y-offset' from the current mouse
 position.
 
-GUD-TIP is t if the tooltip is from a GUD session and nil otherwise."
-  (if (and gud-tip tooltip-gud-echo-area)
+Optional second arg USE-ECHO-AREA non-nil means to show tooltip
+in echo area."
+  (if use-echo-area
       (message "%s" text)
     (condition-case error
         (let ((params (copy-sequence tooltip-frame-parameters))
@@ -417,7 +419,8 @@ This event can be examined by forms in TOOLTIP-GUD-DISPLAY.")
 (defun tooltip-gud-process-output (process output)
   "Process debugger output and show it in a tooltip window."
   (set-process-filter process tooltip-gud-original-filter)
-  (tooltip-show (tooltip-strip-prompt process output) t))
+  (tooltip-show (tooltip-strip-prompt process output)
+                tooltip-gud-echo-area))
 
 (defun tooltip-gud-print-command (expr)
   "Return a suitable command to print the expression EXPR.
@@ -464,7 +467,8 @@ This function must return nil if it doesn't handle EVENT."
    (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
      (let ((string (buffer-string)))
        ;; remove newline for tooltip-gud-echo-area
-       (substring string 0 (- (length string) 1)))) t))
+       (substring string 0 (- (length string) 1))))
+   tooltip-gud-echo-area))
 
 
 ;;; Tooltip help.
@@ -497,7 +501,7 @@ This is installed on the hook `tooltip-hook', which is run when
 the timer with ID `tooltip-timeout-id' fires.
 Value is non-nil if this function handled the tip."
   (when (stringp tooltip-help-message)
-    (tooltip-show tooltip-help-message nil)
+    (tooltip-show tooltip-help-message)
     t))
 
 (provide 'tooltip)
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 82b7f64dc01..a023bdf18c7 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url.el (url-retrieve-synchronously): Work around the fact that
+        url-http sometimes doesn't call the callback.
+
 2005-04-04  Lute Kamstra  <lute@gnu.org>
 
         * url-handlers.el (url-handler-mode): Specify :group.
diff --git a/lisp/url/url.el b/lisp/url/url.el
index a9fd46bc23a..05ef85c9300 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -180,15 +180,23 @@ no further processing).  URL is either a string or a parsed URL."
           (url-debug 'retrieval
                      "Spinning in url-retrieve-synchronously: %S (%S)"
                      retrieval-done asynch-buffer)
-          ;; We used to use `sit-for' here, but in some cases it wouldn't
-          ;; work because apparently pending keyboard input would always
-          ;; interrupt it before it got a chance to handle process input.
-          ;; `sleep-for' was tried but it lead to other forms of
-          ;; hanging.  --Stef
-          (unless (accept-process-output proc)
-            ;; accept-process-output returned nil, maybe because the process
-            ;; exited (and may have been replaced with another).
-            (setq proc (get-buffer-process asynch-buffer)))))
+          (if (memq (process-status proc) '(closed exit signal failed))
+              ;; FIXME: It's not clear whether url-retrieve's callback is
+              ;; guaranteed to be called or not.  It seems that url-http
+              ;; decides sometimes consciously not to call it, so it's not
+              ;; clear that it's a bug, but even if we need to decide how
+              ;; url-http can then warn us that the download has completed.
+              ;; In the mean time, we use this here workaround.
+              (setq retrieval-done t)
+            ;; We used to use `sit-for' here, but in some cases it wouldn't
+            ;; work because apparently pending keyboard input would always
+            ;; interrupt it before it got a chance to handle process input.
+            ;; `sleep-for' was tried but it lead to other forms of
+            ;; hanging.  --Stef
+            (unless (accept-process-output proc)
+              ;; accept-process-output returned nil, maybe because the process
+              ;; exited (and may have been replaced with another).
+              (setq proc (get-buffer-process asynch-buffer))))))
       asynch-buffer)))
 
 (defun url-mm-callback (&rest ignored)