Merged in changes from CVS trunk.

Patches applied:

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

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

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


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

5 files changed, 97 insertions, 75 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 57ee67c60b5..ea1392783f6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-28  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * custom.el (defcustom): Doc fix.
+
+2004-07-28  Masatake YAMATO  <jet@gyve.org>
+
+        * progmodes/etags.el (etags-tags-apropos): Show building progress.
+
 2004-07-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * imenu.el (imenu-prev-index-position-function)
@@ -42,12 +50,17 @@
 
 2004-07-22  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
-        * ps-print.el: Doc fix.  Improve the DSC compliance of the generated
-        PostScript.  Suggested by Michael Piotrowski <mxp@dynalabs.de>.
+        * ps-print.el: Doc fix.
         (ps-print-version): New version 6.6.5.
         (ps-printing-region): Doc fix.
         (ps-generate-string-list): Comment fix.
-        (ps-message-log-max, ps-begin-file): Code fix.
+        (ps-message-log-max): Code fix.
+
+
+2004-07-22  Michael Piotrowski  <mxp@dynalabs.de>  (tiny change)
+
+        * ps-print.el (ps-begin-file): Improve the DSC compliance of the
+        generated PostScript.
 
 2004-07-22  Kim F. Storm  <storm@cua.dk>
 
diff --git a/lisp/custom.el b/lisp/custom.el
index e86308c95e7..2ddd7ceb943 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -246,6 +246,13 @@ The following keywords are meaningful:
         Specifies that SYMBOL should be set after the list of variables
         VARIABLES when both have been customized.
 
+If SYMBOL has a local binding, then this form affects the local
+binding.  This is normally not what you want.  Thus, if you need
+to load a file defining variables with this form, or with
+`defvar' or `defconst', you should always load that file
+_outside_ any bindings for these variables.  \(`defvar' and
+`defconst' behave similarly in this respect.)
+
 Read the section about customization in the Emacs Lisp manual for more
 information."
   ;; It is better not to use backquote in this file,
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 3592a6ac779..d275e48e482 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -358,8 +358,9 @@ Each element in a user-level keywords list should have one of these forms:
  (eval . FORM)
 
 where MATCHER can be either the regexp to search for, or the function name to
-call to make the search (called with one argument, the limit of the search) and
-return non-nil if it succeeds (and set `match-data' appropriately).
+call to make the search (called with one argument, the limit of the search;
+it should return non-nil, move point, and set `match-data' appropriately iff
+it succeeds; like `re-search-forward' would).
 MATCHER regexps can be generated via the function `regexp-opt'.
 
 FORM is an expression, whose value should be a keyword element, evaluated when
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 184077f6a3a..4464df3a916 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1453,53 +1453,58 @@ where they were found."
     (tags-with-face 'highlight (princ buffer-file-name))
     (princ "':\n\n"))
   (goto-char (point-min))
-  (while (re-search-forward string nil t)
-    (beginning-of-line)
+  (let ((point-max (/ (float (point-max)) 100.0)))
+    (while (re-search-forward string nil t)
+      (message "Making tags apropos buffer for `%s'...%d%%"
+               string
+               (/ (point) point-max))
+      (beginning-of-line)
 
-    (let* (;; Get the local value in the tags table
-           ;; buffer before switching buffers.
-           (goto-func goto-tag-location-function)
-           (tag-info (save-excursion (funcall snarf-tag-function)))
-           (tag (if (eq t (car tag-info)) nil (car tag-info)))
-           (file-path (save-excursion (if tag (file-of-tag)
-                                        (save-excursion (next-line 1)
-                                                        (file-of-tag)))))
-           (file-label (if tag (file-of-tag t)
-                         (save-excursion (next-line 1)
-                                         (file-of-tag t))))
-           (pt (with-current-buffer standard-output (point))))
-      (if tag
-          (progn
-            (princ (format "[%s]: " file-label))
-            (princ tag)
-            (when (= (aref tag 0) ?\() (princ " ...)"))
-            (with-current-buffer standard-output
-              (make-text-button pt (point)
-                                'tag-info tag-info
-                                'file-path file-path
-                                'goto-func goto-func
-                                'action (lambda (button)
-                                          (let ((tag-info (button-get button 'tag-info))
-                                                (goto-func (button-get button 'goto-func)))
-                                            (tag-find-file-of-tag (button-get button 'file-path))
-                                            (widen)
-                                            (funcall goto-func tag-info)))
-                                'face 'tags-tag-face
-                                'type 'button)))
-        (princ (format "- %s" file-label))
-        (with-current-buffer standard-output
-          (make-text-button pt (point)
-                            'file-path file-path
-                            'action (lambda (button)
-                                      (tag-find-file-of-tag (button-get button 'file-path))
-                                      ;; Get the local value in the tags table
-                                      ;; buffer before switching buffers.
-                                      (goto-char (point-min)))
-                            'face 'tags-tag-face
-                            'type 'button))
-        ))
-    (terpri)
-    (forward-line 1))
+      (let* ( ;; Get the local value in the tags table
+             ;; buffer before switching buffers.
+             (goto-func goto-tag-location-function)
+             (tag-info (save-excursion (funcall snarf-tag-function)))
+             (tag (if (eq t (car tag-info)) nil (car tag-info)))
+             (file-path (save-excursion (if tag (file-of-tag)
+                                          (save-excursion (next-line 1)
+                                                          (file-of-tag)))))
+             (file-label (if tag (file-of-tag t)
+                           (save-excursion (next-line 1)
+                                           (file-of-tag t))))
+             (pt (with-current-buffer standard-output (point))))
+        (if tag
+            (progn
+              (princ (format "[%s]: " file-label))
+              (princ tag)
+              (when (= (aref tag 0) ?\() (princ " ...)"))
+              (with-current-buffer standard-output
+                (make-text-button pt (point)
+                                  'tag-info tag-info
+                                  'file-path file-path
+                                  'goto-func goto-func
+                                  'action (lambda (button)
+                                            (let ((tag-info (button-get button 'tag-info))
+                                                  (goto-func (button-get button 'goto-func)))
+                                              (tag-find-file-of-tag (button-get button 'file-path))
+                                              (widen)
+                                              (funcall goto-func tag-info)))
+                                  'face 'tags-tag-face
+                                  'type 'button)))
+          (princ (format "- %s" file-label))
+          (with-current-buffer standard-output
+            (make-text-button pt (point)
+                              'file-path file-path
+                              'action (lambda (button)
+                                        (tag-find-file-of-tag (button-get button 'file-path))
+                                        ;; Get the local value in the tags table
+                                        ;; buffer before switching buffers.
+                                        (goto-char (point-min)))
+                              'face 'tags-tag-face
+                              'type 'button))
+          ))
+      (terpri)
+      (forward-line 1))
+    (message nil))
   (when tags-apropos-verbose (princ "\n")))
 
 (defun etags-tags-table-files ()
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 9dca7986e7c..78a558baebe 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -5576,17 +5576,15 @@ XSTART YSTART are the relative position for the first page in a sheet.")
     (setq ps-background-all-pages (nreverse ps-background-all-pages)
           ps-background-pages (nreverse ps-background-pages))
 
-    (ps-output "\n" ps-print-prologue-1)
-
-    (ps-output "\n/printGlobalBackground{\n")
+    (ps-output "\n" ps-print-prologue-1
+               "\n/printGlobalBackground{\n")
     (mapcar 'ps-output ps-background-all-pages)
-    (ps-output "}def\n/printLocalBackground{\n}def\n")
-
-    (ps-output "\n%%EndProlog\n\n%%BeginSetup\n")
-
     (ps-output
+     "}def\n/printLocalBackground{\n}def\n"
+     "\n%%EndProlog\n\n%%BeginSetup\n"
      "\n%%IncludeResource: font Times-Roman"
-     "\n%%IncludeResource: font Times-Italic\n%%IncludeResource: font "
+     "\n%%IncludeResource: font Times-Italic"
+     "\n%%IncludeResource: font "
      (mapconcat 'identity
                 (ps-remove-duplicates
                  (append (ps-fonts 'ps-font-for-text)
@@ -5595,22 +5593,20 @@ XSTART YSTART are the relative position for the first page in a sheet.")
                                (ps-font 'ps-font-for-footer 'normal)
                                (ps-font 'ps-font-for-footer 'bold))))
                 "\n%%IncludeResource: font ")
-     "\n")
-
-    ;; Header/line number fonts
-    (ps-output (format "/h0 %s(%s)cvn DefFont\n" ; /h0 14/Helvetica-Bold DefFont
-                       ps-header-title-font-size-internal
-                       (ps-font 'ps-font-for-header 'bold))
-               (format "/h1 %s(%s)cvn DefFont\n" ; /h1 12/Helvetica DefFont
-                       ps-header-font-size-internal
-                       (ps-font 'ps-font-for-header 'normal))
-               (format "/L0 %s(%s)cvn DefFont\n" ; /L0 6/Times-Italic DefFont
-                       (ps-get-font-size 'ps-line-number-font-size)
-                       ps-line-number-font)
-               (format "/H0 %s(%s)cvn DefFont\n" ; /H0 12/Helvetica DefFont
-                       ps-footer-font-size-internal
-                       (ps-font 'ps-font-for-footer 'normal))
-               "\n\n% ---- These lines must be kept together because...
+     ;; Header/line number fonts
+     (format "\n/h0 %s(%s)cvn DefFont\n" ; /h0 14/Helvetica-Bold DefFont
+             ps-header-title-font-size-internal
+             (ps-font 'ps-font-for-header 'bold))
+     (format "/h1 %s(%s)cvn DefFont\n"  ; /h1 12/Helvetica DefFont
+             ps-header-font-size-internal
+             (ps-font 'ps-font-for-header 'normal))
+     (format "/L0 %s(%s)cvn DefFont\n"  ; /L0 6/Times-Italic DefFont
+             (ps-get-font-size 'ps-line-number-font-size)
+             ps-line-number-font)
+     (format "/H0 %s(%s)cvn DefFont\n"  ; /H0 12/Helvetica DefFont
+             ps-footer-font-size-internal
+             (ps-font 'ps-font-for-footer 'normal))
+     "\n\n% ---- These lines must be kept together because...
 
 /h0 F
 /HeaderTitleLineHeight FontHeight def