Merged in changes from CVS trunk.

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-483
   Build-in-place tweak

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


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

7 files changed, 73 insertions, 19 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e12449df8e4..31e414c2a4b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,37 @@
+2004-08-08  John Paul Wallington  <jpw@gnu.org>
+
+        * ibuffer.el (define-ibuffer-column size): Use `string-to-number'
+        instead of `string-to-int'.
+        (define-ibuffer-column mode): Fix indentation.
+
+2004-08-08  Lars Hansen  <larsh@math.ku.dk>
+
+        * wid-edit.el (widget-sexp-validate): Allow whitespace after
+        expression.
+
+2004-08-08  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * subr.el (global-unset-key, local-unset-key): Doc fixes.
+
+        * novice.el (disabled-command-function): New variable renamed from
+        `disabled-command-hook'.
+        (disabled-command-hook): Keep the _variable_ as alias for
+        `disabled-command-function' and make obsolete.
+        (disabled-command-function): Function renamed from
+        `disabled-command-hook'.  Adapt code to name change of the variable.
+
+2004-08-07  Satyaki Das  <satyaki@theforce.stanford.edu>  (tiny change)
+
+        * simple.el (completion-root-regexp): New defvar.
+        (completion-setup-function): Use it instead of a literal string.
+
+2004-08-07  John Paul Wallington  <jpw@gnu.org>
+
+        * emacs-lisp/re-builder.el (reb-re-syntax): Add `rx' syntax.
+        (reb-lisp-mode): Require `rx' feature when `re-reb-syntax' is `rx'.
+        (reb-lisp-syntax-p, reb-change-syntax): `rx' is a Lisp syntax.
+        (reb-cook-regexp): Call `rx-to-string' when `re-reb-syntax' is `rx'.
+
 2004-08-04  Kenichi Handa  <handa@m17n.org>
 
         * international/encoded-kb.el (encoded-kbd-setup-keymap): Fix
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index c6112c4a105..6eb1ffa2e54 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -135,6 +135,7 @@ Can either be `read', `string', `sregex' or `lisp-re'."
                  (const :tag "String syntax" string)
                  (const :tag "`sregex' syntax" sregex)
                  (const :tag "`lisp-re' syntax" lisp-re)
+                 (const :tag "`rx' syntax" rx)
                  (value: string)))
 
 (defcustom reb-auto-match-limit 200
@@ -261,7 +262,9 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
   (cond ((eq reb-re-syntax 'lisp-re)    ; Pull in packages
          (require 'lisp-re))            ; as needed
         ((eq reb-re-syntax 'sregex)     ; sregex is not autoloaded
-         (require 'sregex)))            ; right now..
+         (require 'sregex))             ; right now..
+        ((eq reb-re-syntax 'rx)         ; rx-to-string is autoloaded
+         (require 'rx)))                ; require rx anyway
   (reb-mode-common))
 
 ;; Use the same "\C-c" keymap as `reb-mode' and use font-locking from
@@ -320,7 +323,7 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
 
 (defsubst reb-lisp-syntax-p ()
   "Return non-nil if RE Builder uses a Lisp syntax."
-  (memq reb-re-syntax '(lisp-re sregex)))
+  (memq reb-re-syntax '(lisp-re sregex rx)))
 
 (defmacro reb-target-binding (symbol)
   "Return binding for SYMBOL in the RE Builder target buffer."
@@ -466,10 +469,10 @@ Optional argument SYNTAX must be specified if called non-interactively."
    (list (intern
           (completing-read "Select syntax: "
                            (mapcar (lambda (el) (cons (symbol-name el) 1))
-                                   '(read string lisp-re sregex))
+                                   '(read string lisp-re sregex rx))
                            nil t (symbol-name reb-re-syntax)))))
 
-  (if (memq syntax '(read string lisp-re sregex))
+  (if (memq syntax '(read string lisp-re sregex rx))
       (let ((buffer (get-buffer reb-buffer)))
         (setq reb-re-syntax syntax)
         (if buffer
@@ -604,6 +607,8 @@ optional fourth argument FORCE is non-nil."
          (lre-compile-string (eval (car (read-from-string re)))))
         ((eq reb-re-syntax 'sregex)
          (apply 'sregex (eval (car (read-from-string re)))))
+        ((eq reb-re-syntax 'rx)
+         (rx-to-string (eval (car (read-from-string re)))))
         (t re)))
 
 (defun reb-update-regexp ()
@@ -670,7 +675,7 @@ If SUBEXP is non-nil mark only the corresponding sub-expressions."
                   (overlay-put overlay 'priority i)))
             (setq i (1+ i))))))
     (let ((count (if subexp submatches matches)))
-      (message"%s %smatch%s%s"
+      (message "%s %smatch%s%s"
                (if (= 0 count) "No" (int-to-string count))
                (if subexp "subexpression " "")
                (if (= 1 count) "" "es")
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 140f2995292..f013f8e3c72 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1644,16 +1644,17 @@ If point is on a group name, this function operates on that group."
        (dolist (string column-strings)
          (setq total
                ;; like, ewww ...
-               (+ (float (string-to-int string))
+               (+ (float (string-to-number string))
                   total)))
        (format "%.0f" total))))
   (format "%s" (buffer-size)))
 
-(define-ibuffer-column mode (:inline t
-                             :props
-                             ('mouse-face 'highlight
-                              'keymap ibuffer-mode-name-map
-                              'help-echo "mouse-2: filter by this mode"))
+(define-ibuffer-column mode
+  (:inline t
+   :props
+   ('mouse-face 'highlight
+                'keymap ibuffer-mode-name-map
+                'help-echo "mouse-2: filter by this mode"))
   (format "%s" mode-name))
 
 (define-ibuffer-column process
@@ -2198,7 +2199,7 @@ Try to restore the previous window configuration iff
 `ibuffer-restore-window-config-on-quit' is non-nil."
   (interactive)
   (if ibuffer-restore-window-config-on-quit
-      (progn 
+      (progn
         (bury-buffer)
         (unless (= (count-windows) 1)
           (set-window-configuration ibuffer-prev-window-config)))
diff --git a/lisp/novice.el b/lisp/novice.el
index 1cb89066481..ca9a06769d5 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -1,6 +1,7 @@
 ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
 
-;; Copyright (C) 1985, 1986, 1987, 1994, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2004
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal, help
@@ -36,12 +37,17 @@
 ;; and the keys are returned by (this-command-keys).
 
 ;;;###autoload
-(defvar disabled-command-hook 'disabled-command-hook
+(defvar disabled-command-function 'disabled-command-function
   "Function to call to handle disabled commands.
 If nil, the feature is disabled, i.e., all commands work normally.")
 
+(defvaralias 'disabled-command-hook 'disabled-command-function)
+(make-obsolete-variable
+ 'disabled-command-hook
+ "use the variable `disabled-command-function' instead." "21.4")
+
 ;;;###autoload
-(defun disabled-command-hook (&rest ignore)
+(defun disabled-command-function (&rest ignore)
   (let (char)
     (save-window-excursion
      (with-output-to-temp-buffer "*Help*"
@@ -91,7 +97,7 @@ SPC to try the command just this once, but leave it disabled.
          (ding)
          (message "Please type y, n, ! or SPC (the space bar): "))))
     (if (= char ?!)
-        (setq disabled-command-hook nil))
+        (setq disabled-command-function nil))
     (if (= char ?y)
         (if (and user-init-file
                  (not (string= "" user-init-file))
diff --git a/lisp/simple.el b/lisp/simple.el
index 9a7b7f245d0..95f6ed864cf 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4308,6 +4308,12 @@ make the common parts less visible than normal, so that the rest
 of the differing parts is, by contrast, slightly highlighted."
   :group 'completion)
 
+;; This is for packages that need to bind it to a non-default regexp
+;; in order to make the first-differing character highlight work
+;; to their liking
+(defvar completion-root-regexp "^/"
+  "Regexp to use in `completion-setup-function' to find the root directory.")
+
 (defun completion-setup-function ()
   (let ((mainbuf (current-buffer))
         (mbuf-contents (minibuffer-contents)))
@@ -4336,7 +4342,7 @@ of the differing parts is, by contrast, slightly highlighted."
                 (with-current-buffer mainbuf
                   (save-excursion
                     (goto-char (point-max))
-                    (skip-chars-backward "^/")
+                    (skip-chars-backward completion-root-regexp)
                     (- (point) (minibuffer-prompt-end)))))
         ;; Otherwise, in minibuffer, the whole input is being completed.
         (if (minibufferp mainbuf)
diff --git a/lisp/subr.el b/lisp/subr.el
index 2b329ef623f..2833dd10611 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2316,13 +2316,13 @@ which in most cases is shared with all other buffers in the same major mode."
 
 (defun global-unset-key (key)
   "Remove global binding of KEY.
-KEY is a string representing a sequence of keystrokes."
+KEY is a string or vector representing a sequence of keystrokes."
   (interactive "kUnset key globally: ")
   (global-set-key key nil))
 
 (defun local-unset-key (key)
   "Remove local binding of KEY.
-KEY is a string representing a sequence of keystrokes."
+KEY is a string or vector representing a sequence of keystrokes."
   (interactive "kUnset key locally: ")
   (if (current-local-map)
       (local-set-key key nil))
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 8029fb3d5a6..05ef4b95658 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -3153,6 +3153,8 @@ It will read a directory name from the minibuffer when invoked."
                 (setq err "Empty sexp -- use `nil'?")
               (unless (widget-apply widget :match (read (current-buffer)))
                 (setq err (widget-get widget :type-error))))
+            ;; Allow whitespace after expression.
+            (skip-syntax-forward "\\s-")
             (if (and (not (eobp))
                      (not err))
                 (setq err (format "Junk at end of expression: %s"