Merged in changes from CVS trunk.

Patches applied:

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-368
   Improve display-supports-face-attributes-p on non-ttys

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-369
   Rewrite face-differs-from-default-p

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
   Move `display-supports-face-attributes-p' entirely into C code

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
   Simplify face-differs-from-default-p; don't consider :stipple.

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
   (tty_supports_face_attributes_p): Ensure attributes differ from default

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


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

7 files changed, 188 insertions, 124 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83f8a0e1cf0..3922ef9bf41 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,59 @@
+2004-06-05  Juanma Barranquero  <lektu@terra.es>
+
+        * help-fns.el (help-argument-name): Reintroduce face.
+        (help-default-arg-highlight): Use it, now that
+        `face-differs-from-default-p' can be trusted.
+
+2004-06-05  Matt Hodges  <matt@stchem.bham.ac.uk>  (tiny change)
+
+        * textmodes/table.el: Sentence commands added to Point Motion
+        group; kill and backward-kill commands added to Extraction group.
+
+2004-06-04  Mario Lang  <mlang@delysid.org>
+
+        * battery.el (battery-linux-proc-acpi): mA was hardcored, but some
+        systems appear to use mW, make the code handle this.  Fix a
+        division-by-zero bug while at it, and handle kernels with
+        a slightly different layout in /proc/acpi.
+
+2004-06-04  Karl Fogel  <kfogel@red-bean.com>
+
+        * vc-svn.el (vc-svn-checkin): Use 'nconc' instead of 'list*',
+        because the latter is a CL-ism.  This fixes the bug reported by
+        Shawn Boyette <mdxi@collapsar.net> in
+        http://lists.gnu.org/archive/html/emacs-devel/2004-05/msg00442.html.
+
+2004-06-04  Miles Bader  <miles@gnu.org>
+
+        * faces.el (display-supports-face-attributes-p): Function moved to
+        C code.  Previously only the tty-related portion of this function
+        was done in C; however the previous attempt to do a halfway-proper
+        job for non-tty displays in lisp didn't work properly because of
+        funny conditions during Emacs startup.
+        (face-differs-from-default-p): Simplify, now that
+        display-supports-face-attributes-p works properly on all display
+        types.  Remove :stipple from comparison; it doesn't really work
+        in emacs anyway.
+
+2004-06-04  Miles Bader  <miles@gnu.org>
+
+        * faces.el (face-differs-from-default-p): Use a different
+        implementation, so we can really check whether FACE displays
+        differently or not.
+
+2004-06-04  Miles Bader  <miles@gnu.org>
+
+        * faces.el (display-supports-face-attributes-p): Implement a
+        `different from default' check for non-tty displays.
+
+2004-06-03  David Kastrup  <dak@gnu.org>
+
+        * woman.el (woman-mapcan): More concise code.
+        (woman-topic-all-completions, woman-topic-all-completions-1)
+        (woman-topic-all-completions-merge): Replace by a simpler and
+        much faster implementation based on O(n log n) sort/merge instead
+        of the old O(n^2) behavior.
+
 2004-06-03  Miles Bader  <miles@gnu.org>
 
         * subr.el (read-number): Use canonical format for default in prompt.
@@ -193,7 +249,7 @@
         * thumbs.el (thumbs-show-name): Do nothing if no image at point.
         (thumbs-mouse-find-image): New command.
         (thumbs-mode-map): Bind it to mouse-2.
-        (thumbs-mode):  Make mode-class special.
+        (thumbs-mode): Make mode-class special.
         (thumbs-view-image-mode): Likewise.
 
 2004-05-29  Pavel Kobiakov  <pk_at_work@yahoo.com>
@@ -1382,7 +1438,7 @@
         (sql-connect-postgres): Add username prompt.
         (sql-imenu-generic-expression, sql-mode-font-lock-object-name):
         Make patterns less product specific.
-        (sql-xemacs-p, sql-emacs19-p): Add flags for emacs variants.
+        (sql-xemacs-p, sql-emacs19-p): Add flags for Emacs variants.
         (sql-mode-abbrev-table): Modify initialization.
         (sql-builtin-face): Add variable.
         (sql-keywords-re): Add macro.
@@ -6381,7 +6437,7 @@
         (ffap-file-at-point): Use the new regexp to strip the prompts from
         the file names.  This is an issue mostly for user prompts that
         don't have a trailing space and find-file-at-point is invoked from
-        within a shell inside emacs.
+        within a shell inside Emacs.
 
 2003-09-24  Andre Spiegel  <spiegel@gnu.org>
 
diff --git a/lisp/battery.el b/lisp/battery.el
index c82d3ac02b3..73d78067571 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -61,7 +61,7 @@ introduced by a `%' character in a control string."
   (cond ((eq battery-status-function 'battery-linux-proc-apm)
          "Power %L, battery %B (%p%% load, remaining time %t)")
         ((eq battery-status-function 'battery-linux-proc-acpi)
-         "Power %L, battery %B at %r mA (%p%% load, remaining time %t)"))
+         "Power %L, battery %B at %r (%p%% load, remaining time %t)"))
   "*Control string formatting the string to display in the echo area.
 Ordinary characters in the control string are printed as-is, while
 conversion specifications introduced by a `%' character in the control
@@ -243,7 +243,8 @@ The following %-sequences are provided:
 %m Remaining time in minutes
 %h Remaining time in hours
 %t Remaining time in the form `h:min'"
-  (let (capacity design-capacity rate charging-state warn low minutes hours)
+  (let (capacity design-capacity rate rate-type charging-state warn low
+                 minutes hours)
     (when (file-directory-p "/proc/acpi/battery/")
       ;; ACPI provides information about each battery present in the system in
       ;; a separate subdirectory.  We are going to merge the available
@@ -261,32 +262,41 @@ The following %-sequences are provided:
                   ;; battery is "charging"/"discharging", the others are
                   ;; "unknown".
                   (setq charging-state (match-string 1)))
-             (when (re-search-forward "present rate: +\\([0-9]+\\) mA$" nil t)
-               (setq rate (+ (or rate 0) (string-to-int (match-string 1)))))
-             (when (re-search-forward "remaining capacity: +\\([0-9]+\\) mAh$"
+             (when (re-search-forward "present rate: +\\([0-9]+\\) \\(m[AW]\\)$"
+                                      nil t)
+               (setq rate (+ (or rate 0) (string-to-int (match-string 1)))
+                     rate-type (or (and rate-type
+                                        (if (string= rate-type (match-string 2))
+                                            rate-type
+                                          (error
+                                           "Inconsistent rate types (%s vs. %s)"
+                                           rate-type (match-string 2))))
+                                   (match-string 2))))
+             (when (re-search-forward "remaining capacity: +\\([0-9]+\\) m[AW]h$"
                                       nil t)
                (setq capacity
                      (+ (or capacity 0) (string-to-int (match-string 1))))))
            (goto-char (point-max))
            (insert-file-contents (expand-file-name "info" dir))
            (when (re-search-forward "present: +yes$" nil t)
-             (when (re-search-forward "design capacity: +\\([0-9]+\\) mAh$"
+             (when (re-search-forward "design capacity: +\\([0-9]+\\) m[AW]h$"
                                       nil t)
                (setq design-capacity (+ (or design-capacity 0)
                                         (string-to-int (match-string 1)))))
-             (when (re-search-forward "design capacity warning: +\\([0-9]+\\) mAh$"
+             (when (re-search-forward "design capacity warning: +\\([0-9]+\\) m[AW]h$"
                                       nil t)
                (setq warn (+ (or warn 0) (string-to-int (match-string 1)))))
-             (when (re-search-forward "design capacity low: +\\([0-9]+\\) mAh$"
+             (when (re-search-forward "design capacity low: +\\([0-9]+\\) m[AW]h$"
                                       nil t)
                (setq low (+ (or low 0)
                             (string-to-int (match-string 1))))))))
        (directory-files "/proc/acpi/battery/" t "BAT")))
     (and capacity rate
-         (setq minutes (floor (* (/ (float (if (string= charging-state
-                                                        "charging")
-                                               (- design-capacity capacity)
-                                             capacity)) rate) 60))
+         (setq minutes (if (zerop rate) 0
+                         (floor (* (/ (float (if (string= charging-state
+                                                          "charging")
+                                                 (- design-capacity capacity)
+                                               capacity)) rate) 60)))
                hours (/ minutes 60)))
     (list (cons ?c (or (and capacity (number-to-string capacity)) "N/A"))
           (cons ?L (or (when (file-exists-p "/proc/acpi/ac_adapter/AC/state")
@@ -304,8 +314,17 @@ The following %-sequences are provided:
                            (when (re-search-forward
                                   "temperature: +\\([0-9]+\\) C$" nil t)
                              (match-string 1))))
+                       (when (file-exists-p
+                              "/proc/acpi/thermal_zone/THM/temperature")
+                         (with-temp-buffer
+                           (insert-file-contents
+                            "/proc/acpi/thermal_zone/THM/temperature")
+                           (when (re-search-forward
+                                  "temperature: +\\([0-9]+\\) C$" nil t)
+                             (match-string 1))))
                        "N/A"))
-          (cons ?r (or (and rate (number-to-string rate)) "N/A"))
+          (cons ?r (or (and rate (concat (number-to-string rate) " "
+                                         rate-type)) "N/A"))
           (cons ?B (or charging-state "N/A"))
           (cons ?b (or (and (string= charging-state "charging") "+")
                        (and low (< capacity low) "!")
diff --git a/lisp/faces.el b/lisp/faces.el
index 721c2fa3631..15e0f2549a8 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -240,27 +240,24 @@ If FRAME is omitted or nil, use the selected frame."
 
 
 (defun face-differs-from-default-p (face &optional frame)
-  "Non-nil if FACE displays differently from the default face.
+  "Return non-nil if FACE displays differently from the default face.
 If the optional argument FRAME is given, report on face FACE in that frame.
 If FRAME is t, report on the defaults for face FACE (for new frames).
-If FRAME is omitted or nil, use the selected frame.
-A face is considered to be ``the same'' as the default face if it is
-actually specified in the same way (equal attributes) or if it is
-fully-unspecified, and thus inherits the attributes of any face it
-is displayed on top of."
-  (cond ((eq frame t) (setq frame nil))
-        ((null frame) (setq frame (selected-frame))))
-  (let* ((v1 (internal-lisp-face-p face frame))
-         (n (if v1 (length v1) 0))
-         (v2 (internal-lisp-face-p 'default frame))
-         (i 1))
-    (unless v1
-      (error "Not a face: %S" face))
-    (while (and (< i n)
-                (or (eq 'unspecified (aref v1 i))
-                    (equal (aref v1 i) (aref v2 i))))
-      (setq i (1+ i)))
-    (< i n)))
+If FRAME is omitted or nil, use the selected frame."
+  (let ((attrs
+         '(:family :width :height :weight :slant :foreground
+           :foreground :background :underline :overline
+           :strike-through :box :inverse-video))
+        (differs nil))
+    (while (and attrs (not differs))
+      (let* ((attr (pop attrs))
+             (attr-val (face-attribute face attr frame t)))
+        (when (and
+               (not (eq attr-val 'unspecified))
+               (display-supports-face-attributes-p (list attr attr-val)
+                                                   frame))
+          (setq differs attr))))
+    differs))
 
 
 (defun face-nontrivial-p (face &optional frame)
@@ -1489,33 +1486,6 @@ If omitted or nil, that stands for the selected frame's display."
      (t
       (> (tty-color-gray-shades display) 2)))))
 
-(defun display-supports-face-attributes-p (attributes &optional display)
-  "Return non-nil if all the face attributes in ATTRIBUTES are supported.
-The optional argument DISPLAY can be a display name, a frame, or
-nil (meaning the selected frame's display)
-
-The definition of `supported' is somewhat heuristic, but basically means
-that a face containing all the attributes in ATTRIBUTES, when merged
-with the default face for display, can be represented in a way that's
-
- (1) different in appearance than the default face, and
- (2) `close in spirit' to what the attributes specify, if not exact.
-
-Point (2) implies that a `:weight black' attribute will be satisfied by
-any display that can display bold, and a `:foreground \"yellow\"' as long
-as it can display a yellowish color, but `:slant italic' will _not_ be
-satisfied by the tty display code's automatic substitution of a `dim'
-face for italic."
-  (let ((frame
-         (if (framep display)
-             display
-           (car (frames-on-display-list display)))))
-    ;; For now, we assume that non-tty displays can support everything.
-    ;; Later, we should add the ability to query about specific fonts,
-    ;; colors, etc.
-    (or (memq (framep frame) '(x w32 mac))
-        (tty-supports-face-attributes-p attributes frame))))
-
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Background mode.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index e7e09a431bd..03ea5bef653 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -237,14 +237,19 @@ KIND should be `var' for a variable or `subr' for a subroutine."
             (concat "src/" file)
           file)))))
 
+;;;###autoload
+(defface help-argument-name '((((supports :slant italic)) :inherit italic))
+  "Face to highlight argument names in *Help* buffers.")
+
 (defun help-default-arg-highlight (arg)
   "Default function to highlight arguments in *Help* buffers.
-It returns ARG in lowercase italics, if the display supports it;
-else ARG is returned in uppercase normal."
-  (let ((attrs '(:slant italic)))
-    (if (display-supports-face-attributes-p attrs)
-        (propertize (downcase arg) 'face attrs)
-      arg)))
+It returns ARG in face `help-argument-name'; ARG is also
+downcased if it displays differently than the default
+face (according to `face-differs-from-default-p')."
+  (propertize (if (face-differs-from-default-p 'help-argument-name)
+                  (downcase arg)
+                arg)
+              'face 'help-argument-name))
 
 (defun help-do-arg-highlight (doc args)
   (with-syntax-table (make-syntax-table emacs-lisp-mode-syntax-table)
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 93ea3cc0c14..7b13d498b2e 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -1,11 +1,11 @@
 ;;; table.el --- create and edit WYSIWYG text based embedded tables
 
-;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 01, 02, 03, 04 Free Software Foundation, Inc.
 
 ;; Keywords: wp, convenience
 ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
 ;; Created: Sat Jul 08 2000 13:28:45 (PST)
-;; Revised: Tue Dec 09 2003 14:36:50 (PST)
+;; Revised: Tue Jun 01 2004 11:36:39 (PDT)
 
 ;; This file is part of GNU Emacs.
 
@@ -1410,6 +1410,8 @@ the last cache point coordinate."
    end-of-buffer
    forward-word
    backward-word
+   forward-sentence
+   backward-sentence
    forward-paragraph
    backward-paragraph))
 
@@ -1434,9 +1436,18 @@ the last cache point coordinate."
            (cons (cons command func-symbol)
                  table-command-remap-alist))))
  '(kill-region
+   kill-ring-save
    delete-region
    copy-region-as-kill
-   kill-line))
+   kill-line
+   kill-word
+   backward-kill-word
+   kill-sentence
+   backward-kill-sentence
+   kill-paragraph
+   backward-kill-paragraph
+   kill-sexp
+   backward-kill-sexp))
 
 ;; Pasting Group
 (mapcar
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 4db9788cc3b..82c09cbd435 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -195,8 +195,9 @@ This is only possible if SVN is responsible for FILE's directory.")
 
 (defun vc-svn-checkin (file rev comment)
   "SVN-specific version of `vc-backend-checkin'."
-  (let ((status (apply 'vc-svn-command nil 1 file
-                       "ci" (list* "-m" comment (vc-switches 'SVN 'checkin)))))
+  (let ((status (apply
+                 'vc-svn-command nil 1 file "ci"
+                 (nconc (list "-m" comment) (vc-switches 'SVN 'checkin)))))
     (set-buffer "*vc*")
     (goto-char (point-min))
     (unless (equal status 0)
diff --git a/lisp/woman.el b/lisp/woman.el
index d69c631f27b..ba511bca1ae 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1,6 +1,6 @@
 ;;; woman.el --- browse UN*X manual pages `wo (without) man'
 
-;; Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
 
 ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk>
 ;; Maintainer: Francis J. Wright <F.J.Wright@qmul.ac.uk>
@@ -402,6 +402,7 @@
 ;;   Alexander Hinds <ahinds@thegrid.net>
 ;;   Stefan Hornburg <sth@hacon.de>
 ;;   Theodore Jump <tjump@cais.com>
+;;   David Kastrup <dak@gnu.org>
 ;;   Paul Kinnucan <paulk@mathworks.com>
 ;;   Jonas Linde <jonas@init.se>
 ;;   Andrew McRae <andrewm@optimation.co.nz>
@@ -438,7 +439,8 @@
   "Return concatenated list of FN applied to successive `car' elements of X.
 FN must return a list, cons or nil.  Useful for splicing into a list."
   ;; Based on the Standard Lisp function MAPCAN but with args swapped!
-  (and x (nconc (funcall fn (car x)) (woman-mapcan fn (cdr x)))))
+  ;; More concise implementation than the recursive one.  -- dak
+  (apply #'nconc (mapcar fn x)))
 
 (defun woman-parse-colon-path (paths)
   "Explode search path string PATHS into a list of directory names.
@@ -1367,15 +1369,16 @@ The cdr of each alist element is the path-index / filename."
   ;; is re-processed by `woman-topic-all-completions-merge'.
   (let (dir files (path-index 0))       ; indexing starts at zero
     (while path
-      (setq dir (car path)
-            path (cdr path))
+      (setq dir (pop path))
       (if (woman-not-member dir path)   ; use each directory only once!
-          (setq files
-                (nconc files
-                       (woman-topic-all-completions-1 dir path-index))))
+          (push (woman-topic-all-completions-1 dir path-index)
+                files))
       (setq path-index (1+ path-index)))
     ;; Uniquefy topics:
-    (woman-topic-all-completions-merge files)))
+    ;; Concate all lists with a single nconc call to
+    ;; avoid retraversing the first lists repeatedly  -- dak
+    (woman-topic-all-completions-merge
+     (apply #'nconc files))))
 
 (defun woman-topic-all-completions-1 (dir path-index)
   "Return an alist of the man topics in directory DIR with index PATH-INDEX.
@@ -1388,55 +1391,54 @@ of the first `woman-cache-level' elements from the following list:
   ;; unnecessary.  So let us assume that `woman-file-regexp' will
   ;; filter out any directories, which probably should not be there
   ;; anyway, i.e. it is a user error!
-  (mapcar
-   (lambda (file)
-     (cons
-      (file-name-sans-extension
-       (if (string-match woman-file-compression-regexp file)
-           (file-name-sans-extension file)
-         file))
-      (if (> woman-cache-level 1)
-          (cons
-           path-index
-           (if (> woman-cache-level 2)
-               (cons file nil))))))
-   (directory-files dir nil woman-file-regexp)))
+  ;;
+  ;; Don't sort files: we do that when merging, anyway.  -- dak
+  (let (newlst (lst (directory-files dir nil woman-file-regexp t))
+               ;; Make an explicit regexp for stripping extension and
+               ;; compression extension: file-name-sans-extension is a
+               ;; far too costly function.  -- dak
+               (ext (format "\\(\\.[^.\\/]*\\)?\\(%s\\)?\\'"
+                            woman-file-compression-regexp)))
+    ;; Use a loop instead of mapcar in order to avoid the speed
+    ;; penalty of binding function arguments.  -- dak
+      (dolist (file lst newlst)
+        (push
+         (cons
+          (if (string-match ext file)
+              (substring file 0 (match-beginning 0))
+            file)
+          (and (> woman-cache-level 1)
+               (cons
+                path-index
+                (and (> woman-cache-level 2)
+                     (list file)))))
+         newlst))))
 
 (defun woman-topic-all-completions-merge (alist)
   "Merge the alist ALIST so that the keys are unique.
 Also make each path-info component into a list.
 \(Note that this function changes the value of ALIST.)"
-  ;; Intended to be fast by avoiding recursion and list copying.
-  (if (> woman-cache-level 1)
-      (let ((newalist alist))
-        (while newalist
-          (let ((tail newalist) (topic (car (car newalist))))
-            ;; Make the path-info into a list:
-            (setcdr (car newalist) (list (cdr (car newalist))))
-            (while tail
-              (while (and tail (not (string= topic (car (car (cdr tail))))))
-                (setq tail (cdr tail)))
-              (if tail                  ; merge path-info into (car newalist)
-                  (let ((path-info (cdr (car (cdr tail)))))
-                    (if (member path-info (cdr (car newalist)))
-                        ()
-                      ;; Make the path-info into a list:
-                      (nconc (car newalist) (list path-info)))
-                    (setcdr tail (cdr (cdr tail))))
-                ))
-            (setq newalist (cdr newalist))))
-        alist)
+  ;; Replaces unreadably "optimized" O(n^2) implementation.
+  ;; Instead we use sorting to merge stuff efficiently.  -- dak
+  (let (elt newalist)
+    ;; Sort list into reverse order
+    (setq alist (sort alist (lambda(x y) (string< (car y) (car x)))))
+    ;; merge duplicate keys.
+    (if (> woman-cache-level 1)
+        (while alist
+          (setq elt (pop alist))
+          (if (equal (car elt) (caar newalist))
+              (unless (member (cdr elt) (cdar newalist))
+                (setcdr (car newalist) (cons (cdr elt)
+                                             (cdar newalist))))
+            (setcdr elt (list (cdr elt)))
+            (push elt newalist)))
     ;; woman-cache-level = 1 => elements are single-element lists ...
-    (while (and alist (member (car alist) (cdr alist)))
-      (setq alist (cdr alist)))
-    (if alist
-        (let ((newalist alist) cdr_alist)
-          (while (setq cdr_alist (cdr alist))
-            (if (not (member (car cdr_alist) (cdr cdr_alist)))
-                (setq alist cdr_alist)
-              (setcdr alist (cdr cdr_alist)))
-            )
-          newalist))))
+      (while alist
+        (setq elt (pop alist))
+        (unless (equal (car elt) (caar newalist))
+          (push elt newalist))))
+    newalist))
 
 (defun woman-file-name-all-completions (topic)
   "Return an alist of the files in all man directories that match TOPIC."