Merged in changes from CVS trunk.

Patches applied:

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

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

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

diff --combined lisp/simple.el
index 13cb63a,6287090..92cdb33
--- 1/lisp/simple.el
--- 2/lisp/simple.el
+++ b/lisp/simple.el
@@@ -987,7 -987,7 +987,7 @@@ as an argument limits undo to changes w
        (undo-start))
        ;; get rid of initial undo boundary
        (undo-more 1))
-     ;; If we got this far, the next command should be a consecutive undo. 
+     ;; If we got this far, the next command should be a consecutive undo.
      (setq this-command 'undo)
      ;; Check to see whether we're hitting a redo record, and if
      ;; so, ask the user whether she wants to skip the redo/undo pair.
@@@ -1788,8 -1788,6 +1788,8 @@@ the text which should be made available
  The second, optional, argument PUSH, has the same meaning as the
  similar argument to `x-set-cut-buffer', which see.")
  
 +(make-variable-frame-local 'interprogram-cut-function)
 +
  (defvar interprogram-paste-function nil
    "Function to call to get text cut from other programs.
  
@@@ -1810,8 -1808,6 +1810,8 @@@ most recent string, the function shoul
  difficult to tell whether Emacs or some other program provided the
  current string, it is probably good enough to return nil if the string
  is equal (according to `string=') to the last text Emacs provided.")
 +
 +(make-variable-frame-local 'interprogram-paste-function)
  \f
  
  
@@@ -4120,12 -4116,12 +4120,12 @@@ The completion list buffer is availabl
  
  ;; This function goes in completion-setup-hook, so that it is called
  ;; after the text of the completion list buffer is written.
- (defface completion-emphasis 
+ (defface completions-first-difference
    '((t (:inherit bold)))
    "Face put on the first uncommon character in completions in *Completions* buffer."
    :group 'completion)
  
- (defface completion-de-emphasis 
+ (defface completions-common-part
    '((t (:inherit default)))
    "Face put on the common prefix substring in completions in *Completions* buffer."
    :group 'completion)
@@@ -4158,26 -4154,28 +4158,28 @@@
        (save-match-data
          (if (minibufferp mainbuf)
              (setq completion-base-size 0))))
-        ;; Put emphasis and de-emphasis faces on completions.
+        ;; Put faces on first uncommon characters and common parts.
        (when completion-base-size
-       (let ((common-string-length (length 
-                                    (substring mbuf-contents 
-                                               completion-base-size)))
-             (element-start (next-single-property-change 
-                             (point-min)
-                             'mouse-face))
-             element-common-end)
-         (while element-start
-           (setq element-common-end  (+ element-start common-string-length))
+       (let* ((common-string-length (length
+                                     (substring mbuf-contents
+                                                completion-base-size)))
+              (element-start (next-single-property-change
+                              (point-min)
+                              'mouse-face))
+              (element-common-end (+ element-start common-string-length))
+              (maxp (point-max)))
+         (while (and element-start (< element-common-end maxp))
            (when (and (get-char-property element-start 'mouse-face)
                       (get-char-property element-common-end 'mouse-face))
              (put-text-property element-start element-common-end
-                                'font-lock-face 'completion-de-emphasis)
+                                'font-lock-face 'completions-common-part)
              (put-text-property element-common-end (1+ element-common-end)
-                                'font-lock-face 'completion-emphasis))
-           (setq element-start (next-single-property-change 
+                                'font-lock-face 'completions-first-difference))
+           (setq element-start (next-single-property-change
                                 element-start
-                                'mouse-face)))))
+                                'mouse-face))
+           (if element-start
+               (setq element-common-end  (+ element-start common-string-length))))))
        ;; Insert help string.
        (goto-char (point-min))
        (if (display-mouse-p)

diff --combined lisp/vc-hooks.el
index e223599,e7278dc..32908a2
--- 1/lisp/vc-hooks.el
--- 2/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@@ -6,7 -6,7 +6,7 @@@
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
  
 -;; $Id: vc-hooks.el,v 1.166 2004/04/11 15:03:21 spiegel Exp $
 +;; $Id$
  
  ;; This file is part of GNU Emacs.
  
@@@ -475,7 -475,7 +475,7 @@@ Return non-nil if FILE is unchanged.
                                (vc-find-backend-function (vc-backend file)
                                                          'diff))))
                      (not (eq (caddr err) 5)))
-                 (signal wrong-number-of-arguments err)
+                 (signal 'wrong-number-of-arguments err)
                (vc-call diff file))))))
  
  (defun vc-workfile-version (file)

diff --combined lisp/vc.el
index 40afba8,676b6bd..ba1972a
--- 1/lisp/vc.el
--- 2/lisp/vc.el
+++ b/lisp/vc.el
@@@ -7,7 -7,7 +7,7 @@@
  ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
  ;; Keywords: tools
  
 -;; $Id: vc.el,v 1.375 2004/04/11 15:05:18 spiegel Exp $
 +;; $Id$
  
  ;; This file is part of GNU Emacs.
  
@@@ -2361,7 -2361,7 +2361,7 @@@ If FOCUS-REV is non-nil, leave the poin
                           (vc-find-backend-function (vc-backend file) 
                                                     'print-log))))
                 (not (eq (caddr err) 2)))
-            (signal wrong-number-of-arguments err)
+            (signal 'wrong-number-of-arguments err)
           ;; for backward compatibility
           (vc-call print-log file)
           (set-buffer "*vc*"))))