Merged from miles@gnu.org--gnu-2005 (patch 578-592)

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

9 files changed, 347 insertions, 327 deletions

diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index ea87dce591f..f6e8697543f 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1887,7 +1887,7 @@ directory specification."
 ;; XXX Kludge interface.
 
 (define-button-type 'tags-select-tags-table
-  'action (lambda (button) (select-tags-table-select))
+  'action 'select-tags-table-select
   'help-echo "RET, t or mouse-2: select tags table")
 
 ;; XXX If a file is in multiple tables, selection may get the wrong one.
@@ -1904,30 +1904,27 @@ see the doc of that variable if you want to add names to the list."
         (desired-point nil)
         b)
     (when tags-table-list
-          (setq desired-point (point-marker))
-          (setq b (point))
-          (princ tags-table-list (current-buffer))
-          (make-text-button b (point) 'type 'tags-select-tags-table)
-          (insert "\C-m")
-          (prin1 (car tags-table-list) (current-buffer)) ;invisible
+      (setq desired-point (point-marker))
+      (setq b (point))
+      (princ (mapcar 'abbreviate-file-name tags-table-list) (current-buffer))
+      (make-text-button b (point) 'type 'tags-select-tags-table
+                        'etags-table (car tags-table-list))
       (insert "\n"))
     (while set-list
       (unless (eq (car set-list) tags-table-list)
         (setq b (point))
-        (princ (car set-list) (current-buffer))
-        (make-text-button b (point) 'type 'tags-select-tags-table)
-        (insert "\C-m")
-        (prin1 (car (car set-list)) (current-buffer)) ;invisible
+        (princ (mapcar 'abbreviate-file-name (car set-list)) (current-buffer))
+        (make-text-button b (point) 'type 'tags-select-tags-table
+                          'etags-table (car (car set-list)))
         (insert "\n"))
       (setq set-list (cdr set-list)))
     (when tags-file-name
-          (or desired-point
-              (setq desired-point (point-marker)))
-          (setq b (point))
-          (insert tags-file-name)
-          (make-text-button b (point) 'type 'tags-select-tags-table)
-          (insert "\C-m")
-          (prin1 tags-file-name (current-buffer)) ;invisible
+      (or desired-point
+          (setq desired-point (point-marker)))
+      (setq b (point))
+      (insert (abbreviate-file-name tags-file-name))
+      (make-text-button b (point) 'type 'tags-select-tags-table
+                        'etags-table tags-file-name)
       (insert "\n"))
     (setq set-list (delete tags-file-name
                            (apply 'nconc (cons (copy-sequence tags-table-list)
@@ -1935,10 +1932,9 @@ see the doc of that variable if you want to add names to the list."
                                                        tags-table-set-list)))))
     (while set-list
       (setq b (point))
-      (insert (car set-list))
-      (make-text-button b (point) 'type 'tags-select-tags-table)
-      (insert "\C-m")
-      (prin1 (car set-list) (current-buffer)) ;invisible
+      (insert (abbreviate-file-name (car set-list)))
+      (make-text-button b (point) 'type 'tags-select-tags-table
+                          'etags-table (car set-list))
       (insert "\n")
       (setq set-list (delete (car set-list) set-list)))
     (goto-char (point-min))
@@ -1951,7 +1947,8 @@ see the doc of that variable if you want to add names to the list."
   (select-tags-table-mode))
 
 (defvar select-tags-table-mode-map
-  (let ((map (copy-keymap button-buffer-map)))
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map button-buffer-map)
     (define-key map "t" 'push-button)
     (define-key map " " 'next-line)
     (define-key map "\^?" 'previous-line)
@@ -1960,24 +1957,17 @@ see the doc of that variable if you want to add names to the list."
     (define-key map "q" 'select-tags-table-quit)
     map))
 
-(defun select-tags-table-mode ()
+(define-derived-mode select-tags-table-mode fundamental-mode "Select Tags Table"
   "Major mode for choosing a current tags table among those already loaded.
 
 \\{select-tags-table-mode-map}"
-  (interactive)
-  (kill-all-local-variables)
-  (setq buffer-read-only t
-        major-mode 'select-tags-table-mode
-        mode-name "Select Tags Table")
-  (use-local-map select-tags-table-mode-map)
-  (setq selective-display t
-        selective-display-ellipses nil))
-
-(defun select-tags-table-select ()
+  (setq buffer-read-only t))
+
+(defun select-tags-table-select (button)
   "Select the tags table named on this line."
-  (interactive)
-  (search-forward "\C-m")
-  (let ((name (read (current-buffer))))
+  (interactive (list (or (button-at (line-beginning-position))
+                         (error "No tags table on current line"))))
+  (let ((name (button-get button 'etags-table)))
     (visit-tags-table name)
     (select-tags-table-quit)
     (message "Tags table now %s" name)))
@@ -2043,5 +2033,5 @@ for \\[find-tag] (which see)."
 
 (provide 'etags)
 
-;;; arch-tag: b897c2b5-08f3-4837-b2d3-0e7d6db1b63e
+;; arch-tag: b897c2b5-08f3-4837-b2d3-0e7d6db1b63e
 ;;; etags.el ends here
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 5e2a3705ef3..676833cdedc 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -4,7 +4,7 @@
 ;; Free Software Foundation, Inc.
 
 ;; Author: Torbj\"orn Einarsson <Torbjorn.Einarsson@era.ericsson.se>
-;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
+;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: fortran, f90, languages
 
 ;; This file is part of GNU Emacs.
@@ -276,7 +276,7 @@ The options are 'downcase-word, 'upcase-word, 'capitalize-word and nil."
                 "target" "then" "type" "use" "where" "while" "write"
                 ;; F95 keywords.
                 "elemental" "pure") 'words)
-  "Regexp for F90 keywords.")
+  "Regexp used by the function `f90-change-keywords'.")
 
 (defconst f90-keywords-level-3-re
   (regexp-opt
@@ -370,7 +370,8 @@ subroutine\\)\\|use\\|call\\)\\>[ \t]*\\(\\sw+\\)?"
    (list
     ;; Variable declarations (avoid the real function call).
     '("^[ \t0-9]*\\(real\\|integer\\|c\\(haracter\\|omplex\\)\\|\
-logical\\|type[ \t]*(\\sw+)\\)\\(.*::\\|[ \t]*(.*)\\)?\\([^&!\n]*\\)"
+logical\\|double[ \t]*precision\\|*type[ \t]*(\\sw+)\\)\
+\\(.*::\\|[ \t]*(.*)\\)?\\([^&!\n]*\\)"
       (1 font-lock-type-face t) (4 font-lock-variable-name-face t))
     ;; do, if, select, where, and forall constructs.
     '("\\<\\(end[ \t]*\\(do\\|if\\|select\\|forall\\|where\\)\\)\\>\
@@ -381,7 +382,7 @@ do\\([ \t]*while\\)?\\|select[ \t]*case\\|where\\|forall\\)\\)\\>"
       (2 font-lock-constant-face nil t) (3 font-lock-keyword-face))
     ;; Implicit declaration.
     '("\\<\\(implicit\\)[ \t]*\\(real\\|integer\\|c\\(haracter\\|omplex\\)\
-\\|logical\\|type[ \t]*(\\sw+)\\|none\\)[ \t]*"
+\\|logical\\|double[ \t]*precision\\|type[ \t]*(\\sw+)\\|none\\)[ \t]*"
       (1 font-lock-keyword-face) (2 font-lock-type-face))
     '("\\<\\(namelist\\|common\\)[ \t]*\/\\(\\sw+\\)?\/"
       (1 font-lock-keyword-face) (2 font-lock-constant-face nil t))
@@ -698,6 +699,7 @@ Used in the F90 entry in `hs-special-modes-alist'.")
        ("`de"  "deallocate"   )
        ("`df"  "define"       )
        ("`di"  "dimension"    )
+       ("`dp"  "double precision")
        ("`dw"  "do while"     )
        ("`el"  "else"         )
        ("`eli" "else if"      )
@@ -796,8 +798,6 @@ Variables controlling indentation style and extra features:
   The possibilities are 'downcase-word, 'upcase-word, 'capitalize-word.
 `f90-leave-line-no'
   Do not left-justify line numbers (default nil).
-`f90-keywords-re'
-  List of keywords used for highlighting/upcase-keywords etc.
 
 Turning on F90 mode calls the value of the variable `f90-mode-hook'
 with no args, if that value is non-nil."
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 3b6c77fef29..0d9921fcd7b 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -4,7 +4,7 @@
 ;;               2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Michael D. Prange <prange@erl.mit.edu>
-;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
+;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: fortran, languages
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index c8d99dbe3e2..852cd8deb88 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -103,6 +103,7 @@ and #define directives otherwise.")
 (defvar gdb-error "Non-nil when GDB is reporting an error.")
 (defvar gdb-macro-info nil
   "Non-nil if GDB knows that the inferior includes preprocessor macro info.")
+(defvar gdb-buffer-fringe-width nil)
 
 (defvar gdb-buffer-type nil
   "One of the symbols bound in `gdb-buffer-rules'.")
@@ -172,28 +173,28 @@ See Info node `(emacs)GDB Graphical Interface' for a more
 detailed description of this mode.
 
 
----------------------------------------------------------------------
-                               GDB Toolbar
----------------------------------------------------------------------
- GUD buffer (I/O of GDB)          | Locals buffer
-                                  |
-                                  |
-                                  |
----------------------------------------------------------------------
- Source buffer                    | Input/Output (of inferior) buffer
-                                  | (comint-mode)
-                                  |
-                                  |
-                                  |
-                                  |
-                                  |
-                                  |
----------------------------------------------------------------------
- Stack buffer                     | Breakpoints buffer
- RET      gdb-frames-select       | SPC    gdb-toggle-breakpoint
-                                  | RET    gdb-goto-breakpoint
-                                  |   d    gdb-delete-breakpoint
----------------------------------------------------------------------"
++--------------------------------------------------------------+
+|                           GDB Toolbar                        |
++-------------------------------+------------------------------+
+| GUD buffer (I/O of GDB)       | Locals buffer                |
+|                               |                              |
+|                               |                              |
+|                               |                              |
++-------------------------------+------------------------------+
+| Source buffer                 | I/O buffer (of inferior)     |
+|                               | (comint-mode)                |
+|                               |                              |
+|                               |                              |
+|                               |                              |
+|                               |                              |
+|                               |                              |
+|                               |                              |
++-------------------------------+------------------------------+
+| Stack buffer                  | Breakpoints buffer           |
+| RET      gdb-frames-select    | SPC    gdb-toggle-breakpoint |
+|                               | RET    gdb-goto-breakpoint   |
+|                               | d      gdb-delete-breakpoint |
++-------------------------------+------------------------------+"
   ;;
   (interactive (list (gud-query-cmdline 'gdba)))
   ;;
@@ -377,7 +378,8 @@ Also display the main routine in the disassembly buffer if present."
         gdb-location-alist nil
         gdb-find-file-unhook nil
         gdb-error nil
-        gdb-macro-info nil)
+        gdb-macro-info nil
+        gdb-buffer-fringe-width (car (window-fringes)))
   ;;
   (setq gdb-buffer-type 'gdba)
   ;;
@@ -1190,12 +1192,13 @@ happens to be appropriate."
      (let ((buf (gdb-get-buffer ',buf-key)))
        (and buf
             (with-current-buffer buf
-              (let ((p (window-point (get-buffer-window buf 0)))
+              (let* ((window (get-buffer-window buf 0))
+                     (p (window-point window))
                     (buffer-read-only nil))
                 (erase-buffer)
                 (insert-buffer-substring (gdb-get-create-buffer
                                           'gdb-partial-output-buffer))
-                (set-window-point (get-buffer-window buf 0) p)))))
+                (set-window-point window p)))))
      ;; put customisation here
      (,custom-defun)))
 
@@ -1545,20 +1548,23 @@ static char *magick[] = {
                                help-echo "mouse-2, RET: Select frame"))
           (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)
+            (when (string-equal (match-string 1) gdb-frame-number)
+                (put-text-property bl (+ bl 4)
+                                   'face '(:inverse-video t)))
+            (when (re-search-forward
+                   (concat
+                    (if (string-equal (match-string 1) "0") "" " 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)
-                (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))
-                )))
+              (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 ()
@@ -1604,6 +1610,7 @@ static char *magick[] = {
 
 (defun gdb-get-frame-number ()
   (save-excursion
+    (end-of-line)
     (let* ((pos (re-search-backward "^#*\\([0-9]*\\)" nil t))
            (n (or (and pos (match-string-no-properties 1)) "0")))
       n)))
@@ -2119,13 +2126,15 @@ corresponding to the mode line clicked."
       (while (re-search-forward "\\s-*{.*\n" nil t)
         (replace-match " (array);\n" nil nil))))
   (let ((buf (gdb-get-buffer 'gdb-locals-buffer)))
-    (and buf (with-current-buffer buf
-               (let ((p (window-point (get-buffer-window buf 0)))
+    (and buf
+         (with-current-buffer buf
+              (let* ((window (get-buffer-window buf 0))
+                     (p (window-point window))
                      (buffer-read-only nil))
                  (erase-buffer)
                  (insert-buffer-substring (gdb-get-create-buffer
                                            'gdb-partial-output-buffer))
-                (set-window-point (get-buffer-window buf 0) p)))))
+                (set-window-point window p)))))
   (run-hooks 'gdb-info-locals-hook))
 
 (defun gdb-info-locals-custom ()
@@ -2144,7 +2153,7 @@ corresponding to the mode line clicked."
       (1 font-lock-variable-name-face)
       (3 font-lock-keyword-face)
       (4 font-lock-type-face))
-    ;; var = (type) value 
+    ;; var = (type) value
     ( "\\(^\\(\\sw\\|[_.]\\)+\\) += +(\\(\\(\\sw\\|[_.]\\)+\\)"
       (1 font-lock-variable-name-face)
       (3 font-lock-type-face))
@@ -2470,7 +2479,8 @@ BUFFER nil or omitted means use the current buffer."
 (defun gdb-put-breakpoint-icon (enabled bptno)
   (let ((start (- (line-beginning-position) 1))
         (end (+ (line-end-position) 1))
-        (putstring (if enabled "B" "b")))
+        (putstring (if enabled "B" "b"))
+        (source-window (get-buffer-window (current-buffer) 0)))
     (add-text-properties
      0 1 '(help-echo "mouse-1: set/clear bkpt, mouse-3: enable/disable bkpt")
      putstring)
@@ -2480,7 +2490,9 @@ BUFFER nil or omitted means use the current buffer."
        0 1 `(gdb-bptno ,bptno gdb-enabled nil) putstring))
     (gdb-remove-breakpoint-icons start end)
     (if (display-images-p)
-        (if (>= (car (window-fringes)) 8)
+        (if (>= (or left-fringe-width
+                   (if source-window (car (window-fringes source-window)))
+                   gdb-buffer-fringe-width) 8)
             (gdb-put-string
              nil (1+ start)
              `(left-fringe breakpoint
@@ -2490,9 +2502,9 @@ BUFFER nil or omitted means use the current buffer."
           (when (< left-margin-width 2)
             (save-current-buffer
               (setq left-margin-width 2)
-              (if (get-buffer-window (current-buffer) 0)
+              (if source-window
                   (set-window-margins
-                   (get-buffer-window (current-buffer) 0)
+                   source-window
                    left-margin-width right-margin-width))))
           (put-image
            (if enabled
@@ -2519,10 +2531,10 @@ BUFFER nil or omitted means use the current buffer."
       (when (< left-margin-width 2)
         (save-current-buffer
           (setq left-margin-width 2)
-          (if (get-buffer-window (current-buffer) 0)
+          (let ((window (get-buffer-window (current-buffer) 0)))
+            (if window
               (set-window-margins
-               (get-buffer-window (current-buffer) 0)
-               left-margin-width right-margin-width))))
+               window left-margin-width right-margin-width)))))
       (gdb-put-string
        (propertize putstring
                    'face (if enabled 'breakpoint-enabled 'breakpoint-disabled))
@@ -2534,10 +2546,10 @@ BUFFER nil or omitted means use the current buffer."
       (remove-images start end))
   (when remove-margin
     (setq left-margin-width 0)
-    (if (get-buffer-window (current-buffer) 0)
-        (set-window-margins
-         (get-buffer-window (current-buffer) 0)
-         left-margin-width right-margin-width))))
+    (let ((window (get-buffer-window (current-buffer) 0)))
+      (if window
+          (set-window-margins
+           window left-margin-width right-margin-width)))))
 
 
 ;;
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 47d74f00aec..d38697a2152 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -137,11 +137,15 @@ Used to grey out relevant togolbar icons.")
                   :enable (and (not gud-running)
                                (memq gud-minor-mode '(gdbmi gdba gdb perldb))))
     ([remove]   menu-item "Remove Breakpoint" gud-remove
-                  :enable (not gud-running))
+                  :enable (not gud-running)
+                  :visible (not (and (memq gud-minor-mode '(gdbmi gdba))
+                                     (window-fringes))))
     ([tbreak]   menu-item "Temporary Breakpoint" gud-tbreak
                   :enable (memq gud-minor-mode '(gdbmi gdba gdb sdb xdb bashdb)))
     ([break]    menu-item "Set Breakpoint" gud-break
-                  :enable (not gud-running))
+                  :enable (not gud-running)
+                  :visible (not (and (memq gud-minor-mode '(gdbmi gdba))
+                                     (window-fringes))))
     ([up]       menu-item "Up Stack" gud-up
                   :enable (and (not gud-running)
                                (memq gud-minor-mode
@@ -332,9 +336,6 @@ we're in the GUD buffer)."
 ;; speedbar support functions and variables.
 (eval-when-compile (require 'speedbar)) ;For speedbar-with-attached-buffer.
 
-(defvar gud-last-speedbar-buffer nil
-  "The last GUD buffer used.")
-
 (defvar gud-last-speedbar-stackframe nil
   "Description of the currently displayed GUD stack.
 t means that there is no stack, and we are in display-file mode.")
@@ -351,17 +352,22 @@ t means that there is no stack, and we are in display-file mode.")
     (define-key gud-speedbar-key-map "j" 'speedbar-edit-line)
     (define-key gud-speedbar-key-map "e" 'speedbar-edit-line)
     (define-key gud-speedbar-key-map "\C-m" 'speedbar-edit-line)
-    (define-key gud-speedbar-key-map "D" 'gdb-var-delete)))
+    (define-key gud-speedbar-key-map " " 'speedbar-toggle-line-expansion)
+    (define-key gud-speedbar-key-map "[" 'speedbar-expand-line-descendants)
+    (define-key gud-speedbar-key-map "]" 'speedbar-contract-line-descendants)
+    (define-key gud-speedbar-key-map "D" 'gdb-var-delete))
 
+  (speedbar-add-expansion-list '("GUD" gud-speedbar-menu-items
+                                 gud-speedbar-key-map
+                                 gud-expansion-speedbar-buttons)))
 
 (defvar gud-speedbar-menu-items
-  ;; Note to self.  Add expand, and turn off items when not available.
   '(["Jump to stack frame" speedbar-edit-line
-     (with-current-buffer gud-comint-buffer
-       (not (memq gud-minor-mode '(gdbmi gdba))))]
+     :visible (with-current-buffer gud-comint-buffer
+                (not (memq gud-minor-mode '(gdbmi gdba))))]
     ["Edit value" speedbar-edit-line
-     (with-current-buffer gud-comint-buffer
-       (memq gud-minor-mode '(gdbmi gdba)))]
+     :visible (with-current-buffer gud-comint-buffer
+                (memq gud-minor-mode '(gdbmi gdba)))]
     ["Delete expression" gdb-var-delete
      (with-current-buffer gud-comint-buffer
        (memq gud-minor-mode '(gdbmi gdba)))])
@@ -372,89 +378,89 @@ t means that there is no stack, and we are in display-file mode.")
     (gud-install-speedbar-variables)
   (add-hook 'speedbar-load-hook 'gud-install-speedbar-variables))
 
+(defun gud-expansion-speedbar-buttons (directory zero)
+  "Wrapper for call to speedbar-add-expansion-list.   DIRECTORY and
+ZERO are not used, but are required by the caller."
+  (gud-speedbar-buttons gud-comint-buffer))
+
 (defun gud-speedbar-buttons (buffer)
   "Create a speedbar display based on the current state of GUD.
 If the GUD BUFFER is not running a supported debugger, then turn
-off the specialized speedbar mode."
-  (let ((minor-mode (with-current-buffer buffer gud-minor-mode)))
-    (cond
-     ((memq minor-mode '(gdbmi gdba))
-      (when (or gdb-var-changed
-                (not (save-excursion
-                       (goto-char (point-min))
-                       (let ((case-fold-search t))
-                         (looking-at "Watch Expressions:")))))
-        (erase-buffer)
-        (insert "Watch Expressions:\n")
-        (let ((var-list gdb-var-list))
-          (while var-list
-            (let* ((depth 0) (start 0) (char ?+)
-                   (var (car var-list)) (varnum (nth 1 var)))
-              (while (string-match "\\." varnum start)
-                (setq depth (1+ depth)
-                      start (1+ (match-beginning 0))))
-              (if (equal (nth 2 var) "0")
-                  (speedbar-make-tag-line 'bracket ?? nil nil
-                                          (concat (car var) "\t" (nth 4 var))
-                                          'gdb-edit-value
-                                          nil
-                                          (if (and (nth 5 var)
-                                                   gdb-show-changed-values)
-                                              'font-lock-warning-face
-                                            nil) depth)
-                (if (and (cadr var-list)
-                         (string-match varnum (cadr (cadr var-list))))
-                    (setq char ?-))
-                (speedbar-make-tag-line 'bracket char
-                                        'gdb-speedbar-expand-node varnum
-                                        (concat (car var) "\t" (nth 3 var))
-                                        nil nil nil depth)))
-            (setq var-list (cdr var-list))))
-        (setq gdb-var-changed nil)))
-     (t (if (and (save-excursion
-                   (goto-char (point-min))
-                   (looking-at "Current Stack"))
-                 (equal gud-last-last-frame gud-last-speedbar-stackframe))
-            nil
-          (setq gud-last-speedbar-buffer buffer)
-          (let ((gud-frame-list
-                 (cond ((eq minor-mode 'gdb)
-                        (gud-gdb-get-stackframe buffer))
-                       ;; Add more debuggers here!
-                       (t (speedbar-remove-localized-speedbar-support buffer)
-                          nil))))
-            (erase-buffer)
-            (if (not gud-frame-list)
-                (insert "No Stack frames\n")
-              (insert "Current Stack:\n"))
-            (dolist (frame gud-frame-list)
-              (insert (nth 1 frame) ":\n")
-              (if (= (length frame) 2)
-                  (progn
-;                   (speedbar-insert-button "[?]"
-;                                           'speedbar-button-face
-;                                           nil nil nil t)
-                    (speedbar-insert-button (car frame)
-                                             'speedbar-directory-face
-                                             nil nil nil t))
-;             (speedbar-insert-button "[+]"
-;                                     'speedbar-button-face
-;                                     'speedbar-highlight-face
-;                                     'gud-gdb-get-scope-data
-;                                     frame t)
-              (speedbar-insert-button (car frame)
-                                      'speedbar-file-face
-                                      'speedbar-highlight-face
-                                      (cond ((memq minor-mode '(gdbmi gdba gdb))
-                                             'gud-gdb-goto-stackframe)
-                                            (t (error "Should never be here")))
-                                        frame t)))
-;            (let ((selected-frame
-;                  (cond ((eq ff 'gud-gdb-find-file)
-;                         (gud-gdb-selected-frame-info buffer))
-;                        (t (error "Should never be here"))))))
-            )
-          (setq gud-last-speedbar-stackframe gud-last-last-frame))))))
+off the specialized speedbar mode.  BUFFER is not used, but are
+required by the caller."
+  (when (and (boundp 'gud-comint-buffer)
+             gud-comint-buffer
+             ;; gud-comint-buffer might be killed
+             (buffer-name gud-comint-buffer))
+    (let* ((minor-mode (with-current-buffer buffer gud-minor-mode))
+          (window (get-buffer-window (current-buffer) 0))
+          (p (window-point window)))
+      (cond
+       ((memq minor-mode '(gdbmi gdba))
+        (when (or gdb-var-changed
+                  (not (save-excursion
+                         (goto-char (point-min))
+                         (let ((case-fold-search t))
+                           (looking-at "Watch Expressions:")))))
+          (erase-buffer)
+          (insert "Watch Expressions:\n")
+          (let ((var-list gdb-var-list))
+            (while var-list
+              (let* ((depth 0) (start 0) (char ?+)
+                     (var (car var-list)) (varnum (nth 1 var)))
+                (while (string-match "\\." varnum start)
+                  (setq depth (1+ depth)
+                        start (1+ (match-beginning 0))))
+                (if (equal (nth 2 var) "0")
+                    (speedbar-make-tag-line 'bracket ?? nil nil
+                                            (concat (car var) "\t" (nth 4 var))
+                                            'gdb-edit-value
+                                            nil
+                                            (if (and (nth 5 var)
+                                                     gdb-show-changed-values)
+                                                'font-lock-warning-face
+                                              nil) depth)
+                  (if (and (cadr var-list)
+                           (string-match varnum (cadr (cadr var-list))))
+                      (setq char ?-))
+                  (speedbar-make-tag-line 'bracket char
+                                          'gdb-speedbar-expand-node varnum
+                                          (concat (car var) "\t" (nth 3 var))
+                                          nil nil nil depth)))
+              (setq var-list (cdr var-list))))
+          (setq gdb-var-changed nil)))
+       (t (if (and (save-excursion
+                     (goto-char (point-min))
+                     (looking-at "Current Stack:"))
+                   (equal gud-last-last-frame gud-last-speedbar-stackframe))
+              nil
+            (let ((gud-frame-list
+            (cond ((eq minor-mode 'gdb)
+                   (gud-gdb-get-stackframe buffer))
+                  ;; Add more debuggers here!
+                  (t (speedbar-remove-localized-speedbar-support buffer)
+                     nil))))
+              (erase-buffer)
+              (if (not gud-frame-list)
+                  (insert "No Stack frames\n")
+                (insert "Current Stack:\n"))
+              (dolist (frame gud-frame-list)
+                (insert (nth 1 frame) ":\n")
+                (if (= (length frame) 2)
+                (progn
+                  (speedbar-insert-button (car frame)
+                                          'speedbar-directory-face
+                                          nil nil nil t))
+                (speedbar-insert-button
+                 (car frame)
+                 'speedbar-file-face
+                 'speedbar-highlight-face
+                 (cond ((memq minor-mode '(gdbmi gdba gdb))
+                        'gud-gdb-goto-stackframe)
+                       (t (error "Should never be here")))
+                 frame t))))
+            (setq gud-last-speedbar-stackframe gud-last-last-frame))))
+      (set-window-point window p))))
 
 
 ;; ======================================================================
@@ -2569,6 +2575,9 @@ It is saved for when this flag is not set.")
          ;; Stop displaying an arrow in a source file.
          (setq gud-overlay-arrow-position nil)
          (set-process-buffer proc nil)
+         (if (featurep 'speedbar)
+             (speedbar-change-initial-expansion-list
+              speedbar-previously-used-expansion-list-name))
          (if (memq gud-minor-mode-type '(gdbmi gdba))
              (gdb-reset)
            (gud-reset)))
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index fd494324303..5134cf8292e 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -17,8 +17,8 @@
 ;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 ;; MA 02110-1301 USA
 
-;; Author: Pieter E.J. Pareit <pieter.pareit@skynet.be>
-;; Maintainer: Pieter E.J. Pareit <pieter.pareit@skynet.be>
+;; Author: Pieter E.J. Pareit <pieter.pareit@gmail.com>
+;; Maintainer: Pieter E.J. Pareit <pieter.pareit@gmail.com>
 ;; Created: 09 Nov 2002
 ;; Version: 0.1
 ;; Keywords: Knuth mix mixal asm mixvm "The Art Of Computer Programming"
@@ -27,17 +27,17 @@
 ;; Major mode for the mix asm language.
 ;; The mix asm language is described in "The Art Of Computer Programming".
 ;;
-;; For optimal use, also use GNU MDK. Compiling needs mixasm, running
-;; and debugging needs mixvm and mixvm.el from GNU MDK. You can get
+;; For optimal use, also use GNU MDK.  Compiling needs mixasm, running
+;; and debugging needs mixvm and mixvm.el from GNU MDK.  You can get
 ;; GNU MDK from `https://savannah.gnu.org/projects/mdk/' and
 ;; `ftp://ftp.gnu.org/pub/gnu/mdk'.
 ;;
 ;; To use this mode, place the following in your .emacs file:
 ;; `(load-file "/PATH-TO-FILE/mixal-mode.el")'.
 ;; When you load a file with the extension .mixal the mode will be started
-;; automatic. If you want to start the mode manual, use `M-x mixal-mode'.
-;; Font locking will work, the behavior of tabs is the same as emacs
-;; default behavior. You can compile a source file with `C-c c' you can
+;; automatic.  If you want to start the mode manual, use `M-x mixal-mode'.
+;; Font locking will work, the behavior of tabs is the same as Emacs's
+;; default behavior.  You can compile a source file with `C-c c' you can
 ;; run a compiled file with `C-c r' or run it in debug mode with `C-c d'.
 ;; You can get more information about a particular operation code by using
 ;; mixal-describe-operation-code or `C-h o'.
@@ -45,6 +45,15 @@
 ;; Have fun.
 
 ;;; History:
+;; Version 0.3:
+;; 08/10/05: sync mdk and emacs cvs
+;;           from emacs: compile-command and require-final-newline
+;;           from mdk:   see version 0.2
+;;           correct my email address
+;; Version 0.2:
+;; 06/04/05: mixasm no longer needs -g option
+;;           fontlocking of comments works in all? cases now
+;;           added some more mixal-operation-codes
 ;; Version 0.1:
 ;; Version 0.1.1:
 ;; 22/11/02: bugfix in fontlocking, needed to add a '-' to the regex.
@@ -54,7 +63,6 @@
 ;; 09/11/02: started mixal-mode.
 
 ;;; Code:
-
 (defvar compile-command)
 
 ;;; Key map
@@ -66,13 +74,13 @@
     (define-key map "\C-ho" 'mixal-describe-operation-code)
     map)
   "Keymap for `mixal-mode'.")
-; (makunbound 'mixal-mode-map)
+;; (makunbound 'mixal-mode-map)
 
 ;;; Syntax table
 (defvar mixal-mode-syntax-table
   (let ((st (make-syntax-table)))
-    (modify-syntax-entry ?* "<" st)
-    (modify-syntax-entry ?\n ">" st)
+    ;; (modify-syntax-entry ?* "<" st)    we need to do a bit more to make
+    ;; (modify-syntax-entry ?\n ">" st)    fontlocking for comments work
     st)
   "Syntax table for `dot-mode'.")
 
@@ -97,6 +105,7 @@ value.")
     "LD4" "LD5" "LD6" "LDX" "LDAN" "LD1N" "LD2N" "LD3N" "LD4N" "LD5N" "LD6N"
     "LDXN" "STA" "ST1" "ST2" "ST3" "ST4" "ST5" "ST6" "STX" "STJ" "STZ" "JBUS"
     "IOC" "IN" "OUT" "JRAD" "JMP" "JSJ" "JOV" "JNOV"
+    "JL" "JE" "JG" "JGE" "JNE" "JLE"
     "JAN" "J1N" "J2N" "J3N" "J4N" "J5N" "J6N" "JXN"
     "JAZ" "J1Z" "J2Z" "J3Z" "J4Z" "J5Z" "J6Z" "JXZ"
     "JAP" "J1P" "J2P" "J3P" "J4P" "J5P" "J6P" "JXP"
@@ -109,11 +118,11 @@ value.")
     "INCX" "DECX" "ENTX" "ENNX" "CMPA" "FCMP" "CMP1" "CMP2" "CMP3" "CMP4"
     "CMP5" "CMP6" "CMPX")
   "List of possible operation codes as strings.")
-; (makunbound 'mixal-operation-codes)
+;; (makunbound 'mixal-operation-codes)
 
 (defvar mixal-assembly-pseudoinstructions
   '("ORIG" "EQU" "CON" "ALF" "END")
-  "List of possible assembly pseudoinstructions")
+  "List of possible assembly pseudoinstructions.")
 
 ;;; Font-locking:
 (defvar mixal-font-lock-keywords
@@ -124,10 +133,13 @@ value.")
     (,(regexp-opt
        mixal-assembly-pseudoinstructions 'words)
      . mixal-font-lock-assembly-pseudoinstruction-face)
-    ("^[A-Z0-9a-z]*[ \t]+[A-Z0-9a-z]+[ \t]+[\\-A-Z0-9a-z,():]*[\t]+\\(.*\\)$"
-     (1 font-lock-comment-face)))
+    ("^[A-Z0-9a-z]*[ \t]+[A-ZO-9a-z]+[ \t]+\\(=.*=\\).*$"
+     (1 font-lock-constant-face))
+    ("^[A-Z0-9a-z]*[ \t]+[A-Z0-9a-z]+[ \t]+[A-Z0-9a-z,():+-\\*=\" ]*\t+\\(.*\\)$"
+     (1 font-lock-comment-face))
+    ("^\\*.*$" . font-lock-comment-face))
   "Keyword highlighting specification for `mixal-mode'.")
-; (makunbound 'mixal-font-lock-keywords)
+;; (makunbound 'mixal-font-lock-keywords)
 
 ;;;; Compilation
 ;; Output from mixasm is compatible with default behavior of emacs,
@@ -139,19 +151,24 @@ value.")
 ;;;; Describe
 (defvar mixal-operation-codes-alist '()
   "Alist that contains all the possible operation codes for mix.
-Each elt has the form (OP-CODE GROUP FULL-NAME C-BYTE F-BYTE DESCRIPTION EXECUTION-TIME)
-Where OP-CODE is the text of the opcode as an symbol, FULL-NAME is the human readable name
-as a string, C-BYTE is the operation code telling what operation is to be performed, F-BYTE holds
-an modification of the operation code which can be a symbol or a number, DESCRIPTION contains
-an string with a description about the operation code and EXECUTION-TIME holds info
-about the time it takes, number or string.")
-; (makunbound 'mixal-operation-codes-alist)
-
-(defun mixal-add-operation-code (op-code group full-name C-byte F-byte description execution-time)
-  "Add an operation code to the list that contains information about possible op code's."
-  (setq mixal-operation-codes-alist (cons (list op-code group full-name C-byte F-byte
-                                                description execution-time)
-                                          mixal-operation-codes-alist )))
+Each elt has the form
+  (OP-CODE GROUP FULL-NAME C-BYTE F-BYTE DESCRIPTION EXECUTION-TIME)
+Where OP-CODE is the text of the opcode as an symbol,
+FULL-NAME is the human readable name as a string,
+C-BYTE is the operation code telling what operation is to be performed,
+F-BYTE holds a modification of the operation code which can be a symbol
+  or a number,
+DESCRIPTION contains an string with a description about the operation code and
+EXECUTION-TIME holds info about the time it takes, number or string.")
+;; (makunbound 'mixal-operation-codes-alist)
+
+(defun mixal-add-operation-code (op-code group full-name C-byte F-byte
+                                         description execution-time)
+  "Add an operation code to `mixal-operation-codes-alist'."
+  (setq mixal-operation-codes-alist
+        (cons (list op-code group full-name C-byte F-byte
+                    description execution-time)
+              mixal-operation-codes-alist)))
 
 ;; now add each operation code
 
@@ -1250,7 +1267,8 @@ The converted character representation is stored in rAX."
 (defun mixal-describe-operation-code (&optional op-code)
   "Display the full documentation of OP-CODE."
   (interactive)
-  ;; we like to provide completition and history, so do it ourself (interactive "?bla")?
+  ;; We like to provide completion and history, so do it ourself
+  ;; (interactive "?bla")?
   (unless op-code
     (let* ((completion-ignore-case t)
            ;; we already have a list, but it is not in the right format
@@ -1282,13 +1300,14 @@ The converted character representation is stored in rAX."
 
 ;;;; Running
 (defun mixal-run ()
-  "Run's mixal file in current buffer, assumes that file has been compiled"
+  "Run mixal file in current buffer, assumes that file has been compiled."
   (interactive)
   (mixvm (concat "mixvm -r -t -d "
                  (file-name-sans-extension (buffer-file-name)))))
 
 (defun mixal-debug ()
-  "Starts mixvm for debugging, assumes that file has been compiled with debugging support"
+  "Start mixvm for debugging.
+Assumes that file has been compiled with debugging support."
   (interactive)
   (mixvm (concat "mixvm "
                  (file-name-sans-extension (buffer-file-name)))))
@@ -1300,9 +1319,9 @@ The converted character representation is stored in rAX."
   (set (make-local-variable 'comment-start) "*")
   (set (make-local-variable 'comment-start-skip) "*")
   (set (make-local-variable 'font-lock-defaults) '(mixal-font-lock-keywords))
-; might add an indent function in the future
-;  (set (make-local-variable 'indent-line-function) 'mixal-indent-line)
-  (set (make-local-variable 'compile-command) (concat "mixasm -g "
+  ;; might add an indent function in the future
+  ;;  (set (make-local-variable 'indent-line-function) 'mixal-indent-line)
+  (set (make-local-variable 'compile-command) (concat "mixasm "
                                                       buffer-file-name))
   ;; mixasm will do strange when there is no final newline,
   ;; so let Emacs ensure that it is always there
@@ -1314,5 +1333,5 @@ The converted character representation is stored in rAX."
 
 (provide 'mixal-mode)
 
-;;; arch-tag: be7c128a-bf61-4951-a90e-9398267ce3f3
+;; arch-tag: be7c128a-bf61-4951-a90e-9398267ce3f3
 ;;; mixal-mode.el ends here
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index b84fa87a0de..3cd243580e2 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -69,36 +69,34 @@
   "Abbrev table in use in Pascal-mode buffers.")
 (define-abbrev-table 'pascal-mode-abbrev-table ())
 
-(defvar pascal-mode-map ()
+(defvar pascal-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map ";"        'electric-pascal-semi-or-dot)
+    (define-key map "."        'electric-pascal-semi-or-dot)
+    (define-key map ":"        'electric-pascal-colon)
+    (define-key map "="        'electric-pascal-equal)
+    (define-key map "#"        'electric-pascal-hash)
+    (define-key map "\r"       'electric-pascal-terminate-line)
+    (define-key map "\t"       'electric-pascal-tab)
+    (define-key map "\M-\t"    'pascal-complete-word)
+    (define-key map "\M-?"     'pascal-show-completions)
+    (define-key map "\177"     'backward-delete-char-untabify)
+    (define-key map "\M-\C-h"  'pascal-mark-defun)
+    (define-key map "\C-c\C-b" 'pascal-insert-block)
+    (define-key map "\M-*"     'pascal-star-comment)
+    (define-key map "\C-c\C-c" 'pascal-comment-area)
+    (define-key map "\C-c\C-u" 'pascal-uncomment-area)
+    (define-key map "\M-\C-a"  'pascal-beg-of-defun)
+    (define-key map "\M-\C-e"  'pascal-end-of-defun)
+    (define-key map "\C-c\C-d" 'pascal-goto-defun)
+    (define-key map "\C-c\C-o" 'pascal-outline-mode)
+    ;; A command to change the whole buffer won't be used terribly
+    ;; often, so no need for a key binding.
+    ;; (define-key map "\C-cd"    'pascal-downcase-keywords)
+    ;; (define-key map "\C-cu"    'pascal-upcase-keywords)
+    ;; (define-key map "\C-cc"    'pascal-capitalize-keywords)
+    map)
   "Keymap used in Pascal mode.")
-(if pascal-mode-map
-    ()
-  (setq pascal-mode-map (make-sparse-keymap))
-  (define-key pascal-mode-map ";"        'electric-pascal-semi-or-dot)
-  (define-key pascal-mode-map "."        'electric-pascal-semi-or-dot)
-  (define-key pascal-mode-map ":"        'electric-pascal-colon)
-  (define-key pascal-mode-map "="        'electric-pascal-equal)
-  (define-key pascal-mode-map "#"        'electric-pascal-hash)
-  (define-key pascal-mode-map "\r"       'electric-pascal-terminate-line)
-  (define-key pascal-mode-map "\t"       'electric-pascal-tab)
-  (define-key pascal-mode-map "\M-\t"    'pascal-complete-word)
-  (define-key pascal-mode-map "\M-?"     'pascal-show-completions)
-  (define-key pascal-mode-map "\177"     'backward-delete-char-untabify)
-  (define-key pascal-mode-map "\M-\C-h"  'pascal-mark-defun)
-  (define-key pascal-mode-map "\C-c\C-b" 'pascal-insert-block)
-  (define-key pascal-mode-map "\M-*"     'pascal-star-comment)
-  (define-key pascal-mode-map "\C-c\C-c" 'pascal-comment-area)
-  (define-key pascal-mode-map "\C-c\C-u" 'pascal-uncomment-area)
-  (define-key pascal-mode-map "\M-\C-a"  'pascal-beg-of-defun)
-  (define-key pascal-mode-map "\M-\C-e"  'pascal-end-of-defun)
-  (define-key pascal-mode-map "\C-c\C-d" 'pascal-goto-defun)
-  (define-key pascal-mode-map "\C-c\C-o" 'pascal-outline)
-;;; A command to change the whole buffer won't be used terribly
-;;; often, so no need for a key binding.
-;  (define-key pascal-mode-map "\C-cd"    'pascal-downcase-keywords)
-;  (define-key pascal-mode-map "\C-cu"    'pascal-upcase-keywords)
-;  (define-key pascal-mode-map "\C-cc"    'pascal-capitalize-keywords)
-  )
 
 (defvar pascal-imenu-generic-expression
   '((nil "^[ \t]*\\(function\\|procedure\\)[ \t\n]+\\([a-zA-Z0-9_.:]+\\)" 2))
@@ -132,28 +130,31 @@
 (defconst pascal-exclude-str-start "{-----\\/----- EXCLUDED -----\\/-----")
 (defconst pascal-exclude-str-end " -----/\\----- EXCLUDED -----/\\-----}")
 
-(defvar pascal-mode-syntax-table nil
+(defvar pascal-mode-syntax-table
+  (let ((st (make-syntax-table)))
+    (modify-syntax-entry ?\\ "."   st)
+    (modify-syntax-entry ?\( "()1" st)
+    (modify-syntax-entry ?\) ")(4" st)
+    ;; This used to use comment-syntax `b'.  But the only document I could
+    ;; find about the syntax of Pascal's comments said that (* ... } is
+    ;; a valid comment, just as { ... *) or (* ... *) or { ... }.
+    (modify-syntax-entry ?* ". 23" st)
+    (modify-syntax-entry ?{ "<"    st)
+    (modify-syntax-entry ?} ">"    st)
+    (modify-syntax-entry ?+ "."    st)
+    (modify-syntax-entry ?- "."    st)
+    (modify-syntax-entry ?= "."    st)
+    (modify-syntax-entry ?% "."    st)
+    (modify-syntax-entry ?< "."    st)
+    (modify-syntax-entry ?> "."    st)
+    (modify-syntax-entry ?& "."    st)
+    (modify-syntax-entry ?| "."    st)
+    (modify-syntax-entry ?_ "_"    st)
+    (modify-syntax-entry ?\' "\""  st)
+    st)
   "Syntax table in use in Pascal-mode buffers.")
 
-(if pascal-mode-syntax-table
-    ()
-  (setq pascal-mode-syntax-table (make-syntax-table))
-  (modify-syntax-entry ?\\ "."   pascal-mode-syntax-table)
-  (modify-syntax-entry ?( "()1"  pascal-mode-syntax-table)
-  (modify-syntax-entry ?) ")(4"  pascal-mode-syntax-table)
-  (modify-syntax-entry ?* ". 23b" pascal-mode-syntax-table)
-  (modify-syntax-entry ?{ "<"    pascal-mode-syntax-table)
-  (modify-syntax-entry ?} ">"    pascal-mode-syntax-table)
-  (modify-syntax-entry ?+ "."    pascal-mode-syntax-table)
-  (modify-syntax-entry ?- "."    pascal-mode-syntax-table)
-  (modify-syntax-entry ?= "."    pascal-mode-syntax-table)
-  (modify-syntax-entry ?% "."    pascal-mode-syntax-table)
-  (modify-syntax-entry ?< "."    pascal-mode-syntax-table)
-  (modify-syntax-entry ?> "."    pascal-mode-syntax-table)
-  (modify-syntax-entry ?& "."    pascal-mode-syntax-table)
-  (modify-syntax-entry ?| "."    pascal-mode-syntax-table)
-  (modify-syntax-entry ?_ "_"    pascal-mode-syntax-table)
-  (modify-syntax-entry ?\' "\""  pascal-mode-syntax-table))
+
 
 (defconst pascal-font-lock-keywords (purecopy
   (list
@@ -327,7 +328,7 @@ Other useful functions are:
 \\[pascal-beg-of-defun]\t- Move to beginning of current function.
 \\[pascal-end-of-defun]\t- Move to end of current function.
 \\[pascal-goto-defun]\t- Goto function prompted for in the minibuffer.
-\\[pascal-outline]\t- Enter pascal-outline-mode (see also pascal-outline).
+\\[pascal-outline-mode]\t- Enter `pascal-outline-mode'.
 
 Variables controlling indentation/edit style:
 
@@ -792,8 +793,7 @@ on the line which ends a function or procedure named NAME."
 (defun pascal-indent-command ()
   "Indent for special part of code."
   (let* ((indent-str (pascal-calculate-indent))
-         (type (car indent-str))
-         (ind (car (cdr indent-str))))
+         (type (car indent-str)))
     (cond ((and (eq type 'paramlist)
                 (or (memq 'all pascal-auto-lineup)
                     (memq 'paramlist pascal-auto-lineup)))
@@ -971,7 +971,7 @@ Do not count labels, case-statements or records."
                  (end-of-line)
                  (point-marker)
                (re-search-backward "\\<case\\>" nil t)))
-        (beg (point)) oldpos
+        (beg (point))
         (ind 0))
     ;; Get right indent
     (while (< (point) end)
@@ -986,7 +986,6 @@ Do not count labels, case-statements or records."
                 (setq ind (current-column)))
             (pascal-end-of-statement))))
     (goto-char beg)
-    (setq oldpos (marker-position end))
     ;; Indent all case statements
     (while (< (point) end)
       (if (re-search-forward
@@ -999,7 +998,6 @@ Do not count labels, case-statements or records."
         (forward-char 1)
         (delete-horizontal-space)
         (insert " "))
-      (setq oldpos (point))
       (pascal-end-of-statement))
     (goto-char savepos)))
 
@@ -1490,30 +1488,20 @@ The default is a name found in the buffer around point."
 ;;;
 ;;; Pascal-outline-mode
 ;;;
-(defvar pascal-outline-map nil "Keymap used in Pascal Outline mode.")
-
-(if pascal-outline-map
-    nil
-  (if (fboundp 'set-keymap-name)
-      (set-keymap-name pascal-outline-map 'pascal-outline-map))
-  (if (fboundp 'set-keymap-parent)
-      (set-keymap-parent (setq pascal-outline-map (make-sparse-keymap))
-                         pascal-mode-map)
-    (setq pascal-outline-map (copy-keymap pascal-mode-map)))
-  (define-key pascal-outline-map "\M-\C-a"  'pascal-outline-prev-defun)
-  (define-key pascal-outline-map "\M-\C-e"  'pascal-outline-next-defun)
-  (define-key pascal-outline-map "\C-c\C-d" 'pascal-outline-goto-defun)
-  (define-key pascal-outline-map "\C-c\C-s" 'pascal-show-all)
-  (define-key pascal-outline-map "\C-c\C-h" 'pascal-hide-other-defuns))
-
-(defvar pascal-outline-mode nil "Non-nil while using Pascal Outline mode.")
-(make-variable-buffer-local 'pascal-outline-mode)
-(set-default 'pascal-outline-mode nil)
-(if (not (assoc 'pascal-outline-mode minor-mode-alist))
-    (setq minor-mode-alist (append minor-mode-alist
-                                   (list '(pascal-outline-mode " Outl")))))
-
-(defun pascal-outline (&optional arg)
+(defvar pascal-outline-map
+  (let ((map (make-sparse-keymap)))
+    (if (fboundp 'set-keymap-name)
+        (set-keymap-name pascal-outline-map 'pascal-outline-map))
+    (define-key map "\M-\C-a"  'pascal-outline-prev-defun)
+    (define-key map "\M-\C-e"  'pascal-outline-next-defun)
+    (define-key map "\C-c\C-d" 'pascal-outline-goto-defun)
+    (define-key map "\C-c\C-s" 'pascal-show-all)
+    (define-key map "\C-c\C-h" 'pascal-hide-other-defuns)
+    map)
+  "Keymap used in Pascal Outline mode.")
+
+(define-obsolete-function-alias 'pascal-outline 'pascal-outline-mode)
+(define-minor-mode pascal-outline-mode
   "Outline-line minor mode for Pascal mode.
 When in Pascal Outline mode, portions
 of the text being edited may be made invisible. \\<pascal-outline-map>
@@ -1531,26 +1519,26 @@ Pascal Outline mode provides some additional commands.
 \\[pascal-hide-other-defuns]\
 \t- Hide everything but the current function (function under the cursor).
 \\[pascal-outline]\t- Leave pascal-outline-mode."
-  (interactive "P")
-  (setq pascal-outline-mode
-        (if (null arg) (not pascal-outline-mode) t))
-  (if (fboundp 'redraw-mode-line)
-      (redraw-mode-line))
-  (if pascal-outline-mode
-      (progn
-        (setq selective-display t)
-        (use-local-map pascal-outline-map))
-    (progn
-      (setq selective-display nil)
-      (pascal-show-all)
-      (use-local-map pascal-mode-map))))
+  :init-value nil :lighter " Outl" :keymap pascal-outline-map
+  (add-to-invisibility-spec '(pascal . t))
+  (unless pascal-outline-mode
+    (pascal-show-all)))
 
 (defun pascal-outline-change (b e pascal-flag)
-  (let ((modp (buffer-modified-p)))
-    (unwind-protect
-        (subst-char-in-region b e (if (= pascal-flag ?\n)
-                                      ?\^M ?\n) pascal-flag)
-      (set-buffer-modified-p modp))))
+  (save-excursion
+    ;; This used to use selective display so the boundaries used by the
+    ;; callers didn't have to be precise, since it just looked for \n or \^M
+    ;; and switched them.
+    (goto-char b) (setq b (line-end-position))
+    (goto-char e) (setq e (line-end-position)))
+  (when (> e b)
+    ;; We could try and optimize this in the case where the region is
+    ;; already hidden.  But I'm not sure it's worth the trouble.
+    (remove-overlays b e 'invisible 'pascal)
+    (when (eq pascal-flag ?\^M)
+      (let ((ol (make-overlay b e nil t nil)))
+        (overlay-put ol 'invisible 'pascal)
+        (overlay-put ol 'evaporate t)))))
 
 (defun pascal-show-all ()
   "Show all of the text in the buffer."
@@ -1628,5 +1616,5 @@ Pascal Outline mode provides some additional commands.
 
 (provide 'pascal)
 
-;;; arch-tag: 04535136-fd93-40b4-a505-c9bebdc051f5
+;; arch-tag: 04535136-fd93-40b4-a505-c9bebdc051f5
 ;;; pascal.el ends here
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 8af9b637b0b..b8c425428b5 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -3392,7 +3392,7 @@ t means to return a list of all possible completions of STRING.
   "Insert code to setup temporary file handling.  See `sh-feature'."
   (bash sh-append ksh88)
   (csh (file-name-nondirectory (buffer-file-name))
-       "set tmp = /tmp/" str ".$$" \n
+       "set tmp = `mktemp -t " str ".XXXXXX`" \n
        "onintr exit" \n _
        (and (goto-char (point-max))
             (not (bolp))
@@ -3400,8 +3400,8 @@ t means to return a list of all possible completions of STRING.
        "exit:\n"
        "rm $tmp* >&/dev/null" > \n)
   (es (file-name-nondirectory (buffer-file-name))
-      > "local( signals = $signals sighup sigint; tmp = /tmp/" str
-      ".$pid ) {" \n
+      > "local( signals = $signals sighup sigint;" \n
+      > "tmp = `{ mktemp -t " str ".XXXXXX } ) {" \n
       > "catch @ e {" \n
       > "rm $tmp^* >[2]/dev/null" \n
       "throw $e" \n
@@ -3412,10 +3412,10 @@ t means to return a list of all possible completions of STRING.
   (ksh88 sh-modify sh
          7 "EXIT")
   (rc (file-name-nondirectory (buffer-file-name))
-      > "tmp = /tmp/" str ".$pid" \n
+      > "tmp = `{ mktemp -t " str ".XXXXXX }" \n
       "fn sigexit { rm $tmp^* >[2]/dev/null }" \n)
   (sh (file-name-nondirectory (buffer-file-name))
-      > "TMP=${TMPDIR:-/tmp}/" str ".$$" \n
+      > "TMP=`mktemp -t " str ".XXXXXX`" \n
       "trap \"rm $TMP* 2>/dev/null\" " ?0 \n))
 
 
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 8f2dcc7cf1f..ed64de4c89c 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -142,6 +142,8 @@
 (defvar lazy-lock-defer-contextually)
 (defvar lazy-lock-defer-on-scrolling)
 (defvar lazy-lock-defer-on-the-fly)
+(defvar speedbar-attached-frame)
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Variables