Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-67

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 447-458)

   - Update from CVS
   - Update from CVS: lisp/subr.el (add-to-ordered-list): Doc fix.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 83-85)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

4 files changed, 61 insertions, 21 deletions

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3f3b385c5ed..f8da248535b 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -493,25 +493,60 @@ starting the compilation process.")
 ;; backward-compatibility alias
 (put 'compilation-info-face 'face-alias 'compilation-info)
 
+(defface compilation-error-file-name
+  '((default :inherit font-lock-warning-face)
+    (((supports :underline t)) :underline t))
+  "Face for displaying file names in compilation errors."
+  :group 'font-lock-highlighting-faces
+  :version "22.1")
+
+(defface compilation-warning-file-name
+  '((default :inherit font-lock-warning-face)
+    (((supports :underline t)) :underline t))
+  "Face for displaying file names in compilation errors."
+  :group 'font-lock-highlighting-faces
+  :version "22.1")
+
+(defface compilation-info-file-name
+  '((default :inherit compilation-info)
+    (((supports :underline t)) :underline t))
+  "Face for displaying file names in compilation errors."
+  :group 'font-lock-highlighting-faces
+  :version "22.1")
+
+(defface compilation-line-number
+  '((default :inherit font-lock-variable-name-face)
+    (((supports :underline t)) :underline t))
+  "Face for displaying file names in compilation errors."
+  :group 'font-lock-highlighting-faces
+  :version "22.1")
+
+(defface compilation-column-number
+  '((default :inherit font-lock-type-face)
+    (((supports :underline t)) :underline t))
+  "Face for displaying file names in compilation errors."
+  :group 'font-lock-highlighting-faces
+  :version "22.1")
+
 (defvar compilation-message-face nil
   "Face name to use for whole messages.
 Faces `compilation-error-face', `compilation-warning-face',
 `compilation-info-face', `compilation-line-face' and
 `compilation-column-face' get prepended to this, when applicable.")
 
-(defvar compilation-error-face 'font-lock-warning-face
+(defvar compilation-error-face 'compilation-error-file-name
   "Face name to use for file name in error messages.")
 
-(defvar compilation-warning-face 'compilation-warning
+(defvar compilation-warning-face 'compilation-warning-file-name
   "Face name to use for file name in warning messages.")
 
-(defvar compilation-info-face 'compilation-info
+(defvar compilation-info-face 'compilation-info-file-name
   "Face name to use for file name in informational messages.")
 
-(defvar compilation-line-face 'font-lock-variable-name-face
+(defvar compilation-line-face 'compilation-line-number
   "Face name to use for line number in message.")
 
-(defvar compilation-column-face 'font-lock-type-face
+(defvar compilation-column-face 'compilation-column-number
   "Face name to use for column number in message.")
 
 ;; same faces as dired uses
@@ -1342,8 +1377,9 @@ Turning the mode on runs the normal hook `compilation-minor-mode-hook'."
     (force-mode-line-update)
     (if (and opoint (< opoint omax))
         (goto-char opoint))
-    (if compilation-finish-function
-        (funcall compilation-finish-function (current-buffer) msg))
+    (with-no-warnings
+      (if compilation-finish-function
+          (funcall compilation-finish-function (current-buffer) msg)))
     (let ((functions compilation-finish-functions))
       (while functions
         (funcall (car functions) (current-buffer) msg)
@@ -1501,8 +1537,9 @@ Use this command in a compilation log buffer.  Sets the mark at point there."
 
 ;;;###autoload
 (defun compilation-next-error-function (n &optional reset)
+  "Advance to the next error message and visit the file where the error was.
+This is the value of `next-error-function' in Compilation buffers."
   (interactive "p")
-  (set-buffer (compilation-find-buffer))
   (when reset
     (setq compilation-current-error nil))
   (let* ((columns compilation-error-screen-columns) ; buffer's local value
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index d95c0294c4d..052df4eedda 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1516,7 +1516,8 @@ or as help on variables `cperl-tips', `cperl-problems',
          (t
           '((cperl-load-font-lock-keywords
              cperl-load-font-lock-keywords-1
-             cperl-load-font-lock-keywords-2)))))
+             cperl-load-font-lock-keywords-2)
+            nil nil ((?_ . "w"))))))
   (make-local-variable 'cperl-syntax-state)
   (if cperl-use-syntax-table-text-property
       (progn
@@ -3840,7 +3841,11 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
       (and (buffer-modified-p)
            (not modified)
            (set-buffer-modified-p nil))
-      (set-syntax-table cperl-mode-syntax-table))
+      ;; I do not understand what this is doing here.  It breaks font-locking
+      ;; because it resets the syntax-table from font-lock-syntax-table to
+      ;; cperl-mode-syntax-table.
+      ;; (set-syntax-table cperl-mode-syntax-table)
+      )
     (car err-l)))
 
 (defun cperl-backward-to-noncomment (lim)
@@ -4350,7 +4355,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
          fill-column)
       (let ((c (save-excursion (beginning-of-line)
                                (cperl-to-comment-or-eol) (point)))
-            (s (memq (following-char) '(?\ ?\t))) marker)
+            (s (memq (following-char) '(?\s ?\t))) marker)
         (if (>= c (point))
             ;; Don't break line inside code: only inside comment.
             nil
@@ -4361,11 +4366,11 @@ indentation and initial hashes.  Behaves usually outside of comment."
           (if (bolp) (progn (re-search-forward "#+[ \t]*")
                             (goto-char (match-end 0))))
           ;; Following space could have gone:
-          (if (or (not s) (memq (following-char) '(?\ ?\t))) nil
+          (if (or (not s) (memq (following-char) '(?\s ?\t))) nil
             (insert " ")
             (backward-char 1))
           ;; Previous space could have gone:
-          (or (memq (preceding-char) '(?\ ?\t)) (insert " "))))))
+          (or (memq (preceding-char) '(?\s ?\t)) (insert " "))))))
 
 (defun cperl-imenu-addback (lst &optional isback name)
   ;; We suppose that the lst is a DAG, unless the first element only
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index c6e85934db4..dc7e64e6e35 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2534,16 +2534,13 @@ It is saved for when this flag is not set.")
             ;; This must be outside of the save-excursion
             ;; in case the source file is our current buffer.
             (if process-window
-                (save-selected-window
-                  (select-window process-window)
-                  (gud-display-frame))
+                (progn
+                (with-selected-window process-window
+                  (gud-display-frame)))
               ;; We have to be in the proper buffer, (process-buffer proc),
               ;; but not in a save-excursion, because that would restore point.
-              (let ((old-buf (current-buffer)))
-                (set-buffer (process-buffer proc))
-                (unwind-protect
-                    (gud-display-frame)
-                  (set-buffer old-buf)))))
+              (with-current-buffer (process-buffer proc)
+                (gud-display-frame))))
 
           ;; If we deferred text that arrived during this processing,
           ;; handle it now.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 3f556bdb695..70ea8b4bac6 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -949,6 +949,7 @@ See `python-check-command' for the default."
                                     (if name
                                         (file-name-nondirectory name))))))))
   (setq python-saved-check-command command)
+  (require 'compile)                    ;To define compilation-* variables.
   (save-some-buffers (not compilation-ask-about-save) nil)
   (let ((compilation-error-regexp-alist
          (cons '("(\\([^,]+\\), line \\([0-9]+\\))" 1 2)