Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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


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

11 files changed, 120 insertions, 54 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea1392783f6..b5134b2647f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,48 @@
+2004-08-02  Kim F. Storm  <storm@cua.dk>
+
+        * avoid.el (mouse-avoidance-point-position): Use window-inside-edges
+        and call compute-motion with nil for topos and width to get proper
+        usable width and height for both window and non-window systems.
+
+        * windmove.el (windmove-coordinates-of-position): Let compute-motion
+        calculate usable window width and height.
+
+        * window.el (window-buffer-height): Call compute-motion with nil width.
+
+2004-08-01  David Kastrup  <dak@gnu.org>
+
+        * replace.el (query-replace-read-from): Use
+        `query-replace-compile-replacement'.
+        (query-replace-compile-replacement): New function.
+        (query-replace-read-to): Use `query-replace-compile-replacement'
+        for repeating the last command.
+
+2004-08-01  John Paul Wallington  <jpw@gnu.org>
+
+        * printing.el (toplevel, pr-ps-fast-fire, pr-ps-set-utility)
+        (pr-ps-set-printer, pr-txt-set-printer, pr-eval-setting-alist)
+        (pr-switches): Remove period from end of error messages.
+
+        * help-mode.el (help-go-back): Likewise.
+
+        * abbrev.el (only-global-abbrevs): Doc fix.
+        (edit-abbrevs-map): Define within defvar.
+        (quietly-read-abbrev-file): Doc fix.
+
+2004-07-31  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * novice.el (enable-command, disable-command): Doc fixes.
+
+        * subr.el (event-modifiers, event-basic-type): Doc fixes.
+
+2004-07-30  Richard M. Stallman  <rms@gnu.org>
+
+        * subr.el (with-local-quit): Doc fix.
+
+2004-07-30  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * international/utf-8.el (utf-translate-cjk-mode): Doc fix.
+
 2004-07-28  Luc Teirlinck  <teirllm@auburn.edu>
 
         * custom.el (defcustom): Doc fix.
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 3be0014fd0e..3580c136948 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -29,7 +29,7 @@
 ;;; Code:
 
 (defcustom only-global-abbrevs nil
-  "*t means user plans to use global abbrevs only.
+  "Non-nil means user plans to use global abbrevs only.
 This makes the commands that normally define mode-specific abbrevs
 define global abbrevs instead."
   :type 'boolean
@@ -59,13 +59,12 @@ to enable or disable Abbrev mode in the current buffer."
   :group 'abbrev-mode)
 
 
-(defvar edit-abbrevs-map nil
+(defvar edit-abbrevs-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\C-x\C-s" 'edit-abbrevs-redefine)
+    (define-key map "\C-c\C-c" 'edit-abbrevs-redefine)
+    map)
   "Keymap used in `edit-abbrevs'.")
-(if edit-abbrevs-map
-    nil
-  (setq edit-abbrevs-map (make-sparse-keymap))
-  (define-key edit-abbrevs-map "\C-x\C-s" 'edit-abbrevs-redefine)
-  (define-key edit-abbrevs-map "\C-c\C-c" 'edit-abbrevs-redefine))
 
 (defun kill-all-abbrevs ()
   "Undefine all defined abbrevs."
@@ -195,7 +194,7 @@ Optional second argument QUIETLY non-nil means don't display a message."
   (setq abbrevs-changed nil))
 
 (defun quietly-read-abbrev-file (&optional file)
-  "Read abbrev definitions from file written with write-abbrev-file.
+  "Read abbrev definitions from file written with `write-abbrev-file'.
 Optional argument FILE is the name of the file to read;
 it defaults to the value of `abbrev-file-name'.
 Does not display any message."
diff --git a/lisp/avoid.el b/lisp/avoid.el
index 5a5a09622cd..536b80abdbe 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -139,15 +139,15 @@ Only applies in mouse-avoidance-modes `animate' and `jump'."
   "Return the position of point as (FRAME X . Y).
 Analogous to mouse-position."
   (let* ((w (selected-window))
-         (edges (window-edges w))
+         (edges (window-inside-edges w))
          (list
           (compute-motion (max (window-start w) (point-min))   ; start pos
                           ;; window-start can be < point-min if the
                           ;; latter has changed since the last redisplay
                           '(0 . 0)                             ; start XY
                           (point)                              ; stop pos
-                          (cons (window-width) (window-height)); stop XY: none
-                          (1- (window-width))                  ; width
+                          nil                                  ; stop XY: none
+                          nil                                  ; width
                           (cons (window-hscroll w) 0)          ; 0 may not be right?
                           (selected-window))))
     ;; compute-motion returns (pos HPOS VPOS prevhpos contin)
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 11656ec368c..a2dcdf91ed8 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -581,7 +581,7 @@ help buffer."
   (interactive)
   (if help-xref-stack
       (help-xref-go-back (current-buffer))
-    (error "No previous help buffer.")))
+    (error "No previous help buffer")))
 
 (defun help-do-xref (pos function args)
   "Call the help cross-reference function FUNCTION with args ARGS.
diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 77a51abb43f..bad79b58743 100644
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -273,7 +273,7 @@ The value nil means that the tables are not yet loaded.")
       (utf-translate-cjk-load-tables))
   (gethash code-point
            (get 'utf-subst-table-for-decode 'translation-hash-table)))
-  
+
 
 (defun utf-lookup-subst-table-for-encode (char)
   (if (and utf-translate-cjk-mode
@@ -282,9 +282,11 @@ The value nil means that the tables are not yet loaded.")
       (utf-translate-cjk-load-tables))
   (gethash char
            (get 'utf-subst-table-for-encode 'translation-hash-table)))
-  
+
 (define-minor-mode utf-translate-cjk-mode
-  "Whether the UTF based coding systems should decode/encode CJK characters.
+  "Toggle whether UTF based coding systems de/encode CJK characters.
+If ARG is an integer, enable if ARG is positive and disable if
+zero or negative.  This is a minor mode.
 Enabling this allows the coding systems mule-utf-8,
 mule-utf-16le and mule-utf-16be to encode characters in the charsets
 `korean-ksc5601', `chinese-gb2312', `chinese-big5-1',
@@ -296,9 +298,10 @@ according to the language environment in effect when this option is
 turned on: ksc5601 for Korean, gb2312 for Chinese-GB, big5 for
 Chinese-Big5 and jisx for other environments.
 
-This option is on by default.  If you are not interested in CJK
+This mode is on by default.  If you are not interested in CJK
 characters and want to avoid some overhead on encoding/decoding
-by the above coding systems, you can customize this option to nil."
+by the above coding systems, you can customize the user option
+`utf-translate-cjk-mode' to nil."
   :init-value t
   :version "21.4"
   :type 'boolean
@@ -605,7 +608,7 @@ eight-bit-control and eight-bit-graphic characters.")
   ;; UTF-8 decoder generates an UTF-8 sequence represented by a
   ;; sequence eight-bit-control/graphic chars for an untranslatable
   ;; character and an invalid byte.
-  ;; 
+  ;;
   ;; This CCL parses that sequence (the first byte is already in r1),
   ;; writes out the original bytes of that sequence, and sets r5 to
   ;; -1.
@@ -624,7 +627,7 @@ eight-bit-control and eight-bit-graphic characters.")
      (read-multibyte-character r5 r6)
      (r0 = (r5 != ,(charset-id 'eight-bit-control)))
      (if ((r5 != ,(charset-id 'eight-bit-graphic)) & r0)
-         ((write r1)                    ; invalid UTF-8 
+         ((write r1)                    ; invalid UTF-8
           (r1 = -1)
           (end)))
 
@@ -641,7 +644,7 @@ eight-bit-control and eight-bit-graphic characters.")
      (r1 = -1)
      ;; Read the 3rd byte.
      (read-multibyte-character r5 r6)
-     (r0 = (r5 != ,(charset-id 'eight-bit-control)))           
+     (r0 = (r5 != ,(charset-id 'eight-bit-control)))
      (if ((r5 != ,(charset-id 'eight-bit-graphic)) & r0)
          (end))                         ; invalid UTF-8
      (write r6)
@@ -651,7 +654,7 @@ eight-bit-control and eight-bit-graphic characters.")
           (end)))
      ;; Read the 4th byte.
      (read-multibyte-character r5 r6)
-     (r0 = (r5 != ,(charset-id 'eight-bit-control)))           
+     (r0 = (r5 != ,(charset-id 'eight-bit-control)))
      (if ((r5 != ,(charset-id 'eight-bit-graphic)) & r0)
          (end))                 ; invalid UTF-8
      ;; 4-byte sequence for an untranslated character.
diff --git a/lisp/novice.el b/lisp/novice.el
index 159c9a96780..1cb89066481 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -104,7 +104,8 @@ SPC to try the command just this once, but leave it disabled.
 ;;;###autoload
 (defun enable-command (command)
   "Allow COMMAND to be executed without special confirmation from now on.
-The user's .emacs file is altered so that this will apply
+COMMAND must be a symbol.
+This command alters the user's .emacs file so that this will apply
 to future sessions."
   (interactive "CEnable command: ")
   (put command 'disabled nil)
@@ -141,7 +142,8 @@ to future sessions."
 ;;;###autoload
 (defun disable-command (command)
   "Require special confirmation to execute COMMAND from now on.
-The user's .emacs file is altered so that this will apply
+COMMAND must be a symbol.
+This command alters the user's .emacs file so that this will apply
 to future sessions."
   (interactive "CDisable command: ")
   (if (not (commandp command))
diff --git a/lisp/printing.el b/lisp/printing.el
index 22a3f762ab6..08303e0595d 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -974,7 +974,7 @@ Please send all bug fixes and enhancements to
 
 
 (and (string< ps-print-version "6.6.4")
-     (error "`printing' requires `ps-print' package version 6.6.4 or later."))
+     (error "`printing' requires `ps-print' package version 6.6.4 or later"))
 
 
 (eval-and-compile
@@ -4254,7 +4254,7 @@ are both set to t."
     (pr-ps-buffer-ps-print
      (if (integerp n-up)
          (min (max n-up 1) 100)
-       (error "n-up must be an integer greater than zero."))
+       (error "n-up must be an integer greater than zero"))
      filename)))
 
 
@@ -5031,7 +5031,7 @@ non-nil."
   (let ((item (cdr (assq value pr-ps-utility-alist))))
     (or item
         (error
-         "Invalid PostScript utility name `%s' for variable `pr-ps-utility'."
+         "Invalid PostScript utility name `%s' for variable `pr-ps-utility'"
          value))
     (setq pr-ps-utility value)
     (pr-eval-alist (nthcdr 9 item)))
@@ -5042,7 +5042,7 @@ non-nil."
   (let ((ps (cdr (assq value pr-ps-printer-alist))))
     (or ps
         (error
-         "Invalid PostScript printer name `%s' for variable `pr-ps-name'."
+         "Invalid PostScript printer name `%s' for variable `pr-ps-name'"
          value))
     (setq pr-ps-name           value
           pr-ps-command        (pr-dosify-file-name (nth 0 ps))
@@ -5068,7 +5068,7 @@ non-nil."
 (defun pr-txt-set-printer (value)
   (let ((txt (cdr (assq value pr-txt-printer-alist))))
     (or txt
-        (error "Invalid text printer name `%s' for variable `pr-txt-name'."
+        (error "Invalid text printer name `%s' for variable `pr-txt-name'"
                value))
     (setq pr-txt-name     value
           pr-txt-command  (pr-dosify-file-name (nth 0 txt))
@@ -5121,7 +5121,7 @@ non-nil."
                   (setq global nil)))
            (and inherits
                 (if (memq inherits old)
-                    (error "Circular inheritance for `%S'." inherits)
+                    (error "Circular inheritance for `%S'" inherits)
                   (setq local-list
                         (pr-eval-setting-alist inherits global
                                                (cons inherits old)))))
@@ -5349,7 +5349,7 @@ non-nil."
 
 (defun pr-switches (switches mess)
   (or (listp switches)
-      (error "%S should have a list of strings." mess))
+      (error "%S should have a list of strings" mess))
   (ps-flatten-list                      ; dynamic evaluation
    (mapcar 'ps-eval-switch switches)))
 
diff --git a/lisp/replace.el b/lisp/replace.el
index f09868cc6d3..47437659923 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -94,7 +94,8 @@ wants to replace FROM with TO."
                query-replace-from-history-variable
                nil t))))
       (if (and (zerop (length from)) lastto lastfrom)
-          (cons lastfrom lastto)
+          (cons lastfrom
+                (query-replace-compile-replacement lastto regexp-flag))
         ;; Warn if user types \n or \t, but don't reject the input.
         (and regexp-flag
              (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from)
@@ -107,15 +108,12 @@ wants to replace FROM with TO."
                (sit-for 2)))
         from))))
 
-(defun query-replace-read-to (from string regexp-flag)
-  "Query and return the `from' argument of a query-replace operation."
-  (let ((to (save-excursion
-              (read-from-minibuffer
-               (format "%s %s with: " string (query-replace-descr from))
-               nil nil nil
-               query-replace-to-history-variable from t))))
-    (when (and regexp-flag
-               (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\\\[,#]" to))
+(defun query-replace-compile-replacement (to regexp-flag)
+  "Maybe convert a regexp replacement TO to Lisp.
+Returns a list suitable for `perform-replace' if necessary,
+the original string if not."
+  (if (and regexp-flag
+           (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\\\[,#]" to))
       (let (pos list char)
         (while
             (progn
@@ -142,14 +140,25 @@ wants to replace FROM with TO."
                               (cdr pos))))
                        (setq to (substring to end)))))
               (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\\\[,#]" to)))
-        (setq to (nreverse (delete "" (cons to list)))))
-      (replace-match-string-symbols to)
-      (setq to (cons 'replace-eval-replacement
-                     (if (> (length to) 1)
-                         (cons 'concat to)
-                       (car to)))))
+        (setq to (nreverse (delete "" (cons to list))))
+        (replace-match-string-symbols to)
+        (cons 'replace-eval-replacement
+              (if (cdr to)
+                  (cons 'concat to)
+                (car to))))
     to))
 
+
+(defun query-replace-read-to (from string regexp-flag)
+  "Query and return the `to' argument of a query-replace operation."
+  (query-replace-compile-replacement
+   (save-excursion
+     (read-from-minibuffer
+      (format "%s %s with: " string (query-replace-descr from))
+      nil nil nil
+      query-replace-to-history-variable from t))
+   regexp-flag))
+
 (defun query-replace-read-args (string regexp-flag &optional noerror)
   (unless noerror
     (barf-if-buffer-read-only))
diff --git a/lisp/subr.el b/lisp/subr.el
index 64e9bdc6e24..2b329ef623f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -644,7 +644,11 @@ The normal global definition of the character C-x indirects to this keymap.")
   "Return a list of symbols representing the modifier keys in event EVENT.
 The elements of the list may include `meta', `control',
 `shift', `hyper', `super', `alt', `click', `double', `triple', `drag',
-and `down'."
+and `down'.
+EVENT may be an event or an event type.  If EVENT is a symbol
+that has never been used in an event that has been read as input
+in the current Emacs session, then this function can return nil,
+even when EVENT actually has modifiers."
   (let ((type event))
     (if (listp type)
         (setq type (car type)))
@@ -671,7 +675,10 @@ and `down'."
 
 (defun event-basic-type (event)
   "Return the basic type of the given event (all modifiers removed).
-The value is a printing character (not upper case) or a symbol."
+The value is a printing character (not upper case) or a symbol.
+EVENT may be an event or an event type.  If EVENT is a symbol
+that has never been used in an event that has been read as input
+in the current Emacs session, then this function may return nil."
   (if (consp event)
       (setq event (car event)))
   (if (symbolp event)
@@ -1906,7 +1913,10 @@ See also `with-temp-file' and `with-output-to-string'."
          (kill-buffer nil)))))
 
 (defmacro with-local-quit (&rest body)
-  "Execute BODY with `inhibit-quit' temporarily bound to nil."
+  "Execute BODY, allowing quits to terminate BODY but not escape further.
+When a quit terminates BODY, `with-local-quit' requests another quit when
+it finishes.  That quit will be processed in turn, the next time quitting
+is again allowed."
   (declare (debug t) (indent 0))
   `(condition-case nil
        (let ((inhibit-quit nil))
diff --git a/lisp/windmove.el b/lisp/windmove.el
index 7008b86335e..642f04a1d8d 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -429,14 +429,12 @@ the return value from `windmove-coordinates-of-position' is (0 . 0)
 regardless of the where point is in the buffer and where the window
 is placed in the frame."
   (let* ((wind (if (null window) (selected-window) window))
-         (usable-width (1- (window-width wind))) ; 1- for cont. column
-         (usable-height (1- (window-height wind))) ; 1- for mode line
          (big-hairy-result (compute-motion
                             (window-start)
                             '(0 . 0)
                             pos
-                            (cons usable-width usable-height)
-                            usable-width
+                            nil ; (window-width window-height)
+                            nil ; window-width
                             (cons (window-hscroll)
                                   0)    ; why zero?
                             wind)))
diff --git a/lisp/window.el b/lisp/window.el
index 96bfc8b5581..5ec752f3f23 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -408,7 +408,7 @@ lines than are actually needed in the case where some error may be present."
                                   '(0 . 0)
                                   (- (point-max) (if ignore-final-newline 1 0))
                                   (cons 0 100000000)
-                                  (window-width window)
+                                  nil
                                   nil
                                   window))))))