Merged from miles@gnu.org--gnu-2005 (patch 118-132, 551-577)

Patches applied:

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-553
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-555
   Remove CVS keywords from newsticker files

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-561
   Merge from gnus--rel--5.10

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-564
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-566
   Merge from gnus--rel--5.10

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-572
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-574
   Merge from gnus--rel--5.10

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-118
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-119
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-120
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-121
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-122
   Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-123
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-124
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-125
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-126
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-127
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-128
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-129
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-130
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-131
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-132
   Update from CVS

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

22 files changed, 274 insertions, 142 deletions

diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 3b6a6d611d2..6a6d63a169a 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -1539,7 +1539,7 @@ word itself has a special casing."
 
     (ada-save-exceptions-to-file file-name)
 
-    (message (concat "Defining " word " as a casing exception"))))
+    (message "%s" (concat "Defining " word " as a casing exception"))))
 
 (defun ada-case-read-exceptions-from-file (file-name)
   "Read the content of the casing exception file FILE-NAME."
@@ -2191,17 +2191,17 @@ This function is intended to be bound to the C-m and C-j keys."
 
       (if (equal (cdr cur-indent) '(0))
           (message (concat "same indentation as line " (number-to-string line)))
-        (message (mapconcat (lambda(x)
-                              (cond
-                               ((symbolp x)
-                                (symbol-name x))
-                               ((numberp x)
-                                (number-to-string x))
-                               ((listp x)
-                                (concat "- " (symbol-name (cadr x))))
-                               ))
-                            (cdr cur-indent)
-                            " + "))))
+        (message "%s" (mapconcat (lambda(x)
+                                   (cond
+                                    ((symbolp x)
+                                     (symbol-name x))
+                                    ((numberp x)
+                                     (number-to-string x))
+                                    ((listp x)
+                                     (concat "- " (symbol-name (cadr x))))
+                                    ))
+                                 (cdr cur-indent)
+                                 " + "))))
     (save-excursion
       (goto-char (car cur-indent))
       (sit-for 1))))
@@ -2214,7 +2214,7 @@ command like:
 
   (while command-line-args-left
     (let ((source (car command-line-args-left)))
-      (message (concat "formating " source))
+      (message "Formating %s" source)
       (find-file source)
       (ada-indent-region (point-min) (point-max))
       (ada-adjust-case-buffer)
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 74b5694e8c3..241296d8f67 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -325,7 +325,7 @@ replaced by the name including the extension."
       ;; Check if there is an environment variable with the same name
       (if (null value)
           (if (not (setq value (getenv name)))
-              (message (concat "No environment variable " name " found"))))
+              (message "%s" (concat "No environment variable " name " found"))))
 
       (cond
        ((null value)
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 039ef3ccebf..42808c3e307 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -907,7 +907,8 @@ is nil."
              ;; be most disruptive.  We'll blink it ourselves
              ;; afterwards.
              (old-blink-paren blink-paren-function)
-             blink-paren-function)
+             blink-paren-function
+             (noblink (eq last-input-event ?\()))
         (self-insert-command (prefix-numeric-value arg))
         (if c-syntactic-indentation
             (indent-according-to-mode))
@@ -982,6 +983,7 @@ is nil."
                  (delete-region beg end))))
         (and (not executing-kbd-macro)
              old-blink-paren
+             (not noblink)
              (funcall old-blink-paren))))))
 
 (defun c-electric-continued-statement ()
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 8f5670ed57b..63c6aad3aa1 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -395,11 +395,6 @@ that requires a literal mode spec at compile time."
   (make-local-variable 'comment-end)
   (make-local-variable 'comment-start-skip)
   (make-local-variable 'comment-multi-line)
-  (make-local-variable 'paragraph-start)
-  (make-local-variable 'paragraph-separate)
-  (make-local-variable 'paragraph-ignore-fill-prefix)
-  (make-local-variable 'adaptive-fill-mode)
-  (make-local-variable 'adaptive-fill-regexp)
 
   ;; now set their values
   (setq parse-sexp-ignore-comments t
@@ -519,6 +514,7 @@ This does not load the font-lock package.  Use after
           nil nil
           ,c-identifier-syntax-modifications
           c-beginning-of-syntax
+          (font-lock-lines-before . 1)
           (font-lock-mark-block-function
            . c-mark-function)))
   (add-hook 'font-lock-mode-hook 'c-after-font-lock-init nil t))
@@ -1179,5 +1175,5 @@ Key bindings:
 
 (cc-provide 'cc-mode)
 
-;;; arch-tag: 7825e5c4-fd09-439f-a04d-4c13208ba3d7
+;; arch-tag: 7825e5c4-fd09-439f-a04d-4c13208ba3d7
 ;;; cc-mode.el ends here
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index f0a7a2c4b7c..f20eb8e57de 100644
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -498,33 +498,34 @@ variables."
   (let ((comment-line-prefix
          (concat "[ \t]*\\(" c-current-comment-prefix "\\)[ \t]*")))
 
-    (setq paragraph-start (concat comment-line-prefix
-                                  c-paragraph-start
-                                  "\\|"
-                                  page-delimiter)
-          paragraph-separate (concat comment-line-prefix
-                                     c-paragraph-separate
-                                     "\\|"
-                                     page-delimiter)
-          paragraph-ignore-fill-prefix t
-          adaptive-fill-mode t
-          adaptive-fill-regexp
-          (concat comment-line-prefix
-                  (if (default-value 'adaptive-fill-regexp)
-                      (concat "\\("
-                              (default-value 'adaptive-fill-regexp)
-                              "\\)")
-                    "")))
+    (set (make-local-variable 'paragraph-start)
+         (concat comment-line-prefix
+                 c-paragraph-start
+                 "\\|"
+                 page-delimiter))
+    (set (make-local-variable 'paragraph-separate)
+         (concat comment-line-prefix
+                 c-paragraph-separate
+                 "\\|"
+                 page-delimiter))
+    (set (make-local-variable 'paragraph-ignore-fill-prefix) t)
+    (set (make-local-variable 'adaptive-fill-mode) t)
+    (set (make-local-variable 'adaptive-fill-regexp)
+         (concat comment-line-prefix
+                 (if (default-value 'adaptive-fill-regexp)
+                     (concat "\\("
+                             (default-value 'adaptive-fill-regexp)
+                             "\\)")
+                   "")))
 
     (when (boundp 'adaptive-fill-first-line-regexp)
       ;; XEmacs (20.x) adaptive fill mode doesn't have this.
-      (make-local-variable 'adaptive-fill-first-line-regexp)
-      (setq adaptive-fill-first-line-regexp
-            (concat "\\`" comment-line-prefix
-                    ;; Maybe we should incorporate the old value here,
-                    ;; but then we have to do all sorts of kludges to
-                    ;; deal with the \` and \' it probably contains.
-                    "\\'")))))
+      (set (make-local-variable 'adaptive-fill-first-line-regexp)
+           (concat "\\`" comment-line-prefix
+                   ;; Maybe we should incorporate the old value here,
+                   ;; but then we have to do all sorts of kludges to
+                   ;; deal with the \` and \' it probably contains.
+                   "\\'")))))
 
 
 ;; Helper for setting up Filladapt mode.  It's not used by CC Mode itself.
@@ -626,5 +627,5 @@ any reason to call this function directly."
 
 (cc-provide 'cc-styles)
 
-;;; arch-tag: c764f61a-96ba-484a-a68f-101c0e9d5d2c
+;; arch-tag: c764f61a-96ba-484a-a68f-101c0e9d5d2c
 ;;; cc-styles.el ends here
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index e2bcf984586..b3051f37b9d 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -346,13 +346,13 @@ Optional arg DISPLAY non-nil means show messages in the echo area."
                     (format "\n#line %d \"%s\"\n" startlinenum filename)))
 
           ;; Call the preprocessor.
-          (if display (message mymsg))
+          (if display (message "%s" mymsg))
           (setq exit-status
                 (call-process-region 1 (point-max)
                                      shell-file-name
                                      t (list t tempname) nil "-c"
                                      cppcommand))
-          (if display (message (concat mymsg "done")))
+          (if display (message "%s" (concat mymsg "done")))
           (if (= (buffer-size) 0)
               ;; Empty output is normal after a fatal error.
               (insert "\nPreprocessor produced no output\n")
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index f29051ab0b0..269fbeaf137 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -490,7 +490,7 @@ starting the compilation process.")
 (defface compilation-error
   '((t :inherit font-lock-warning-face))
   "Face used to highlight compiler errors."
-  :group 'font-lock-highlighting-faces
+  :group 'compilation
   :version "22.1")
 
 (defface compilation-warning
@@ -498,7 +498,7 @@ starting the compilation process.")
     (((class color)) (:foreground "cyan" :weight bold))
     (t (:weight bold)))
   "Face used to highlight compiler warnings."
-  :group 'font-lock-highlighting-faces
+  :group 'compilation
   :version "22.1")
 
 (defface compilation-info
@@ -511,19 +511,19 @@ starting the compilation process.")
     (((class color)) (:foreground "green" :weight bold))
     (t (:weight bold)))
   "Face used to highlight compiler information."
-  :group 'font-lock-highlighting-faces
+  :group 'compilation
   :version "22.1")
 
 (defface compilation-line-number
   '((t :inherit font-lock-variable-name-face))
   "Face for displaying line numbers in compiler messages."
-  :group 'font-lock-highlighting-faces
+  :group 'compilation
   :version "22.1")
 
 (defface compilation-column-number
   '((t :inherit font-lock-type-face))
   "Face for displaying column numbers in compiler messages."
-  :group 'font-lock-highlighting-faces
+  :group 'compilation
   :version "22.1")
 
 (defvar compilation-message-face 'underline
@@ -614,6 +614,7 @@ Faces `compilation-error-face', `compilation-warning-face',
 ;; This function is the central driver, called when font-locking to gather
 ;; all information needed to later jump to corresponding source code.
 ;; Return a property list with all meta information on this error location.
+
 (defun compilation-error-properties (file line end-line col end-col type fmt)
   (unless (< (next-single-property-change (match-beginning 0) 'directory nil (point))
              (point))
@@ -628,11 +629,22 @@ Faces `compilation-error-face', `compilation-warning-face',
                                     (get-text-property dir 'directory)))))
             (setq file (cons file (car dir)))))
       ;; This message didn't mention one, get it from previous
-      (setq file (previous-single-property-change (point) 'message)
-            file (or (if file
-                         (car (nth 2 (car (or (get-text-property (1- file) 'message)
-                                         (get-text-property file 'message))))))
-                     '("*unknown*"))))
+      (let ((prev-pos
+             ;; Find the previous message.
+             (previous-single-property-change (point) 'message)))
+        (if prev-pos
+            ;; Get the file structure that belongs to it.
+            (let* ((prev
+                    (or (get-text-property (1- prev-pos) 'message)
+                        (get-text-property prev-pos 'message)))
+                   (prev-struct
+                    (car (nth 2 (car prev)))))
+              ;; Construct FILE . DIR from that.
+              (if prev-struct
+                  (setq file (cons (car prev-struct)
+                                   (cadr prev-struct))))))
+        (unless file
+          (setq file '("*unknown*")))))
     ;; All of these fields are optional, get them only if we have an index, and
     ;; it matched some part of the message.
     (and line
@@ -887,19 +899,20 @@ visible rather than the beginning."
   :group 'compilation)
 
 
-(defun compilation-buffer-name (mode-name name-function)
+(defun compilation-buffer-name (mode-name mode-command name-function)
   "Return the name of a compilation buffer to use.
 If NAME-FUNCTION is non-nil, call it with one argument MODE-NAME
 to determine the buffer name.
 Likewise if `compilation-buffer-name-function' is non-nil.
-If current buffer is in Compilation mode for the same mode name
+If current buffer is the mode MODE-COMMAND,
 return the name of the current buffer, so that it gets reused.
 Otherwise, construct a buffer name from MODE-NAME."
   (cond (name-function
          (funcall name-function mode-name))
         (compilation-buffer-name-function
          (funcall compilation-buffer-name-function mode-name))
-        ((eq major-mode (nth 1 compilation-arguments))
+        ((and (eq mode-command major-mode)
+              (eq major-mode (nth 1 compilation-arguments)))
          (buffer-name))
         (t
          (concat "*" (downcase mode-name) "*"))))
@@ -948,7 +961,7 @@ Returns the compilation buffer created."
     (with-current-buffer
         (setq outbuf
               (get-buffer-create
-               (compilation-buffer-name name-of-mode name-function)))
+               (compilation-buffer-name name-of-mode mode name-function)))
       (let ((comp-proc (get-buffer-process (current-buffer))))
         (if comp-proc
             (if (or (not (eq (process-status comp-proc) 'run))
@@ -1540,7 +1553,7 @@ Use this command in a compilation log buffer.  Sets the mark at point there."
       (dired-other-window (car (get-text-property (point) 'directory)))
     (push-mark)
     (setq compilation-current-error (point))
-    (next-error 0)))
+    (next-error-internal)))
 
 ;; Return a compilation buffer.
 ;; If the current buffer is a compilation buffer, return it.
@@ -1778,7 +1791,7 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
                                     marker)
             (let ((name (expand-file-name
                          (read-file-name
-                          (format "Find this %s in: (default %s) "
+                          (format "Find this %s in (default %s): "
                                   compilation-error filename)
                           spec-dir filename t))))
               (if (file-directory-p name)
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 72603722dc2..18d88c92699 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -5,7 +5,7 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/11/19 22:30:34 vinicius>
+;; Time-stamp: <2005-09-18 07:27:20 deego>
 ;; Keywords: wp, ebnf, PostScript
 ;; Version: 4.2
 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
@@ -4261,7 +4261,7 @@ end
               ebnf-eps-max-height prod-height))
        )
       (setq ebnf-eps-prod-width prod-width)
-      (insert-buffer eps-buffer))
+      (insert-buffer-substring eps-buffer))
     (setq prod-list (cdr prod-list))))
 
 
@@ -4674,7 +4674,7 @@ killed after process termination."
       (goto-char the-point)
       (if ebnf-stop-on-error
           (error error-msg)
-        (message error-msg)))
+        (message "%s" error-msg)))
      ;; generated output OK
      (gen-func
       nil)
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 49d0207882c..47e9a12f235 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -1798,7 +1798,7 @@ INFO is a list (TREE-HEADER TREE-OR-MEMBER MEMBER-LIST)."
       ;; START will be 0.
       (when (and (boundp 'ebrowse-debug)
                  (symbol-value 'ebrowse-debug))
-        (y-or-n-p (format "start = %d" start))
+        (y-or-n-p (format "start = %d? " start))
         (y-or-n-p pattern))
       (setf found
             (loop do (goto-char (max (point-min) (- start offset)))
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 54b4cda9d18..ea87dce591f 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -284,7 +284,7 @@ With a prefix arg, set the buffer-local value instead.
 When you find a tag with \\[find-tag], the buffer it finds the tag
 in is given a local value of this variable which is the name of the tags
 file the tag was in."
-  (interactive (list (read-file-name "Visit tags table: (default TAGS) "
+  (interactive (list (read-file-name "Visit tags table (default TAGS): "
                                      default-directory
                                      (expand-file-name "TAGS"
                                                        default-directory)
@@ -590,7 +590,7 @@ Returns t if it visits a tags table, or nil if there are no more in the list."
                   (car list))
                 ;; Finally, prompt the user for a file name.
                 (expand-file-name
-                 (read-file-name "Visit tags table: (default TAGS) "
+                 (read-file-name "Visit tags table (default TAGS): "
                                  default-directory
                                  "TAGS"
                                  t))))))
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index e5089d84fb0..9ceee6f6920 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -183,7 +183,7 @@ TEXT is a format control string, and the remaining arguments ARGS
 are the string substitutions (see `format')."
   (if (<= level flymake-log-level)
       (let* ((msg (apply 'format text args)))
-        (message msg)
+        (message "%s" msg)
         ;;(with-temp-buffer
         ;;    (insert msg)
         ;;   (insert "\n")
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 6c960c4c5d5..c8d99dbe3e2 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1337,8 +1337,11 @@ static char *magick[] = {
                 (setq bptno (match-string 1))
                 (setq flag (char-after (match-beginning 2)))
                 (beginning-of-line)
-                (if (re-search-forward " in .* at\\s-+" nil t)
+                (if (re-search-forward " in \\(.*\\) at\\s-+" nil t)
                     (progn
+                      (let ((buffer-read-only nil))
+                        (add-text-properties (match-beginning 1) (match-end 1)
+                                             '(face font-lock-function-name-face)))
                       (looking-at "\\(\\S-+\\):\\([0-9]+\\)")
                       (let ((line (match-string 2)) (buffer-read-only nil)
                             (file (match-string 1)))
@@ -1531,17 +1534,31 @@ static char *magick[] = {
 (defun gdb-info-frames-custom ()
   (with-current-buffer (gdb-get-buffer 'gdb-stack-buffer)
     (save-excursion
-      (let ((buffer-read-only nil))
+      (let ((buffer-read-only nil)
+            bl el)
         (goto-char (point-min))
         (while (< (point) (point-max))
-          (add-text-properties (line-beginning-position) (line-end-position)
+          (setq bl (line-beginning-position)
+                el (line-end-position))
+          (add-text-properties bl el
                              '(mouse-face highlight
                                help-echo "mouse-2, RET: Select frame"))
-          (beginning-of-line)
-          (when (and (looking-at "^#\\([0-9]+\\)")
-                     (equal (match-string 1) gdb-frame-number))
-            (put-text-property (line-beginning-position) (line-end-position)
-                               'face '(:inverse-video t)))
+          (goto-char bl)
+          (when (looking-at "^#\\([0-9]+\\)")
+            (if (equal (match-string 1) gdb-frame-number)
+                (put-text-property bl el 'face '(:inverse-video t))
+              (when (re-search-forward " in \\([^ ]+\\) (" el t)
+                (put-text-property (match-beginning 1) (match-end 1)
+                                   'face font-lock-function-name-face)
+                (setq bl (match-end 0))
+                (while (re-search-forward "<\\([^>]+\\)>" el t)
+                  (put-text-property (match-beginning 1) (match-end 1)
+                                     'face font-lock-function-name-face))
+                (goto-char bl)
+                (while (re-search-forward "\\(\\(\\sw\\|[_.]\\)+\\)=" el t)
+                  (put-text-property (match-beginning 1) (match-end 1)
+                                     'face font-lock-variable-name-face))
+                )))
           (forward-line 1))))))
 
 (defun gdb-stack-buffer-name ()
@@ -1648,6 +1665,14 @@ static char *magick[] = {
     (define-key map [mouse-2] 'gdb-threads-select)
     map))
 
+(defvar gdb-threads-font-lock-keywords
+  '(
+    (") +\\([^ ]+\\) ("  (1 font-lock-function-name-face))
+    ("in \\([^ ]+\\) ("  (1 font-lock-function-name-face))
+    ("\\(\\(\\sw\\|[_.]\\)+\\)="  (1 font-lock-variable-name-face))
+    )
+  "Font lock keywords used in `gdb-threads-mode'.")
+
 (defun gdb-threads-mode ()
   "Major mode for gdb frames.
 
@@ -1657,6 +1682,8 @@ static char *magick[] = {
   (setq mode-name "Threads")
   (setq buffer-read-only t)
   (use-local-map gdb-threads-mode-map)
+  (set (make-local-variable 'font-lock-defaults)
+       '(gdb-threads-font-lock-keywords))
   (run-mode-hooks 'gdb-threads-mode-hook)
   'gdb-invalidate-threads)
 
@@ -1702,6 +1729,12 @@ static char *magick[] = {
     (define-key map "q" 'kill-this-buffer)
      map))
 
+(defvar gdb-registers-font-lock-keywords
+  '(
+    ("^[^ ]+" . font-lock-variable-name-face)
+    )
+  "Font lock keywords used in `gdb-registers-mode'.")
+
 (defun gdb-registers-mode ()
   "Major mode for gdb registers.
 
@@ -1711,6 +1744,8 @@ static char *magick[] = {
   (setq mode-name "Registers:")
   (setq buffer-read-only t)
   (use-local-map gdb-registers-mode-map)
+  (set (make-local-variable 'font-lock-defaults)
+       '(gdb-registers-font-lock-keywords))
   (run-mode-hooks 'gdb-registers-mode-hook)
   (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
       'gdb-invalidate-registers
@@ -1955,6 +1990,12 @@ corresponding to the mode line clicked."
     (define-key map (vector 'header-line 'down-mouse-1) 'ignore)
     map))
 
+(defvar gdb-memory-font-lock-keywords
+  '(;; <__function.name+n>
+    ("<\\(\\(\\sw\\|[_.]\\)+\\)\\(\\+[0-9]+\\)?>" (1 font-lock-function-name-face))
+    )
+  "Font lock keywords used in `gdb-memory-mode'.")
+
 (defun gdb-memory-mode ()
   "Major mode for examining memory.
 
@@ -2026,6 +2067,8 @@ corresponding to the mode line clicked."
                        'help-echo "mouse-3: Select unit size"
                        'mouse-face 'mode-line-highlight
                        'local-map gdb-memory-unit-keymap))))
+  (set (make-local-variable 'font-lock-defaults)
+       '(gdb-memory-font-lock-keywords))
   (run-mode-hooks 'gdb-memory-mode-hook)
   'gdb-invalidate-memory)
 
@@ -2094,6 +2137,23 @@ corresponding to the mode line clicked."
     (define-key map "q" 'kill-this-buffer)
      map))
 
+(defvar gdb-local-font-lock-keywords
+  '(
+    ;; var = (struct struct_tag) value
+    ( "\\(^\\(\\sw\\|[_.]\\)+\\) += +(\\(struct\\) \\(\\(\\sw\\|[_.]\\)+\\)"
+      (1 font-lock-variable-name-face)
+      (3 font-lock-keyword-face)
+      (4 font-lock-type-face))
+    ;; var = (type) value 
+    ( "\\(^\\(\\sw\\|[_.]\\)+\\) += +(\\(\\(\\sw\\|[_.]\\)+\\)"
+      (1 font-lock-variable-name-face)
+      (3 font-lock-type-face))
+    ;; var = val
+    ( "\\(^\\(\\sw\\|[_.]\\)+\\) += +[^(]"
+      (1 font-lock-variable-name-face))
+    )
+  "Font lock keywords used in `gdb-local-mode'.")
+
 (defun gdb-locals-mode ()
   "Major mode for gdb locals.
 
@@ -2103,6 +2163,8 @@ corresponding to the mode line clicked."
   (setq mode-name (concat "Locals:" gdb-selected-frame))
   (setq buffer-read-only t)
   (use-local-map gdb-locals-mode-map)
+  (set (make-local-variable 'font-lock-defaults)
+       '(gdb-local-font-lock-keywords))
   (run-mode-hooks 'gdb-locals-mode-hook)
   (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
       'gdb-invalidate-locals
diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el
index b32c5eb6d49..2733cb407a4 100644
--- a/lisp/progmodes/glasses.el
+++ b/lisp/progmodes/glasses.el
@@ -195,6 +195,16 @@ CATEGORY is the overlay category.  If it is nil, use the `glasses' category."
                            (looking-at glasses-uncapitalize-regexp))))
               (overlay-put o 'invisible t)
               (overlay-put o 'after-string (downcase (match-string n))))))
+        ;; Separator change
+        (unless (string= glasses-separator "_")
+          (goto-char beg)
+          (while (re-search-forward "[a-zA-Z0-9]\\(_+\\)[a-zA-Z0-9]" end t)
+            (goto-char (match-beginning 1))
+            (while (eql (char-after) ?\_)
+              (let ((o (glasses-make-overlay (point) (1+ (point)))))
+                ;; `concat' ensures the character properties won't merge
+                (overlay-put o 'display (concat glasses-separator)))
+              (forward-char))))
         ;; Parentheses
         (when glasses-separate-parentheses-p
           (goto-char beg)
@@ -227,6 +237,13 @@ recognized according to the current value of the variable `glasses-separator'."
           (let ((n (if (match-string 1) 1 2)))
             (replace-match "" t nil nil n)
             (goto-char (match-end n))))
+        (unless (string= glasses-separator "_")
+          (goto-char (point-min))
+          (while (re-search-forward (format "[a-zA-Z0-9]\\(%s+\\)[a-zA-Z0-9]"
+                                            separator)
+                                    nil t)
+            (replace-match "_" nil nil nil 1)
+            (goto-char (match-beginning 1))))
         (when glasses-separate-parentheses-p
           (goto-char (point-min))
           (while (re-search-forward "[a-zA-Z]_*\\( \\)\(" nil t)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 1486825b07a..47d74f00aec 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -1865,7 +1865,7 @@ extension EXTN.  Normally EXTN is given as the regular expression
 
            ;; Anything else means the input is invalid.
            (t
-            (message (format "Error parsing file %s." file))
+            (message "Error parsing file %s." file)
             (throw 'abort nil))))))
     l))
 
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index cc706195cc2..4b646a72f3b 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -2263,7 +2263,7 @@ overlays."
     (idlwave-shell-display-line 
      (nth idlwave-shell-calling-stack-index stack) nil
      (unless idlwave-shell-electric-debug-mode 'no-debug)) 
-    (message (or message 
+    (message "%s" (or message 
                  (format "In routine %s (stack level %d)"
                          idlwave-shell-calling-stack-routine
                          (- idlwave-shell-calling-stack-index))))))
@@ -2462,7 +2462,7 @@ the problem with not being able to set the breakpoint."
               (beep)
               (y-or-n-p 
                (concat "Okay to recompile file "
-                       (idlwave-shell-bp-get bp 'file) " ")))
+                       (idlwave-shell-bp-get bp 'file) "? ")))
             ;; Recompile
             (progn
               ;; Clean up before retrying
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 0f1ea571a85..ce689847e9c 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -3995,7 +3995,7 @@ you specify /."
               ;; Call etags
               (if (not (string-match "^[ \\t]*$" item))
                   (progn
-                    (message (concat "Tagging " item "..."))
+                    (message "%s" (concat "Tagging " item "..."))
                     (setq errbuf (get-buffer-create "*idltags-error*"))
                     (setq status (+ status
                                     (if (eq 0 (call-process
@@ -5188,7 +5188,7 @@ be set to nil to disable library catalog scanning."
                      message-base
                      (not (string= idlwave-library-catalog-libname
                                    old-libname)))
-                (message (concat message-base
+                (message "%s" (concat message-base
                                  idlwave-library-catalog-libname))
                 (setq old-libname idlwave-library-catalog-libname))
               (when idlwave-library-catalog-routines
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 47b36db6539..b84fa87a0de 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -1470,7 +1470,7 @@ The default is a name found in the buffer around point."
                       default ""))
          (label (if (not (string= default ""))
                     ;; Do completion with default
-                    (completing-read (concat "Label: (default " default ") ")
+                    (completing-read (concat "Label (default " default "): ")
                                      'pascal-comp-defun nil t "")
                   ;; There is no default value. Complete without it
                   (completing-read "Label: "
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index fecf1f07eb5..b49fcafe186 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -630,7 +630,7 @@ defines the beginning of a group. These tokens are:  {  [  <<"
               (current-column))
           (error
            (ding)
-           (message (error-message-string err))
+           (message "%s" (error-message-string err))
            0))
       (let (target)
         (if (not (re-search-backward "[^ \t\n\r\f][ \t\n\r\f]*\\=" nil t))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 433476f7957..f7788404350 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1341,9 +1341,9 @@ don't support `help'."
                         nil nil symbol))))
   (if (equal symbol "") (error "No symbol"))
   (let* ((func `(lambda ()
-                  (comint-redirect-send-command (format "emacs.ehelp(%S)\n"
-                                                        ,symbol)
-                                                "*Help*" nil))))
+                  (comint-redirect-send-command
+                   (format "emacs.ehelp(%S, globals(), locals())\n" ,symbol)
+                   "*Help*" nil))))
     ;; Ensure we have a suitable help buffer.
     ;; Fixme: Maybe process `Related help topics' a la help xrefs and
     ;; allow C-c C-f in help buffer.
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index 712f967fcbc..15ab8edaadc 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -90,20 +90,26 @@
     (modify-syntax-entry ?\] ")[  " st)
     (modify-syntax-entry ?{ "(}  " st)
     (modify-syntax-entry ?} "){  " st)
-    (modify-syntax-entry ?\| "\" 23b" st)
+    (modify-syntax-entry ?\| "\" 23bn" st)
+    ;; Guile allows #! ... !# comments.
+    ;; But SRFI-22 defines the comment as #!...\n instead.
+    ;; Also Guile says that the !# should be on a line of its own.
+    ;; It's too difficult to get it right, for too little benefit.
+    ;; (modify-syntax-entry ?! "_ 2" st)
 
     ;; Other atom delimiters
     (modify-syntax-entry ?\( "()  " st)
     (modify-syntax-entry ?\) ")(  " st)
-    (modify-syntax-entry ?\; "<   " st)
-    (modify-syntax-entry ?\" "\"    " st)
+    ;; It's used for single-line comments as well as for #;(...) sexp-comments.
+    (modify-syntax-entry ?\; "< 2 " st)
+    (modify-syntax-entry ?\" "\"   " st)
     (modify-syntax-entry ?' "'   " st)
     (modify-syntax-entry ?` "'   " st)
 
     ;; Special characters
     (modify-syntax-entry ?, "'   " st)
     (modify-syntax-entry ?@ "'   " st)
-    (modify-syntax-entry ?# "' 14bn" st)
+    (modify-syntax-entry ?# "' 14b" st)
     (modify-syntax-entry ?\\ "\\   " st)
     st))
 
@@ -157,19 +163,24 @@
   (make-local-variable 'parse-sexp-ignore-comments)
   (setq parse-sexp-ignore-comments t)
   (make-local-variable 'lisp-indent-function)
-  (set lisp-indent-function 'scheme-indent-function)
+  (setq lisp-indent-function 'scheme-indent-function)
   (setq mode-line-process '("" scheme-mode-line-process))
   (set (make-local-variable 'imenu-case-fold-search) t)
   (setq imenu-generic-expression scheme-imenu-generic-expression)
   (set (make-local-variable 'imenu-syntax-alist)
         '(("+-*/.<>=?!$%_&~^:" . "w")))
-  (make-local-variable 'font-lock-defaults)
-  (setq font-lock-defaults
-        '((scheme-font-lock-keywords
-           scheme-font-lock-keywords-1 scheme-font-lock-keywords-2)
-          nil t (("+-*/.<>=!?$%_&~^:#" . "w")) beginning-of-defun
-          (font-lock-mark-block-function . mark-defun)
-          (font-lock-syntactic-face-function . lisp-font-lock-syntactic-face-function))))
+  (set (make-local-variable 'font-lock-defaults)
+       '((scheme-font-lock-keywords
+          scheme-font-lock-keywords-1 scheme-font-lock-keywords-2)
+         nil t (("+-*/.<>=!?$%_&~^:" . "w") (?#. "w 14"))
+         beginning-of-defun
+         (font-lock-mark-block-function . mark-defun)
+         (font-lock-syntactic-face-function
+          . scheme-font-lock-syntactic-face-function)
+         (parse-sexp-lookup-properties . t)
+         (font-lock-extra-managed-props syntax-table)))
+  (set (make-local-variable 'lisp-doc-string-elt-property)
+       'scheme-doc-string-elt))
 
 (defvar scheme-mode-line-process "")
 
@@ -345,6 +356,44 @@ See `run-hooks'."
 (defvar scheme-font-lock-keywords scheme-font-lock-keywords-1
   "Default expressions to highlight in Scheme modes.")
 
+(defconst scheme-sexp-comment-syntax-table
+  (let ((st (make-syntax-table scheme-mode-syntax-table)))
+    (modify-syntax-entry ?\; "." st)
+    (modify-syntax-entry ?\n " " st)
+    (modify-syntax-entry ?#  "'" st)
+    st))
+
+(put 'lambda 'scheme-doc-string-elt 2)
+;; Docstring's pos in a `define' depends on whether it's a var or fun def.
+(put 'define 'scheme-doc-string-elt
+     (lambda ()
+       ;; The function is called with point right after "define".
+       (forward-comment (point-max))
+       (if (eq (char-after) ?\() 2 0)))
+
+(defun scheme-font-lock-syntactic-face-function (state)
+  (when (and (null (nth 3 state))
+             (eq (char-after (nth 8 state)) ?#)
+             (eq (char-after (1+ (nth 8 state))) ?\;))
+    ;; It's a sexp-comment.  Tell parse-partial-sexp where it ends.
+    (save-excursion
+      (let ((pos (point))
+            (end
+             (condition-case err
+                 (let ((parse-sexp-lookup-properties nil))
+                   (goto-char (+ 2 (nth 8 state)))
+                   ;; FIXME: this doesn't handle the case where the sexp
+                   ;; itself contains a #; comment.
+                   (forward-sexp 1)
+                   (point))
+               (scan-error (nth 2 err)))))
+        (when (< pos (- end 2))
+          (put-text-property pos (- end 2)
+                             'syntax-table scheme-sexp-comment-syntax-table))
+        (put-text-property (- end 1) end 'syntax-table '(12)))))
+  ;; Choose the face to use.
+  (lisp-font-lock-syntactic-face-function state))
+
 ;;;###autoload
 (define-derived-mode dsssl-mode scheme-mode "DSSSL"
   "Major mode for editing DSSSL code.
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e37390f5b80..8af9b637b0b 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2572,9 +2572,9 @@ If INFO is supplied it is used, else it is calculated from current line."
   (if (numberp blinkpos)
       (save-excursion
         (goto-char blinkpos)
-        (message msg)
+        (if msg (message "%s" msg) (message nil))
         (sit-for blink-matching-delay))
-    (message msg)))
+    (if msg (message "%s" msg) (message nil))))
 
 (defun sh-show-indent (arg)
   "Show the how the currently line would be indented.
@@ -2591,7 +2591,7 @@ we are indenting relative to, if applicable."
          (curr-indent (current-indentation))
          val msg)
     (if (stringp var)
-        (message (setq msg var))
+        (message "%s" (setq msg var))
       (setq val (sh-calculate-indent info))
 
       (if (eq curr-indent val)
@@ -2610,8 +2610,8 @@ we are indenting relative to, if applicable."
           (if (and info (listp (car info))
                    (eq (car (car info)) t))
               (sh-blink (nth 1 (car info))  msg)
-            (message msg)))
-      (message msg))
+            (message "%s" msg)))
+      (message "%s" msg))
     ))
 
 (defun sh-set-indent ()
@@ -2624,7 +2624,7 @@ for a new value for it."
          (var (sh-get-indent-var-for-line info))
          val old-val indent-val)
     (if (stringp var)
-        (message (format "Cannot set indent - %s" var))
+        (message "Cannot set indent - %s" var)
       (setq old-val (symbol-value var))
       (setq val (sh-read-variable var))
       (condition-case nil
@@ -2675,7 +2675,7 @@ unless optional argument ARG (the prefix when interactive) is non-nil."
            (curr-indent (current-indentation)))
       (cond
        ((stringp var)
-        (message (format "Cannot learn line - %s" var)))
+        (message "Cannot learn line - %s" var))
        ((eq var 'sh-indent-comment)
         ;; This is arbitrary...
         ;; - if curr-indent is 0, set to curr-indent
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 4014029b113..8f2dcc7cf1f 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -2157,7 +2157,7 @@ Ignore byte-compiler warnings you might see."
 
 (defun vhdl-warning (string &optional nobeep)
   "Print out warning STRING and beep."
-  (message (concat "WARNING:  " string))
+  (message "WARNING:  %s" string)
   (unless (or nobeep noninteractive) (beep)))
 
 (defun vhdl-print-warnings ()
@@ -2165,7 +2165,7 @@ Ignore byte-compiler warnings you might see."
   (let ((no-warnings (length vhdl-warnings)))
     (setq vhdl-warnings (nreverse vhdl-warnings))
     (while vhdl-warnings
-      (message (concat "WARNING:  " (car vhdl-warnings)))
+      (message "WARNING:  %s" (car vhdl-warnings))
       (setq vhdl-warnings (cdr vhdl-warnings)))
     (beep)
     (when (> no-warnings 1)
@@ -10605,7 +10605,7 @@ but not if inside a comment or quote)."
             (vhdl-template-invoked-by-hook t))
         (let ((caught (catch 'abort
                         (funcall func))))
-          (when (stringp caught) (message caught)))
+          (when (stringp caught) (message "%s" caught)))
         (when (= invoke-char ?-) (setq abbrev-start-location (point)))
         ;; delete CR which is still in event queue
         (if (fboundp 'enqueue-eval-event)
@@ -10768,7 +10768,7 @@ but not if inside a comment or quote)."
 (defun vhdl-template-insert-fun (fun)
   "Call FUN to insert a built-in template."
   (let ((caught (catch 'abort (when fun (funcall fun)))))
-    (when (stringp caught) (message caught))))
+    (when (stringp caught) (message "%s" caught))))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -11695,7 +11695,7 @@ reflected in a subsequent paste operation."
         (setq arch-buffer (current-buffer))
         (when ent-buffer (set-buffer ent-buffer) (save-buffer))
         (set-buffer arch-buffer) (save-buffer))
-      (message
+      (message "%s"
        (concat (format "Pasting port as testbench \"%s(%s)\"...done"
                        ent-name arch-name)
                (and ent-file-name
@@ -12832,40 +12832,35 @@ This does background highlighting of translate-off regions.")
     (((class color) (background dark)) (:foreground "Pink" :bold t))
     (t (:inverse-video t)))
   "Font lock mode face used to highlight prompts."
-  :group 'vhdl-highlight-faces
-  :group 'font-lock-highlighting-faces)
+  :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-attribute-face
   '((((class color) (background light)) (:foreground "Orchid"))
     (((class color) (background dark)) (:foreground "LightSteelBlue"))
     (t (:italic t :bold t)))
   "Font lock mode face used to highlight standardized attributes."
-  :group 'vhdl-highlight-faces
-  :group 'font-lock-highlighting-faces)
+  :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-enumvalue-face
   '((((class color) (background light)) (:foreground "SaddleBrown"))
     (((class color) (background dark)) (:foreground "BurlyWood"))
     (t (:italic t :bold t)))
   "Font lock mode face used to highlight standardized enumeration values."
-  :group 'vhdl-highlight-faces
-  :group 'font-lock-highlighting-faces)
+  :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-function-face
   '((((class color) (background light)) (:foreground "Cyan4"))
     (((class color) (background dark)) (:foreground "Orchid1"))
     (t (:italic t :bold t)))
   "Font lock mode face used to highlight standardized functions and packages."
-  :group 'vhdl-highlight-faces
-  :group 'font-lock-highlighting-faces)
+  :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-directive-face
   '((((class color) (background light)) (:foreground "CadetBlue"))
     (((class color) (background dark)) (:foreground "Aquamarine"))
     (t (:italic t :bold t)))
   "Font lock mode face used to highlight directives."
-  :group 'vhdl-highlight-faces
-  :group 'font-lock-highlighting-faces)
+  :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-reserved-words-face
   '((((class color) (background light)) (:foreground "Orange" :bold t))
@@ -12874,16 +12869,14 @@ This does background highlighting of translate-off regions.")
     (((class color) (background dark)) (:foreground "Yellow" :bold t))
     (t ()))
   "Font lock mode face used to highlight additional reserved words."
-  :group 'vhdl-highlight-faces
-  :group 'font-lock-highlighting-faces)
+  :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-translate-off-face
   '((((class color) (background light)) (:background "LightGray"))
     (((class color) (background dark)) (:background "DimGray"))
     (t ()))
   "Font lock mode face used to background highlight translate-off regions."
-  :group 'vhdl-highlight-faces
-  :group 'font-lock-highlighting-faces)
+  :group 'vhdl-highlight-faces)
 
 ;; font lock mode faces used to highlight words with special syntax.
 (let ((syntax-alist vhdl-special-syntax-alist))
@@ -12897,8 +12890,7 @@ This does background highlighting of translate-off regions.")
                (t ()))
              ,(concat "Font lock mode face used to highlight "
                       (nth 0 (car syntax-alist)) ".")
-             :group 'vhdl-highlight-faces
-             :group 'font-lock-highlighting-faces))
+             :group 'vhdl-highlight-faces))
     (setq syntax-alist (cdr syntax-alist))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -13996,11 +13988,11 @@ if required."
     (speedbar-add-mode-functions-list
      '("vhdl directory"
        (speedbar-item-info . vhdl-speedbar-item-info)
-       (speedbar-line-path . speedbar-files-line-path)))
+       (speedbar-line-directory . speedbar-files-line-path)))
     (speedbar-add-mode-functions-list
      '("vhdl project"
        (speedbar-item-info . vhdl-speedbar-item-info)
-       (speedbar-line-path . vhdl-speedbar-line-project)))
+       (speedbar-line-directory . vhdl-speedbar-line-project)))
     ;; keymap
     (unless vhdl-speedbar-key-map
       (setq vhdl-speedbar-key-map (speedbar-make-specialized-keymap))
@@ -14265,9 +14257,9 @@ otherwise use cached data."
      ((save-excursion (beginning-of-line) (looking-at "[^0-9]"))
       (re-search-forward "[0-9]+:" nil t)
       (vhdl-scan-directory-contents
-       (abbreviate-file-name (speedbar-line-path))))
+       (abbreviate-file-name (speedbar-line-directory))))
      ;; current directory
-     (t (setq path (speedbar-line-path))
+     (t (setq path (speedbar-line-directory))
         (string-match "^\\(.+[/\\]\\)" path)
         (vhdl-scan-directory-contents
          (abbreviate-file-name (match-string 1 path)))))
@@ -14985,7 +14977,7 @@ NO-POSITION non-nil means do not re-position cursor."
   (cond ((string-match "+" text)        ; we have to expand this dir
          (setq speedbar-shown-directories
                (cons (expand-file-name
-                      (concat (speedbar-line-path indent) token "/"))
+                      (concat (speedbar-line-directory indent) token "/"))
                      speedbar-shown-directories))
          (speedbar-change-expand-button-char ?-)
          (speedbar-reset-scanners)
@@ -14994,12 +14986,12 @@ NO-POSITION non-nil means do not re-position cursor."
              (end-of-line) (forward-char 1)
              (vhdl-speedbar-insert-dirs
               (speedbar-file-lists
-               (concat (speedbar-line-path indent) token "/"))
+               (concat (speedbar-line-directory indent) token "/"))
               (1+ indent))
              (speedbar-reset-scanners)
              (vhdl-speedbar-insert-dir-hierarchy
               (abbreviate-file-name
-               (concat (speedbar-line-path indent) token "/"))
+               (concat (speedbar-line-directory indent) token "/"))
               (1+ indent) speedbar-power-click)))
          (vhdl-speedbar-update-current-unit t t))
         ((string-match "-" text)        ; we have to contract this node
@@ -15007,7 +14999,7 @@ NO-POSITION non-nil means do not re-position cursor."
          (let ((oldl speedbar-shown-directories)
                (newl nil)
                (td (expand-file-name
-                    (concat (speedbar-line-path indent) token))))
+                    (concat (speedbar-line-directory indent) token))))
            (while oldl
              (if (not (string-match (concat "^" (regexp-quote td)) (car oldl)))
                  (setq newl (cons (car oldl) newl)))
@@ -15093,7 +15085,7 @@ NO-POSITION non-nil means do not re-position cursor."
   (if vhdl-speedbar-show-projects
       (vhdl-speedbar-line-project)
     (abbreviate-file-name
-     (file-name-as-directory (speedbar-line-path indent)))))
+     (file-name-as-directory (speedbar-line-directory indent)))))
 
 (defun vhdl-speedbar-line-project (&optional indent)
   "Get currently displayed project name."
@@ -15244,7 +15236,7 @@ is already shown in a buffer."
           (unit-name (vhdl-speedbar-line-text))
           (vhdl-project (vhdl-speedbar-line-project))
           (directory (file-name-as-directory
-                      (or (speedbar-line-file) (speedbar-line-path)))))
+                      (or (speedbar-line-file) (speedbar-line-directory)))))
       (if (fboundp 'speedbar-select-attached-frame)
           (speedbar-select-attached-frame)
         (select-frame speedbar-attached-frame))
@@ -15256,7 +15248,7 @@ is already shown in a buffer."
   (interactive)
   (let ((vhdl-project (vhdl-speedbar-line-project))
         (default-directory (file-name-as-directory
-                            (or (speedbar-line-file) (speedbar-line-path)))))
+                            (or (speedbar-line-file) (speedbar-line-directory)))))
     (vhdl-generate-makefile)))
 
 (defun vhdl-speedbar-check-unit (design-unit)
@@ -15498,7 +15490,7 @@ expansion function)."
     (setq arch-buffer (current-buffer))
     (when ent-buffer (set-buffer ent-buffer) (save-buffer))
     (set-buffer arch-buffer) (save-buffer)
-    (message
+    (message "%s"
      (concat (format "Creating component \"%s(%s)\"...done" ent-name arch-name)
              (and ent-file-name
                   (format "\n  File created: \"%s\"" ent-file-name))
@@ -16120,7 +16112,7 @@ current project/directory."
            (vhdl-template-footer)
          (vhdl-comment-display-line) (insert "\n"))
        (save-buffer))
-     (message
+     (message "%s"
       (concat (format "Generating configuration \"%s\"...done" conf-name)
               (and conf-file-name
                    (format "\n  File created: \"%s\"" conf-file-name))))))