Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15

Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-218 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-220 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221 Restore deleted tagline in etc/TUTORIAL.ru * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-222 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-228 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-229 Remove TeX output files from the archive * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-230 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248 src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-256 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-258 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264 Update from CVS: lispref/display.texi: emacs -> Emacs. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-274 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-275 Update from CVS: man/makefile.w32-in: Revert last change * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-276 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-295 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-296 Allow restarting an existing debugger session that's exited * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-297 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-299 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-300 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-327 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-328 Update from CVS: src/.gdbinit (xsymbol): Fix last change. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-329 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-344 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-345 Tweak source regexps so that building in place won't cause problems * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-346 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-351 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-352 Update from CVS: lisp/flymake.el: New file. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-353 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-361 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362 Support " [...]" style defaults in minibuffer-electric-default-mode * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363 (read-number): Use canonical format for default in prompt. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-364 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-367 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-368 Improve display-supports-face-attributes-p on non-ttys * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-369 Rewrite face-differs-from-default-p * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370 Move `display-supports-face-attributes-p' entirely into C code * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-371 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372 Simplify face-differs-from-default-p; don't consider :stipple. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-373 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374 (tty_supports_face_attributes_p): Ensure attributes differ from default * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-375 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-376 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377 (Fdisplay_supports_face_attributes_p): Work around bootstrapping problem * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-378 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-380 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381 Face merging cleanups * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-382 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-384 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385 src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-386 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-395 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396 Tweak arch tagging to make build/install-in-place less annoying * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-397 Work around vc-arch problems when building eshell * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-398 Tweak permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-399 Tweak directory permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-400 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401 More build-in-place tweaking of arch tagging * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-402 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-403 Yet more build-in-place tweaking of arch tagging * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-404 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410 Make sure image types are initialized for lookup too * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416 Update from CVS
author: Miles Bader 2004-06-28 07:56:49 +0000
committer: Miles Bader 2004-06-28 07:56:49 +0000
commit: 327719ee8a3fcdb36ed6acaf6d8cb5fbdf0bd801 (patch)
tree: 21de188e13b5e41a79bb50040933072ae0235217 /lisp/progmodes
parent: 852f73b7fa7b71910282eacb6263b3ecfd4ee783 (diff)
parent: 376de73927383d6062483db10b8a82448505f52b (diff)
download: emacs-327719ee8a3fcdb36ed6acaf6d8cb5fbdf0bd801.tar.gz
emacs-327719ee8a3fcdb36ed6acaf6d8cb5fbdf0bd801.zip
16 files changed, 4188 insertions, 1186 deletions
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index abc8db6d2c3..f7688e24069 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -1466,8 +1466,8 @@ The standard casing rules will no longer apply to this word."
    ;;  If the word is already in the list, even with a different casing
    ;;  we simply want to replace it.
    (if (and (not (equal ada-case-exception '()))
-             (assoc-ignore-case word ada-case-exception))
+             (assoc-string word ada-case-exception t))
-        (setcar (assoc-ignore-case word ada-case-exception) word)
+        (setcar (assoc-string word ada-case-exception t) word)
      (add-to-list 'ada-case-exception (cons word t))
      )
@@ -1519,8 +1519,8 @@ word itself has a special casing."
    ;;  If the word is already in the list, even with a different casing
    ;;  we simply want to replace it.
    (if (and (not (equal ada-case-exception-substring '()))
-             (assoc-ignore-case word ada-case-exception-substring))
+             (assoc-string word ada-case-exception-substring t))
-        (setcar (assoc-ignore-case word ada-case-exception-substring) word)
+        (setcar (assoc-string word ada-case-exception-substring t) word)
      (add-to-list 'ada-case-exception-substring (cons word t))
      )
@@ -1548,9 +1548,9 @@ word itself has a special casing."
            (if (char-equal (string-to-char word) ?*)
                (progn
                  (setq word (substring word 1))
-                  (unless (assoc-ignore-case word ada-case-exception-substring)
+                  (unless (assoc-string word ada-case-exception-substring t)
                    (add-to-list 'ada-case-exception-substring (cons word t))))
-              (unless (assoc-ignore-case word ada-case-exception)
+              (unless (assoc-string word ada-case-exception t)
                (add-to-list 'ada-case-exception (cons word t)))))
          (forward-line 1))
@@ -1618,8 +1618,8 @@ the exceptions defined in `ada-case-exception-file'."
                                   (point)))
            match)
        ;;  If we have an exception, replace the word by the correct casing
-        (if (setq match (assoc-ignore-case (buffer-substring start end)
+        (if (setq match (assoc-string (buffer-substring start end)
-                                           ada-case-exception))
+                                      ada-case-exception t))
            (progn
              (delete-region start end)
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index c6f60d3dcc0..a61369004e8 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1488,7 +1488,7 @@ more \"DWIM:ey\"."
                                     (save-excursion
                                       (beginning-of-line)
                                       (or (not (re-search-backward
-                                                 sentence-end
+                                                 (sentence-end)
                                                 (c-point 'bopl)
                                                 t))
                                           (< (match-end 0)
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 62633fe2940..16064586ee9 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -1,6 +1,6 @@
 ;;; cfengine.el --- mode for editing Cfengine files
-;; Copyright (C) 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: languages
@@ -102,7 +102,8 @@ This includes those for cfservd as well as cfagent."))
 (defun cfengine-beginning-of-defun ()
  "`beginning-of-defun' function for Cfengine mode.
 Treats actions as defuns."
-  (end-of-line)
+  (unless (<= (current-column) (current-indentation))
+    (end-of-line))
  (if (re-search-backward "^[[:alpha:]]+: *$" nil t)
      (beginning-of-line)
    (goto-char (point-min)))
@@ -113,7 +114,7 @@ Treats actions as defuns."
 Treats actions as defuns."
  (end-of-line)
  (if (re-search-forward "^[[:alpha:]]+: *$" nil t)
-      (progn (forward-line -1) (end-of-line))
+      (beginning-of-line)
    (goto-char (point-max)))
  t)
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index ff4256192c4..033ce883e5f 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -100,7 +100,7 @@ in the compilation output, and should return a transformed file name.")
 ;;;###autoload
 (defvar compilation-process-setup-function nil
  "*Function to call to customize the compilation process.
-This functions is called immediately before the compilation process is
+This function is called immediately before the compilation process is
 started.  It can be used to set any variables or functions that are used
 while processing the output of the compilation process.  The function
 is called with variables `compilation-buffer' and `compilation-window'
@@ -125,11 +125,6 @@ describing how the process finished.")
 Each function is called with two arguments: the compilation buffer,
 and a string describing how the process finished.")
-(defvar compilation-last-buffer nil
-  "The most recent compilation buffer.
-A buffer becomes most recent when its compilation is started
-or when it is used with \\[next-error] or \\[compile-goto-error].")
 (defvar compilation-in-progress nil
  "List of compilation processes now running.")
 (or (assq 'compilation-in-progress minor-mode-alist)
@@ -176,8 +171,15 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
     "^\"\\([^,\" \n\t]+\\)\", line \\([0-9]+\\)\
 \\(?:[(. pos]+\\([0-9]+\\))?\\)?[:.,; (-]\\( warning:\\|[-0-9 ]*(W)\\)?" 1 2 3 (4))
+    (edg-1
+     "^\\([^ \n]+\\)(\\([0-9]+\\)): \\(?:error\\|warnin\\(g\\)\\|remar\\(k\\)\\)"
+     1 2 nil (3 . 4))
+    (edg-2
+     "at line \\([0-9]+\\) of \"\\([^ \n]+\\)\"$"
+     2 1 nil 0)
    (epc
-     "^Error [0-9]+ at (\\([0-9]*\\):\\([^)\n]+\\))" 2 1)
+     "^Error [0-9]+ at (\\([0-9]+\\):\\([^)\n]+\\))" 2 1)
    (iar
     "^\"\\(.*\\)\",\\([0-9]+\\)\\s-+\\(?:Error\\|Warnin\\(g\\)\\)\\[[0-9]+\\]:"
@@ -187,8 +189,9 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
     "^\\([^( \n\t]+\\)(\\([0-9]+\\):\\([0-9]+\\)) :\
 \\(?:warnin\\(g\\)\\|informationa\\(l\\)\\)?" 1 2 3 (4 . 5))
+    ;; fixme: should be `mips'
    (irix
-     "^[a-z0-9/]+: \\(?:[eE]rror\\|[wW]arnin\\(g\\)\\|[iI]nf\\(o\\)\\)[0-9 ]*:\
+     "^[-[:alnum:]_/]+: \\(?:[sS]evere\\|[eE]rror\\|[wW]arnin\\(g\\)\\|[iI]nf\\(o\\)\\)[0-9 ]*:\
 \\([^,\" \n\t]+\\)\\(?:, line\\|:\\) \\([0-9]+\\):" 3 4 nil (1 . 2))
    (java
@@ -206,8 +209,8 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 \\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\)\\)?" 1 2 nil (3 . 4))
    (gnu
-     "^\\(?:[a-zA-Z][-a-zA-Z0-9.]+: ?\\)?\
+     "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\)?\
-\\([/.]*[a-zA-Z]:?[^ \t\n:]*\\): ?\
+\\([/.]*[a-zA-Z]:?[^ \t\n:]*\\|{standard input}\\): ?\
 \\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\
 \\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
@@ -228,6 +231,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
      (1 (compilation-error-properties 2 3 nil nil nil 0 nil)
         append)))
+    ;; Should be lint-1, lint-2 (SysV lint)
    (mips-1
     " (\\([0-9]+\\)) in \\([^ \n]+\\)" 2 1)
    (mips-2
@@ -238,7 +242,9 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 : \\(?:error\\|warnin\\(g\\)\\) C[0-9]+:" 1 2 nil (3))
    (oracle
-     "^Semantic error at line \\([0-9]+\\), column \\([0-9]+\\), file \\(.*\\):$"
+     "^\\(?:Semantic error\\|Error\\|PCC-[0-9]+:\\).* line \\([0-9]+\\)\
+\\(?:\\(?:,\\| at\\)? column \\([0-9]+\\)\\)?\
+\\(?:,\\| in\\| of\\)? file \\(.*?\\):?$"
     3 1 2)
    (perl
@@ -261,16 +267,13 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
     nil 1 nil (3) nil (2 (compilation-face '(3))))
    (sun
-     ": \\(?:ERROR\\|WARNIN\\(G\\)\\|REMAR\\(K\\)\\) \\(?:[a-zA-Z0-9 ]+, \\)?\
+     ": \\(?:ERROR\\|WARNIN\\(G\\)\\|REMAR\\(K\\)\\) \\(?:[[:alnum:] ]+, \\)?\
 File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
     3 4 5 (1 . 2))
    (sun-ada
     "^\\([^, \n\t]+\\), line \\([0-9]+\\), char \\([0-9]+\\)[:., \(-]" 1 2 3)
-    (ultrix
-     "^\\(?:cfe\\|fort\\): \\(Warning\\)?[^:\n]*: \\([^ \n]*\\), line \\([0-9]+\\):" 2 3 nil (1))
    (4bsd
     "\\(?:^\\|::  \\|\\S ( \\)\\(/[^ \n\t()]+\\)(\\([0-9]+\\))\
 \\(?:: \\(warning:\\)?\\|$\\| ),\\)" 1 2 nil (3)))
@@ -279,14 +282,14 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
 (defcustom compilation-error-regexp-alist
  (mapcar 'car compilation-error-regexp-alist-alist)
  "Alist that specifies how to match errors in compiler output.
-Note that on Unix exerything is a valid filename, so these
+Note that on Unix everything is a valid filename, so these
 matchers must make some common sense assumptions, which catch
 normal cases.  A shorter list will be lighter on resource usage.
 Instead of an alist element, you can use a symbol, which is
 looked up in `compilation-error-regexp-alist-alist'.  You can see
 the predefined symbols and their effects in the file
-`etc/compilation.txt' (linked below if your are customizing this).
+`etc/compilation.txt' (linked below if you are customizing this).
 Each elt has the form (REGEXP FILE [LINE COLUMN TYPE HYPERLINK
 HIGHLIGHT...]).  If REGEXP matches, the FILE'th subexpression
@@ -328,7 +331,7 @@ be added."
                          (list 'const (car elt)))
                        compilation-error-regexp-alist-alist))
  :link `(file-link :tag "example file"
-                    ,(concat doc-directory "compilation.txt"))
+                    ,(expand-file-name "compilation.txt" data-directory))
  :group 'compilation)
 (defvar compilation-directory nil
@@ -357,7 +360,7 @@ you may also want to change `compilation-page-delimiter'.")
      (1 font-lock-variable-name-face)
      (2 (compilation-face '(4 . 3))))
     ;; Command output lines.  Recognize `make[n]:' lines too.
-     ("^\\([A-Za-z_0-9/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"
+     ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"
      (1 font-lock-function-name-face) (3 compilation-line-face nil t))
     (" --?o\\(?:utfile\\|utput\\)?[= ]?\\(\\S +\\)" . 1)
     ("^Compilation finished" . compilation-info-face)
@@ -427,7 +430,7 @@ You might also use mode hooks to specify it in certain modes, like this:
 (defvar compilation-locs ())
 (defvar compilation-debug nil
-  "*Set this to `t' before creating a *compilation* buffer.
+  "*Set this to t before creating a *compilation* buffer.
 Then every error line will have a debug text property with the matcher that
 fit this line and the match data.  Use `describe-text-properties'.")
@@ -447,17 +450,19 @@ starting the compilation process.")
 (defvar compile-history nil)
 (defface compilation-warning-face
-  '((((type tty) (class color)) (:foreground "cyan" :weight bold))
+  '((((class color) (min-colors 16)) (:foreground "Orange" :weight bold))
-    (((class color)) (:foreground "Orange" :weight bold))
+    (((class color)) (:foreground "cyan" :weight bold))
    (t (:weight bold)))
  "Face used to highlight compiler warnings."
  :group 'font-lock-highlighting-faces
  :version "21.4")
 (defface compilation-info-face
-  '((((type tty) (class color)) (:foreground "green" :weight bold))
+  '((((class color) (min-colors 16) (background light)) 
-    (((class color) (background light)) (:foreground "Green3" :weight bold))
+     (:foreground "Green3" :weight bold))
-    (((class color) (background dark)) (:foreground "Green" :weight bold))
+    (((class color) (min-colors 16) (background dark)) 
+     (:foreground "Green" :weight bold))
+    (((class color)) (:foreground "green" :weight bold))
    (t (:weight bold)))
  "Face used to highlight compiler warnings."
  :group 'font-lock-highlighting-faces
@@ -494,7 +499,8 @@ Faces `compilation-error-face', `compilation-warning-face',
 ;; Used for compatibility with the old compile.el.
-(defvar compilation-parsing-end nil)
+(defvaralias 'compilation-last-buffer 'next-error-last-buffer)
+(defvar compilation-parsing-end (make-marker))
 (defvar compilation-parse-errors-function nil)
 (defvar compilation-error-list nil)
 (defvar compilation-old-error-list nil)
@@ -518,6 +524,7 @@ Faces `compilation-error-face', `compilation-warning-face',
                         '(nil))        ; nil only isn't a property-change
                   (cons (match-string-no-properties idx) dir))
      mouse-face highlight
+      keymap compilation-button-map
      help-echo "mouse-2: visit current directory")))
 ;; Data type `reverse-ordered-alist' retriever.  This function retrieves the
@@ -528,6 +535,7 @@ Faces `compilation-error-face', `compilation-warning-face',
 ;; may be nil.  The other KEYs are ordered backwards so that growing line
 ;; numbers can be inserted in front and searching can abort after half the
 ;; list on average.
+(eval-when-compile                  ;Don't keep it at runtime if not needed.
 (defmacro compilation-assq (key alist)
  `(let* ((l1 ,alist)
          (l2 (cdr l1)))
@@ -538,7 +546,7 @@ Faces `compilation-error-face', `compilation-warning-face',
                        l2 (cdr l1)))
                (if l2 (eq ,key (caar l2))))
              l2
-            (setcdr l1 (cons (list ,key) l2))))))
+            (setcdr l1 (cons (list ,key) l2)))))))
 ;; This function is the central driver, called when font-locking to gather
@@ -556,17 +564,13 @@ Faces `compilation-error-face', `compilation-warning-face',
              (setq dir (previous-single-property-change (point) 'directory)
                    dir (if dir (or (get-text-property (1- dir) 'directory)
                                    (get-text-property dir 'directory)))))
-            (setq file (cons file (car dir)) ; top of dir stack is current
+            (setq file (cons file (car dir)))))
-                  file (or (gethash file compilation-locs)
-                           (puthash file (list file fmt) compilation-locs)))))
      ;; This message didn't mention one, get it from previous
      (setq file (previous-single-property-change (point) 'message)
            file (or (if file
-                         (nth 2 (car (or (get-text-property (1- file) 'message)
+                         (car (nth 2 (car (or (get-text-property (1- file) 'message)
-                                         (get-text-property file 'message)))))
+                                         (get-text-property file 'message))))))
-                     ;; no previous either -- let font-lock continue
+                     '("*unknown*"))))
-                     (gethash (setq file '("*unknown*")) compilation-locs)
-                     (puthash file (list file fmt) compilation-locs))))
    ;; All of these fields are optional, get them only if we have an index, and
    ;; it matched some part of the message.
    (and line
@@ -579,75 +583,87 @@ Faces `compilation-error-face', `compilation-warning-face',
         (setq col (match-string-no-properties col))
         (setq col (- (string-to-number col) compilation-first-column)))
    (if (and end-col (setq end-col (match-string-no-properties end-col)))
-        (setq end-col (- (string-to-number end-col) compilation-first-column))
+        (setq end-col (- (string-to-number end-col) compilation-first-column -1))
      (if end-line (setq end-col -1)))
-    (if (consp type)                    ; not a preset type, check what it is.
+    (if (consp type)                    ; not a static type, check what it is.
        (setq type (or (and (car type) (match-end (car type)) 1)
                       (and (cdr type) (match-end (cdr type)) 0)
                       2)))
-    ;; Get any (first) already existing marker (if any has one, all have one).
+    (compilation-internal-error-properties file line end-line col end-col type fmt)))
-    ;; Do this first, as the next assq`s may create new nodes.
-    (let ((marker (nth 3 (car (cdar (cddr file)))))
+(defun compilation-internal-error-properties (file line end-line col end-col type fmt)
-          (loc (compilation-assq line (cdr file)))
+  "Get the meta-info that will be added as text-properties.
-          end-loc)
+LINE, END-LINE, COL, END-COL are integers or nil.
-      (if end-line
+TYPE can be 0, 1, or 2.
-          (setq end-loc (compilation-assq end-line (cdr file))
+FILE should be (ABSOLUTE-FILENAME) or (RELATIVE-FILENAME . DIRNAME) or nil."
-                end-loc (compilation-assq end-col end-loc))
+  (unless file (setq file '("*unknown*")))
-        (if end-col                     ; use same line element
+  (setq file (compilation-get-file-structure file fmt))
-            (setq end-loc (compilation-assq end-col loc))))
+  ;; Get first already existing marker (if any has one, all have one).
-      (setq loc (compilation-assq col loc))
+  ;; Do this first, as the compilation-assq`s may create new nodes.
-      ;; If they are new, make the loc(s) reference the file they point to.
+  (let* ((marker-line (car (cddr file)))        ; a line structure
-      (or (cdr loc) (setcdr loc (list line file)))
+         (marker (nth 3 (cadr marker-line)))    ; its marker
-      (if end-loc
+         (compilation-error-screen-columns compilation-error-screen-columns)
-          (or (cdr end-loc) (setcdr end-loc (list (or end-line line) file))))
+         end-marker loc end-loc)
-      ;; If we'd found a marker, ensure that the new locs also get markers
+    (if (not (and marker (marker-buffer marker)))
-      (when (and marker
+        (setq marker)                   ; no valid marker for this file
-                 (not (or (cddr loc) (cddr end-loc))) ; maybe new node w/o marker
+      (setq loc (or line 1))            ; normalize no linenumber to line 1
-                 (marker-buffer marker)) ; other marker still valid
+      (catch 'marker                    ; find nearest loc, at least one exists
-        (or line (setq line 1))          ; normalize no linenumber to line 1
+        (dolist (x (nthcdr 3 file))     ; loop over remaining lines
-        (catch 'marker                 ; find nearest loc, at least one exists
+          (if (> (car x) loc)           ; still bigger
-          (dolist (x (cddr file))
+              (setq marker-line x)
-            (if (> (or (car x) 1) line)
+            (if (> (- (or (car marker-line) 1) loc)
-                (setq marker x)
+                   (- loc (car x)))     ; current line is nearer
-              (if (eq (or (car x) 1) line)
+                (setq marker-line x))
-                  (if (cdr (cddr x))    ; at least one other column
+            (throw 'marker t))))
-                      (throw 'marker (setq marker x))
+      (setq marker (nth 3 (cadr marker-line))
-                    (if marker (throw 'marker t)))
+            marker-line (or (car marker-line) 1))
-                (throw 'marker (or marker (setq marker x)))))))
+      (with-current-buffer (marker-buffer marker)
-        (setq marker (if (eq (car (cddr marker)) col)
+        (save-restriction
-                         (nthcdr 3 marker)
+          (widen)
-                       (cddr marker))
+          (goto-char (marker-position marker))
-              file compilation-error-screen-columns)
+          (when (or end-col end-line)
-        (with-current-buffer (marker-buffer (cddr marker))
+            (beginning-of-line (- (or end-line line) marker-line -1))
-          (save-restriction
+            (if (< end-col 0)
-            (widen)
+                (end-of-line)
-            (goto-char (marker-position (cddr marker)))
+              (if compilation-error-screen-columns
-            (beginning-of-line (- line (car (cadr marker)) -1))
+                  (move-to-column end-col)
-            (if file                    ; original c.-error-screen-columns
+                (forward-char end-col)))
-                (move-to-column (car loc))
+            (setq end-marker (list (point-marker))))
-              (forward-char (car loc)))
+          (beginning-of-line (if end-line
-            (setcdr (cdr loc) (point-marker))
+                                 (- end-line line -1)
-            (when end-loc
+                               (- loc marker-line -1)))
-              (beginning-of-line (- end-line line -1))
+          (if col
-              (if (< end-col 0)
+              (if compilation-error-screen-columns
-                  (end-of-line)
+                  (move-to-column col)
-                (if file                ; original c.-error-screen-columns
+                (forward-char col))
-                    (move-to-column (car end-loc))
+            (forward-to-indentation 0))
-                  (forward-char (car end-loc))))
+          (setq marker (list (point-marker))))))
-              (setcdr (cdr end-loc) (point-marker))))))
-      ;; Must start with face
+    (setq loc (compilation-assq line (cdr file)))
-      `(face ,compilation-message-face
+    (if end-line
-             message (,loc ,type ,end-loc)
+        (setq end-loc (compilation-assq end-line (cdr file))
-             ,@(if compilation-debug
+              end-loc (compilation-assq end-col end-loc))
-                   `(debug (,(assoc (with-no-warnings matcher) font-lock-keywords)
+      (if end-col                       ; use same line element
-                            ,@(match-data))))
+          (setq end-loc (compilation-assq end-col loc))))
-             help-echo ,(if col
+    (setq loc (compilation-assq col loc))
-                            "mouse-2: visit this file, line and column"
+    ;; If they are new, make the loc(s) reference the file they point to.
-                          (if line
+    (or (cdr loc) (setcdr loc `(,line ,file ,@marker)))
-                              "mouse-2: visit this file and line"
+    (if end-loc
-                            "mouse-2: visit this file"))
+        (or (cdr end-loc) (setcdr end-loc `(,(or end-line line) ,file ,@end-marker))))
-             keymap compilation-button-map
-             mouse-face highlight))))
+    ;; Must start with face
+    `(face ,compilation-message-face
+           message (,loc ,type ,end-loc)
+           ,@(if compilation-debug
+                 `(debug (,(assoc (with-no-warnings matcher) font-lock-keywords)
+                          ,@(match-data))))
+           help-echo ,(if col
+                          "mouse-2: visit this file, line and column"
+                        (if line
+                            "mouse-2: visit this file and line"
+                          "mouse-2: visit this file"))
+           keymap compilation-button-map
+           mouse-face highlight)))
 (defun compilation-mode-font-lock-keywords ()
  "Return expressions to highlight in Compilation mode."
@@ -686,12 +702,15 @@ Faces `compilation-error-face', `compilation-warning-face',
              ;; error location.  Let's do our best.
              `(,(car item)
                (0 (compilation-compat-error-properties
-                    (funcall ',line (list* (match-string ,file)
+                    (funcall ',line (cons (match-string ,file)
-                                           default-directory
+                                          (cons default-directory
-                                           ',(nthcdr 4 item))
+                                                ',(nthcdr 4 item)))
                             ,(if col `(match-string ,col)))))
                (,file compilation-error-face t))
+            (unless (or (null (nth 5 item)) (integerp (nth 5 item)))
+              (error "HYPERLINK should be an integer: %s" (nth 5 item)))
            `(,(nth 0 item)
              ,@(when (integerp file)
@@ -729,7 +748,7 @@ Faces `compilation-error-face', `compilation-warning-face',
 Runs COMMAND, a shell command, in a separate process asynchronously
 with output going to the buffer `*compilation*'.
-If optional second arg COMINT is t the buffer will be in comint mode with
+If optional second arg COMINT is t the buffer will be in Comint mode with
 `compilation-shell-minor-mode'.
 You can then use the command \\[next-error] to find the next error message
@@ -737,6 +756,8 @@ and move to the source code that caused it.
 Interactively, prompts for the command if `compilation-read-command' is
 non-nil; otherwise uses `compile-command'.  With prefix arg, always prompts.
+Additionally, with universal prefix arg, compilation buffer will be in
+comint mode, i.e. interactive.
 To run more than one compilation at once, start one and rename
 the \`*compilation*' buffer to some other name with
@@ -748,11 +769,13 @@ The name used for the buffer is actually whatever is returned by
 the function in `compilation-buffer-name-function', so you can set that
 to a function that generates a unique name."
  (interactive
-   (if (or compilation-read-command current-prefix-arg)
+   (list
-       (list (read-from-minibuffer "Compile command: "
+    (if (or compilation-read-command current-prefix-arg)
-                                 (eval compile-command) nil nil
+        (read-from-minibuffer "Compile command: "
-                                 '(compile-history . 1)))
+                              (eval compile-command) nil nil
-     (list (eval compile-command))))
+                              '(compile-history . 1))
+      (eval compile-command))
+    (consp current-prefix-arg)))
  (unless (equal command (eval compile-command))
    (setq compile-command command))
  (save-some-buffers (not compilation-ask-about-save) nil)
@@ -762,8 +785,8 @@ to a function that generates a unique name."
 ;; run compile with the default command line
 (defun recompile ()
  "Re-compile the program including the current buffer.
-If this is run in a compilation-mode buffer, re-use the arguments from the
+If this is run in a Compilation mode buffer, re-use the arguments from the
-original use.  Otherwise, it recompiles using `compile-command'."
+original use.  Otherwise, recompile using `compile-command'."
  (interactive)
  (save-some-buffers (not compilation-ask-about-save) nil)
  (let ((default-directory (or compilation-directory default-directory)))
@@ -773,9 +796,9 @@ original use.  Otherwise, it recompiles using `compile-command'."
 (defcustom compilation-scroll-output nil
  "*Non-nil to scroll the *compilation* buffer window as output appears.
-Setting it causes the compilation-mode commands to put point at the
+Setting it causes the Compilation mode commands to put point at the
 end of their output window so that the end of the output is always
-visible rather than the begining."
+visible rather than the beginning."
  :type 'boolean
  :version "20.3"
  :group 'compilation)
@@ -822,11 +845,11 @@ Otherwise, construct a buffer name from MODE-NAME."
 The rest of the arguments are optional; for them, nil means use the default.
 MODE is the major mode to set in the compilation buffer.  Mode
-may also be `t' meaning `compilation-shell-minor-mode' under `comint-mode'.
+may also be t meaning use `compilation-shell-minor-mode' under `comint-mode'.
 NAME-FUNCTION is a function called to name the buffer.
 If HIGHLIGHT-REGEXP is non-nil, `next-error' will temporarily highlight
-matching section of the visited source line; the default is to use the
+the matching section of the visited source line; the default is to use the
 global value of `compilation-highlight-regexp'.
 Returns the compilation buffer created."
@@ -838,8 +861,8 @@ Returns the compilation buffer created."
        (process-environment
         (append
          compilation-environment
-          (if (and (boundp 'system-uses-terminfo)
+          (if (if (boundp 'system-uses-terminfo) ; `if' for compiler warning
-                   system-uses-terminfo)
+                  system-uses-terminfo)
              (list "TERM=dumb" "TERMCAP="
                    (format "COLUMNS=%d" (window-width)))
            (list "TERM=emacs"
@@ -903,7 +926,9 @@ Returns the compilation buffer created."
           'compilation-revert-buffer)
      (set-window-start outwin (point-min))
      (or (eq outwin (selected-window))
-          (set-window-point outwin (point)))
+          (set-window-point outwin (if compilation-scroll-output
+                                       (point)
+                                     (point-min))))
      ;; The setup function is called before compilation-set-window-height
      ;; so it can set the compilation-window-height buffer locally.
      (if compilation-process-setup-function
@@ -930,6 +955,7 @@ Returns the compilation buffer created."
        ;; Fake modeline display as if `start-process' were run.
        (setq mode-line-process ":run")
        (force-mode-line-update)
+        (sit-for 0)                     ; Force redisplay
        (let ((status (call-process shell-file-name nil outbuf nil "-c"
                                    command)))
          (cond ((numberp status)
@@ -944,13 +970,17 @@ exited abnormally with code %d\n"
                                          (concat status "\n")))
                (t
                 (compilation-handle-exit 'bizarre status status))))
+        ;; Without async subprocesses, the buffer is not yet
+        ;; fontified, so fontify it now.
+        (let ((font-lock-verbose nil))  ; shut up font-lock messages
+          (font-lock-fontify-buffer))
        (message "Executing `%s'...done" command)))
    (if (buffer-local-value 'compilation-scroll-output outbuf)
        (save-selected-window
          (select-window outwin)
          (goto-char (point-max))))
    ;; Make it so the next C-x ` will use this buffer.
-    (setq compilation-last-buffer outbuf)))
+    (setq next-error-last-buffer outbuf)))
 (defun compilation-set-window-height (window)
  "Set the height of WINDOW according to `compilation-window-height'."
@@ -960,9 +990,8 @@ exited abnormally with code %d\n"
         ;; If window is alone in its frame, aside from a minibuffer,
         ;; don't change its height.
         (not (eq window (frame-root-window (window-frame window))))
-         ;; This save-current-buffer prevents us from changing the current
+         ;; Stef said that doing the saves in this order is safer:
-         ;; buffer, which might not be the same as the selected window's buffer.
+         (save-excursion
-         (save-current-buffer
           (save-selected-window
             (select-window window)
             (enlarge-window (- height (window-height))))))))
@@ -1132,20 +1161,30 @@ variable exists."
  "Marker to the location from where the next error will be found.
 The global commands next/previous/first-error/goto-error use this.")
+(defvar compilation-messages-start nil
+  "Buffer position of the beginning of the compilation messages.
+If nil, use the beginning of buffer.")
 ;; A function name can't be a hook, must be something with a value.
 (defconst compilation-turn-on-font-lock 'turn-on-font-lock)
 (defun compilation-setup (&optional minor)
-  "Prepare the buffer for the compilation parsing commands to work."
+  "Prepare the buffer for the compilation parsing commands to work.
+Optional argument MINOR indicates this is called from
+`compilation-minor-mode'."
  (make-local-variable 'compilation-current-error)
+  (make-local-variable 'compilation-messages-start)
  (make-local-variable 'compilation-error-screen-columns)
  (make-local-variable 'overlay-arrow-position)
-  (setq compilation-last-buffer (current-buffer))
+  ;; Note that compilation-next-error-function is for interfacing
+  ;; with the next-error function in simple.el, and it's only
+  ;; coincidentally named similarly to compilation-next-error.
+  (setq next-error-function 'compilation-next-error-function)
  (set (make-local-variable 'font-lock-extra-managed-props)
       '(directory message help-echo mouse-face debug))
  (set (make-local-variable 'compilation-locs)
       (make-hash-table :test 'equal :weakness 'value))
-  ;; lazy-lock would never find the message unless it's scrolled to
+  ;; lazy-lock would never find the message unless it's scrolled to.
  ;; jit-lock might fontify some things too late.
  (set (make-local-variable 'font-lock-support-mode) nil)
  (set (make-local-variable 'font-lock-maximum-size) nil)
@@ -1193,7 +1232,7 @@ Turning the mode on runs the normal hook `compilation-minor-mode-hook'."
    (font-lock-fontify-buffer)))
 (defun compilation-handle-exit (process-status exit-status msg)
-  "Write msg in the current buffer and hack its mode-line-process."
+  "Write MSG in the current buffer and hack its mode-line-process."
  (let ((buffer-read-only nil)
        (status (if compilation-exit-message-function
                    (funcall compilation-exit-message-function
@@ -1257,8 +1296,16 @@ Just inserts the text, but uses `insert-before-markers'."
            (insert-before-markers string)
            (run-hooks 'compilation-filter-hook))))))
+;;; test if a buffer is a compilation buffer, assuming we're in the buffer
+(defsubst compilation-buffer-internal-p ()
+  "Test if inside a compilation buffer."
+  (local-variable-p 'compilation-locs))
+;;; test if a buffer is a compilation buffer, using compilation-buffer-internal-p
 (defsubst compilation-buffer-p (buffer)
-  (local-variable-p 'compilation-locs buffer))
+  "Test if BUFFER is a compilation buffer."
+  (with-current-buffer buffer
+    (compilation-buffer-internal-p)))
 (defmacro compilation-loop (< property-change 1+ error)
  `(while (,< n 0)
@@ -1289,7 +1336,6 @@ Does NOT find the source line like \\[next-error]."
  (or (compilation-buffer-p (current-buffer))
      (error "Not in a compilation buffer"))
  (or pt (setq pt (point)))
-  (setq compilation-last-buffer (current-buffer))
  (let* ((msg (get-text-property pt 'message))
         (loc (car msg))
         last)
@@ -1327,25 +1373,6 @@ Does NOT find the source line like \\[previous-error]."
  (interactive "p")
  (compilation-next-error (- n)))
-(defun next-error-no-select (n)
-  "Move point to the next error in the compilation buffer and highlight match.
-Prefix arg N says how many error messages to move forwards (or
-backwards, if negative).
-Finds and highlights the source line like \\[next-error], but does not
-select the source buffer."
-  (interactive "p")
-  (next-error n)
-  (pop-to-buffer compilation-last-buffer))
-(defun previous-error-no-select (n)
-  "Move point to the previous error in the compilation buffer and highlight match.
-Prefix arg N says how many error messages to move backwards (or
-forwards, if negative).
-Finds and highlights the source line like \\[previous-error], but does not
-select the source buffer."
-  (interactive "p")
-  (next-error-no-select (- n)))
 (defun compilation-next-file (n)
  "Move point to the next error for a different file than the current one.
 Prefix arg N says how many files to move forwards (or backwards, if negative)."
@@ -1383,73 +1410,35 @@ Use this command in a compilation log buffer.  Sets the mark at point there."
 ;; Return a compilation buffer.
 ;; If the current buffer is a compilation buffer, return it.
-;; If compilation-last-buffer is set to a live buffer, use that.
 ;; Otherwise, look for a compilation buffer and signal an error
 ;; if there are none.
 (defun compilation-find-buffer (&optional other-buffer)
-  (if (and (not other-buffer)
+  (next-error-find-buffer other-buffer 'compilation-buffer-internal-p))
-           (compilation-buffer-p (current-buffer)))
-      ;; The current buffer is a compilation buffer.
-      (current-buffer)
-    (if (and compilation-last-buffer (buffer-name compilation-last-buffer)
-             (compilation-buffer-p compilation-last-buffer)
-             (or (not other-buffer) (not (eq compilation-last-buffer
-                                             (current-buffer)))))
-        compilation-last-buffer
-      (let ((buffers (buffer-list)))
-        (while (and buffers (or (not (compilation-buffer-p (car buffers)))
-                                (and other-buffer
-                                     (eq (car buffers) (current-buffer)))))
-          (setq buffers (cdr buffers)))
-        (if buffers
-            (car buffers)
-          (or (and other-buffer
-                   (compilation-buffer-p (current-buffer))
-                   ;; The current buffer is a compilation buffer.
-                   (progn
-                     (if other-buffer
-                         (message "This is the only compilation buffer."))
-                     (current-buffer)))
-              (error "No compilation started!")))))))
 ;;;###autoload
-(defun next-error (&optional n)
+(defun compilation-next-error-function (n &optional reset)
-  "Visit next compilation error message and corresponding source code.
-Prefix arg N says how many error messages to move forwards (or
-backwards, if negative).
-\\[next-error] normally uses the most recently started compilation or
-grep buffer.  However, it can operate on any buffer with output from
-the \\[compile] and \\[grep] commands, or, more generally, on any
-buffer in Compilation mode or with Compilation Minor mode enabled.  To
-specify use of a particular buffer for error messages, type
-\\[next-error] in that buffer.
-Once \\[next-error] has chosen the buffer for error messages,
-it stays with that buffer until you use it in some other buffer which
-uses Compilation mode or Compilation Minor mode.
-See variable `compilation-error-regexp-alist' for customization ideas."
  (interactive "p")
-  (set-buffer (setq compilation-last-buffer (compilation-find-buffer)))
+  (set-buffer (compilation-find-buffer))
+  (when reset
+    (setq compilation-current-error nil))
  (let* ((columns compilation-error-screen-columns) ; buffer's local value
         (last 1)
         (loc (compilation-next-error (or n 1) nil
-                                      (or compilation-current-error (point-min))))
+                                      (or compilation-current-error
+                                          compilation-messages-start
+                                          (point-min))))
         (end-loc (nth 2 loc))
         (marker (point-marker)))
    (setq compilation-current-error (point-marker)
          overlay-arrow-position
            (if (bolp)
                compilation-current-error
-              (save-excursion
+              (copy-marker (line-beginning-position)))
-                (beginning-of-line)
-                (point-marker)))
          loc (car loc))
    ;; If loc contains no marker, no error in that file has been visited.  If
    ;; the marker is invalid the buffer has been killed.  So, recalculate all
    ;; markers for that file.
-    (unless (and (nthcdr 3 loc) (marker-buffer (nth 3 loc)))
+    (unless (and (nth 3 loc) (marker-buffer (nth 3 loc)))
      (with-current-buffer (compilation-find-file marker (caar (nth 2 loc))
                                                  (or (cdar (nth 2 loc))
                                                      default-directory))
@@ -1472,50 +1461,66 @@ See variable `compilation-error-regexp-alist' for customization ideas."
                      (forward-char (car col))))
                (beginning-of-line)
                (skip-chars-forward " \t"))
-              (if (nthcdr 3 col)
+              (if (nth 3 col)
                  (set-marker (nth 3 col) (point))
                (setcdr (nthcdr 2 col) `(,(point-marker)))))))))
    (compilation-goto-locus marker (nth 3 loc) (nth 3 end-loc))
    (setcdr (nthcdr 3 loc) t)))         ; Set this one as visited.
-;;;###autoload (define-key ctl-x-map "`" 'next-error)
+(defvar compilation-gcpro nil
+  "Internal variable used to keep some values from being GC'd.")
-(defun previous-error (n)
+(make-variable-buffer-local 'compilation-gcpro)
-  "Visit previous compilation error message and corresponding source code.
-Prefix arg N says how many error messages to move backwards (or
+(defun compilation-fake-loc (marker file &optional line col)
-forwards, if negative).
+  "Preassociate MARKER with FILE.
+FILE should be ABSOLUTE-FILENAME or (RELATIVE-FILENAME . DIRNAME).
-This operates on the output from the \\[compile] and \\[grep] commands."
+This is useful when you compile temporary files, but want
-  (interactive "p")
+automatic translation of the messages to the real buffer from
-  (next-error (- n)))
+which the temporary file came.  This only works if done before a
+message about FILE appears!
-(defun first-error (n)
-  "Restart at the first error.
+Optional args LINE and COL default to 1 and beginning of
-Visit corresponding source code.
+indentation respectively.  The marker is expected to reflect
-With prefix arg N, visit the source code of the Nth error.
+this.  In the simplest case the marker points to the first line
-This operates on the output from the \\[compile] command."
+of the region that was saved to the temp file.
-  (interactive "p")
-  (set-buffer (setq compilation-last-buffer (compilation-find-buffer)))
+If you concatenate several regions into the temp file (e.g. a
-  (setq compilation-current-error nil)
+header with variable assignments and a code region), you must
-  (next-error n))
+call this several times, once each for the last line of one
+region and the first line of the next region."
-(defcustom compilation-context-lines next-screen-context-lines
+  (or (consp file) (setq file (list file)))
-  "*Display this many lines of leading context before message."
+  (setq file (compilation-get-file-structure file))
-  :type 'integer
+  ;; Between the current call to compilation-fake-loc and the first occurrence
+  ;; of an error message referring to `file', the data is only kept is the
+  ;; weak hash-table compilation-locs, so we need to prevent this entry
+  ;; in compilation-locs from being GC'd away.  --Stef
+  (push file compilation-gcpro)
+  (let ((loc (compilation-assq (or line 1) (cdr file))))
+    (setq loc (compilation-assq col loc))
+    (if (cdr loc)
+        (setcdr (cddr loc) (list marker))
+      (setcdr loc (list line file marker)))
+    loc))
+(defcustom compilation-context-lines 0
+  "*Display this many lines of leading context before message.
+If nil, don't scroll the compilation output window."
+  :type '(choice integer (const :tag "No window scrolling" nil))
  :group 'compilation
  :version "21.4")
 (defsubst compilation-set-window (w mk)
-  ;; Align the compilation output window W with marker MK near top.
+  "Align the compilation output window W with marker MK near top."
-  (set-window-start w (save-excursion
+  (if (integerp compilation-context-lines)
-                        (goto-char mk)
+      (set-window-start w (save-excursion
-                        (beginning-of-line (- 1 compilation-context-lines))
+                            (goto-char mk)
-                        (point)))
+                            (beginning-of-line (- 1 compilation-context-lines))
+                            (point))))
  (set-window-point w mk))
 (defun compilation-goto-locus (msg mk end-mk)
-  "Jump to an error MESSAGE and SOURCE.
+  "Jump to an error corresponding to MSG at MK.
-All arguments are markers.  If SOURCE-END is non nil, mark is set there."
+All arguments are markers.  If END-MK is non nil, mark is set there."
  (if (eq (window-buffer (selected-window))
          (marker-buffer msg))
      ;; If the compilation buffer window is selected,
@@ -1622,67 +1627,58 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
              (overlays-in (point-min) (point-max)))
      buffer)))
-(defun compilation-normalize-filename (filename)
+(defun compilation-get-file-structure (file &optional fmt)
-  "Convert a filename string found in an error message to make it usable."
+  "Retrieve FILE's file-structure or create a new one.
+FILE should be (ABSOLUTE-FILENAME) or (RELATIVE-FILENAME . DIRNAME)."
-  ;; Check for a comint-file-name-prefix and prepend it if
-  ;; appropriate.  (This is very useful for
+  (or (gethash file compilation-locs)
-  ;; compilation-minor-mode in an rlogin-mode buffer.)
+      ;; File was not previously encountered, at least not in the form passed.
-  (and (boundp 'comint-file-name-prefix)
+      ;; Let's normalize it and look again.
-       ;; If file name is relative, default-directory will
+      (let ((filename (car file))
-       ;; already contain the comint-file-name-prefix (done
+            (default-directory (if (cdr file)
-       ;; by compile-abbreviate-directory).
+                                   (file-truename (cdr file))
-       (file-name-absolute-p filename)
+                                 default-directory)))
-       (setq filename
-             (concat (with-no-warnings 'comint-file-name-prefix) filename)))
+        ;; Check for a comint-file-name-prefix and prepend it if appropriate.
+        ;; (This is very useful for compilation-minor-mode in an rlogin-mode
-  ;; If compilation-parse-errors-filename-function is
+        ;; buffer.)
-  ;; defined, use it to process the filename.
+        (if (boundp 'comint-file-name-prefix)
-  (when compilation-parse-errors-filename-function
+            (if (file-name-absolute-p filename)
-    (setq filename
+                (setq filename
-          (funcall compilation-parse-errors-filename-function
+                      (concat (with-no-warnings comint-file-name-prefix) filename))
-                   filename)))
+              (setq default-directory
+                    (file-truename
-  ;; Some compilers (e.g. Sun's java compiler, reportedly)
+                     (concat (with-no-warnings comint-file-name-prefix) default-directory)))))
-  ;; produce bogus file names like "./bar//foo.c" for file
-  ;; "bar/foo.c"; expand-file-name will collapse these into
+        ;; If compilation-parse-errors-filename-function is
-  ;; "/foo.c" and fail to find the appropriate file.  So we
+        ;; defined, use it to process the filename.
-  ;; look for doubled slashes in the file name and fix them
+        (when compilation-parse-errors-filename-function
-  ;; up in the buffer.
+          (setq filename
-  (setq filename (command-line-normalize-file-name filename)))
+                (funcall compilation-parse-errors-filename-function
+                         filename)))
-;; If directory DIR is a subdir of ORIG or of ORIG's parent,
+        ;; Some compilers (e.g. Sun's java compiler, reportedly) produce bogus
-;; return a relative name for it starting from ORIG or its parent.
+        ;; file names like "./bar//foo.c" for file "bar/foo.c";
-;; ORIG-EXPANDED is an expanded version of ORIG.
+        ;; expand-file-name will collapse these into "/foo.c" and fail to find
-;; PARENT-EXPANDED is an expanded version of ORIG's parent.
+        ;; the appropriate file.  So we look for doubled slashes in the file
-;; Those two args could be computed here, but we run faster by
+        ;; name and fix them.
-;; having the caller compute them just once.
+        (setq filename (command-line-normalize-file-name filename))
-(defun compile-abbreviate-directory (dir orig orig-expanded parent-expanded)
-  ;; Apply canonical abbreviations to DIR first thing.
+        ;; Now eliminate any "..", because find-file would get them wrong.
-  ;; Those abbreviations are already done in the other arguments passed.
+        ;; Make relative and absolute filenames, with or without links, the
-  (setq dir (abbreviate-file-name dir))
+        ;; same.
+        (setq filename
-  ;; Check for a comint-file-name-prefix and prepend it if appropriate.
+              (list (abbreviate-file-name
-  ;; (This is very useful for compilation-minor-mode in an rlogin-mode
+                     (file-truename (if (cdr file)
-  ;; buffer.)
+                                        (expand-file-name filename)
-  (if (boundp 'comint-file-name-prefix)
+                                      filename)))))
-      (setq dir (concat comint-file-name-prefix dir)))
+        ;; Store it for the possibly unnormalized name
-  (if (and (> (length dir) (length orig-expanded))
+        (puthash file
-           (string= orig-expanded
+                 ;; Retrieve or create file-structure for normalized name
-                    (substring dir 0 (length orig-expanded))))
+                 (or (gethash filename compilation-locs)
-      (setq dir
+                     (puthash filename (list filename fmt) compilation-locs))
-            (concat orig
+                 compilation-locs))))
-                    (substring dir (length orig-expanded)))))
-  (if (and (> (length dir) (length parent-expanded))
-           (string= parent-expanded
-                    (substring dir 0 (length parent-expanded))))
-    (setq dir
-          (concat (file-name-directory
-                   (directory-file-name orig))
-                  (substring dir (length parent-expanded)))))
-  dir)
 (add-to-list 'debug-ignored-errors "^No more [-a-z ]+s yet$")
@@ -1691,17 +1687,26 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
 (defun compile-buffer-substring (n) (if n (match-string n)))
 (defun compilation-compat-error-properties (err)
-  ;; Map old-style ERROR to new-style MESSAGE.
+  "Map old-style error ERR to new-style message."
-  (let* ((dst (cdr err))
+  ;; Old-style structure is (MARKER (FILE DIR) LINE COL) or
-         (loc (cond ((markerp dst) (list nil nil nil dst))
+  ;; (MARKER . MARKER).
-                    ((consp dst)
+  (let ((dst (cdr err)))
-                     (list (nth 2 dst) (nth 1 dst)
+    (if (markerp dst)
-                           (cons (cdar dst) (caar dst)))))))
+        ;; Must start with a face, for font-lock.
-    ;; Must start with a face, for font-lock.
+        `(face nil
-    `(face nil
+          message ,(list (list nil nil nil dst) 2)
-      message ,(list loc 2)
+          help-echo "mouse-2: visit the source location"
-      help-echo "mouse-2: visit the source location"
+          keymap compilation-button-map
-      mouse-face highlight)))
+          mouse-face highlight)
+      ;; Too difficult to do it by hand: dispatch to the normal code.
+      (let* ((file (pop dst))
+             (line (pop dst))
+             (col (pop dst))
+             (filename (pop file))
+             (dirname (pop file))
+             (fmt (pop file)))
+        (compilation-internal-error-properties
+         (cons filename dirname) line nil col nil 2 fmt)))))
 (defun compilation-compat-parse-errors (limit)
  (when compilation-parse-errors-function
@@ -1739,10 +1744,12 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
  (goto-char limit)
  nil)
+;; Beware: this is not only compatiblity code.  New code stil uses it.  --Stef
 (defun compilation-forget-errors ()
  ;; In case we hit the same file/line specs, we want to recompute a new
  ;; marker for them, so flush our cache.
  (setq compilation-locs (make-hash-table :test 'equal :weakness 'value))
+  (setq compilation-gcpro nil)
  ;; FIXME: the old code reset the directory-stack, so maybe we should
  ;; put a `directory change' marker of some sort, but where?  -stef
  ;;
@@ -1754,9 +1761,19 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
  ;; something equivalent to point-max.  So we speculatively move
  ;; compilation-current-error to point-max (since the external package
  ;; won't know that it should do it).  --stef
-  (setq compilation-current-error (point-max)))
+  (setq compilation-current-error nil)
+  (let* ((proc (get-buffer-process (current-buffer)))
+         (mark (if proc (process-mark proc)))
+         (pos (or mark (point-max))))
+    (setq compilation-messages-start
+          ;; In the future, ignore the text already present in the buffer.
+          ;; Since many process filter functions insert before markers,
+          ;; we need to put ours just before the insertion point rather
+          ;; than at the insertion point.  If that's not possible, then
+          ;; don't use a marker.  --Stef
+          (if (> pos (point-min)) (copy-marker (1- pos)) pos))))
 (provide 'compile)
-;;; arch-tag: 12465727-7382-4f72-b234-79855a00dd8c
+;; arch-tag: 12465727-7382-4f72-b234-79855a00dd8c
 ;;; compile.el ends here
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index e13198fb240..c651e06b899 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -926,12 +926,9 @@ the faces: please specify bold, italic, underline, shadow and box.)
 (defun cperl-putback-char (c)           ; Emacs 19
  (set 'unread-command-events (list c))) ; Avoid undefined warning
-(if (boundp 'unread-command-events)
+(if cperl-xemacs-p
-    (if cperl-xemacs-p
+    (defun cperl-putback-char (c)       ; XEmacs >= 19.12
-        (defun cperl-putback-char (c)   ; XEmacs >= 19.12
+      (setq unread-command-events (list (eval '(character-to-event c))))))
-          (setq unread-command-events (list (eval '(character-to-event c))))))
-  (defun cperl-putback-char (c)         ; XEmacs <= 19.11
-    (set 'unread-command-event (eval '(character-to-event c))))) ; Avoid warnings
 (or (fboundp 'uncomment-region)
    (defun uncomment-region (beg end)
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index ef5d1eba998..184077f6a3a 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1248,7 +1248,11 @@ where they were found."
 (defun etags-tags-completion-table ()
-  (let ((table (make-vector 511 0)))
+  (let ((table (make-vector 511 0))
+        (point-max (/ (float (point-max)) 100.0))
+        (msg-fmt (format 
+                  "Making tags completion table for %s...%%d%%%%"
+                  buffer-file-name)))
    (save-excursion
      (goto-char (point-min))
      ;; This monster regexp matches an etags tag line.
@@ -1264,11 +1268,12 @@ where they were found."
 \\([-a-zA-Z0-9_+*$?:]+\\)[^-a-zA-Z0-9_+*$?:\177]*\\)\177\
 \\(\\([^\n\001]+\\)\001\\)?\\([0-9]+\\)?,\\([0-9]+\\)?\n"
              nil t)
-        (intern (if (match-beginning 5)
+        (intern (prog1 (if (match-beginning 5)
-                    ;; There is an explicit tag name.
+                           ;; There is an explicit tag name.
-                    (buffer-substring (match-beginning 5) (match-end 5))
+                           (buffer-substring (match-beginning 5) (match-end 5))
-                  ;; No explicit tag name.  Best guess.
+                         ;; No explicit tag name.  Best guess.
-                  (buffer-substring (match-beginning 3) (match-end 3)))
+                         (buffer-substring (match-beginning 3) (match-end 3)))
+                  (message msg-fmt (/ (point) point-max)))
                table)))
    table))
@@ -1866,6 +1871,7 @@ directory specification."
        (or gotany
            (error "File %s not in current tags tables" file)))))
  (with-current-buffer "*Tags List*"
+    (require 'apropos)
    (apropos-mode)
    (setq buffer-read-only t)))
@@ -1884,6 +1890,7 @@ directory specification."
          (funcall tags-apropos-function regexp))))
    (etags-tags-apropos-additional regexp))
  (with-current-buffer "*Tags List*"
+    (require 'apropos)
    (apropos-mode)
    ;; apropos-mode is derived from fundamental-mode and it kills
    ;; all local variables.
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 11553a1fdb6..53165fbecb7 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -153,7 +153,7 @@
 ;;; Code:
 ;; TODO
-;; Support for hideshow, align.
+;; Support for align.
 ;; OpenMP, preprocessor highlighting.
 (defvar comment-auto-fill-only-comments)
@@ -589,6 +589,53 @@ characters long.")
 (make-variable-buffer-local 'f90-cache-position)
+;; Hideshow support.
+(defconst f90-end-block-re
+  (concat "^[ \t0-9]*\\<end\\>[ \t]*"
+          (regexp-opt '("do" "if" "forall" "function" "interface"
+                        "module" "program" "select"  "subroutine"
+                        "type" "where" ) t)
+          "[ \t]*\\sw*")
+  "Regexp matching the end of a \"block\" of F90 code.
+Used in the F90 entry in `hs-special-modes-alist'.")
+;; Ignore the fact that FUNCTION, SUBROUTINE, WHERE, FORALL have a
+;; following "(".  DO, CASE, IF can have labels; IF must be
+;; accompanied by THEN.
+;; A big problem is that many of these statements can be broken over
+;; lines, even with embedded comments. We only try to handle this for
+;; IF ... THEN statements, assuming and hoping it will be less common
+;; for other constructs. We match up to one new-line, provided ")
+;; THEN" appears on one line. Matching on just ") THEN" is no good,
+;; since that includes ELSE branches.
+;; For a fully accurate solution, hideshow would probably have to be
+;; modified to allow functions as well as regexps to be used to
+;; specify block start and end positions.
+(defconst f90-start-block-re
+  (concat
+   "^[ \t0-9]*"                         ; statement number
+   "\\(\\("
+   "\\(\\sw+[ \t]*:[ \t]*\\)?"          ; structure label
+   "\\(do\\|select[ \t]*case\\|if[ \t]*(.*\n?.*)[ \t]*then\\|"
+   ;; Distinguish WHERE block from isolated WHERE.
+   "\\(where\\|forall\\)[ \t]*(.*)[ \t]*\\(!\\|$\\)\\)\\)"
+   "\\|"
+   "program\\|interface\\|module\\|type\\|function\\|subroutine"
+   ;; ") THEN" at line end. Problem - also does ELSE.
+;;;   "\\|.*)[ \t]*then[ \t]*\\($\\|!\\)"
+   "\\)"
+   "[ \t]*")
+  "Regexp matching the start of a \"block\" of F90 code.
+A simple regexp cannot do this in fully correct fashion, so this
+tries to strike a compromise between complexity and flexibility.
+Used in the F90 entry in `hs-special-modes-alist'.")
+;; hs-special-modes-alist is autoloaded.
+(add-to-list 'hs-special-modes-alist
+             `(f90-mode ,f90-start-block-re ,f90-end-block-re
+                        "!" f90-end-of-block nil))
 ;; Imenu support.
 (defvar f90-imenu-generic-expression
  (let ((good-char "[^!\"\&\n \t]") (not-e "[^e!\n\"\& \t]")
@@ -850,14 +897,16 @@ line-number before indenting."
 (defsubst f90-get-present-comment-type ()
  "If point lies within a comment, return the string starting the comment.
-For example, \"!\" or \"!!\"."
+For example, \"!\" or \"!!\", followed by the appropriate amount of
+whitespace, if any."
+  ;; Include the whitespace for consistent auto-filling of comment blocks.
  (save-excursion
    (when (f90-in-comment)
      (beginning-of-line)
-      (re-search-forward "!+" (line-end-position))
+      (re-search-forward "!+[ \t]*" (line-end-position))
      (while (f90-in-string)
-        (re-search-forward "!+" (line-end-position)))
+        (re-search-forward "!+[ \t]*" (line-end-position)))
-      (match-string 0))))
+      (match-string-no-properties 0))))
 (defsubst f90-equal-symbols (a b)
  "Compare strings A and B neglecting case and allowing for nil value."
@@ -1519,6 +1568,7 @@ is non-nil, call `f90-update-line' after inserting the continuation marker."
  (cond ((f90-in-string)
         (insert "&\n&"))
        ((f90-in-comment)
+         (delete-horizontal-space 'backwards) ; remove trailing whitespace
         (insert "\n" (f90-get-present-comment-type)))
        (t (insert "&")
           (or no-update (f90-update-line))
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
new file mode 100644
index 00000000000..2cd62eeecee
--- /dev/null
+++ b/lisp/progmodes/flymake.el
@@ -0,0 +1,2504 @@
+;;; flymake.el -- a universal on-the-fly syntax checker
+;; Copyright (C) 2003 Free Software Foundation
+;; Author:  Pavel Kobiakov <pk_at_work@yahoo.com>
+;; Maintainer: Pavel Kobiakov <pk_at_work@yahoo.com>
+;; Version: 0.3
+;; Keywords: c languages tools
+;; This file is part of GNU Emacs.
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+;;; Commentary:
+;;
+;; Flymake is a minor Emacs mode performing on-the-fly syntax
+;; checks using the external syntax check tool (for C/C++ this
+;; is usually the compiler)
+;;; Code:
+;;;_* Provide
+(provide 'flymake)
+;;;; [[ Overlay compatibility
+(autoload 'make-overlay            "overlay" "Overlay compatibility kit." t)
+(autoload 'overlayp                "overlay" "Overlay compatibility kit." t)
+(autoload 'overlays-in             "overlay" "Overlay compatibility kit." t)
+(autoload 'delete-overlay          "overlay" "Overlay compatibility kit." t)
+(autoload 'overlay-put             "overlay" "Overlay compatibility kit." t)
+(autoload 'overlay-get             "overlay" "Overlay compatibility kit." t)
+;;;; ]]
+;;;; [[ cross-emacs compatibility routines
+(defvar flymake-emacs
+    (cond
+        ((string-match "XEmacs" emacs-version)  'xemacs)
+        (t                                      'emacs)
+        )
+    "Currently used emacs flavor"
+)
+(defun flymake-makehash(&optional test)
+    (cond
+        ((equal flymake-emacs 'xemacs)  (if test (make-hash-table :test test) (make-hash-table)))
+        (t                              (makehash test))
+    )
+)
+(defun flymake-time-to-float(&optional tm)
+        "Convert `current-time` to a float number of seconds."
+        (multiple-value-bind (s0 s1 s2) (or tm (current-time))
+          (+ (* (float (ash 1 16)) s0) (float s1) (* 0.0000001 s2)))
+)
+(defun flymake-float-time()
+    (cond
+        ((equal flymake-emacs 'xemacs)  (flymake-time-to-float (current-time)))
+        (t                              (float-time))
+    )
+)
+(defun flymake-replace-regexp-in-string(regexp rep str)
+    (cond
+        ((equal flymake-emacs 'xemacs)  (replace-in-string str regexp rep))
+        (t                              (replace-regexp-in-string regexp rep str))
+        )
+)
+(defun flymake-split-string-remove-empty-edges(str pattern)
+    "split, then remove first and/or last in case it's empty"
+        (let* ((splitted (split-string str pattern)))
+            (if (and (> (length splitted) 0) (= 0 (length (elt splitted 0))))
+                        (setq splitted (cdr splitted))
+                )
+            (if (and (> (length splitted) 0) (= 0 (length (elt splitted (1- (length splitted))))))
+                        (setq splitted (reverse (cdr (reverse splitted))))
+                )
+                splitted
+    )
+)
+(defun flymake-split-string(str pattern)
+    (cond
+        ((equal flymake-emacs 'xemacs)  (flymake-split-string-remove-empty-edges str pattern))
+        (t                              (split-string str pattern))
+    )
+)
+(defun flymake-get-temp-dir()
+    (cond
+        ((equal flymake-emacs 'xemacs)  (temp-directory))
+        (t                              temporary-file-directory)
+    )
+)
+(defun flymake-line-beginning-position()
+    (save-excursion
+        (beginning-of-line)
+        (point)
+    )
+)
+(defun flymake-line-end-position()
+    (save-excursion
+        (end-of-line)
+        (point)
+    )
+)
+(defun flymake-popup-menu(pos menu-data)
+    (cond
+       ((equal flymake-emacs 'xemacs)
+            (let* ((x-pos       (nth 0 (nth 0 pos)))
+                   (y-pos       (nth 1 (nth 0 pos)))
+                   (fake-event-props  '(button 1 x 1 y 1)))
+                (setq fake-event-props (plist-put fake-event-props 'x x-pos))
+                (setq fake-event-props (plist-put fake-event-props 'y y-pos))
+                (popup-menu (flymake-make-xemacs-menu menu-data) (make-event 'button-press fake-event-props))
+            )
+       )
+       (t                              (x-popup-menu pos (flymake-make-emacs-menu menu-data)))
+    )
+)
+(defun flymake-make-emacs-menu(menu-data)
+    (let* ((menu-title     (nth 0 menu-data))
+                   (menu-items     (nth 1 menu-data))
+                   (menu-commands  nil))
+        (setq menu-commands (mapcar (lambda (foo)
+                                      (cons (nth 0 foo) (nth 1 foo)))
+                                    menu-items))
+                (list menu-title (cons "" menu-commands))
+    )
+)
+(defun flymake-nop()
+)
+(defun flymake-make-xemacs-menu(menu-data)
+    (let* ((menu-title     (nth 0 menu-data))
+           (menu-items     (nth 1 menu-data))
+           (menu-commands  nil))
+        (setq menu-commands (mapcar (lambda (foo)
+                                      (vector (nth 0 foo) (or (nth 1 foo) '(flymake-nop)) t))
+                                    menu-items))
+        (cons menu-title menu-commands)
+    )
+)
+(defun flymake-xemacs-window-edges(&optional window)
+    (let ((edges  (window-pixel-edges window))
+          tmp)
+        (setq tmp edges)
+        (setcar tmp (/ (car tmp) (face-width 'default)))
+        (setq tmp (cdr tmp))
+        (setcar tmp (/ (car tmp) (face-height 'default)))
+        (setq tmp (cdr tmp))
+        (setcar tmp (/ (car tmp) (face-width 'default)))
+        (setq tmp (cdr tmp))
+        (setcar tmp (/ (car tmp) (face-height 'default)))
+        edges
+    )
+)
+(defun flymake-current-row()
+    "return current row in current frame"
+    (cond
+       ((equal flymake-emacs 'xemacs)  (count-lines (window-start) (point)))
+       (t                              (+ (car (cdr (window-edges))) (count-lines (window-start) (point))))
+    )
+)
+(defun flymake-selected-frame()
+    (cond
+       ((equal flymake-emacs 'xemacs)  (selected-window))
+       (t                              (selected-frame))
+    )
+)
+;;;; ]]
+(defcustom flymake-log-level -1
+    "Logging level, only messages with level > flymake-log-level will not be logged
+-1 = NONE, 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG"
+    :group 'flymake
+    :type 'integer
+)
+(defun flymake-log(level text &rest args)
+    "Log a message with optional arguments"
+    (if (<= level flymake-log-level)
+        (let* ((msg (apply 'format text args)))
+            (message msg)
+            ;(with-temp-buffer
+            ;    (insert msg)
+            ;   (insert "\n")
+            ;   (flymake-save-buffer-in-file (current-buffer) "d:/flymake.log" t)  ; make log file name customizable
+            ;)
+        )
+    )
+)
+(defun flymake-ins-after(list pos val)
+    "insert val into list after position pos"
+    (let ((tmp (copy-sequence list))) ; (???)
+        (setcdr (nthcdr pos tmp) (cons val (nthcdr (1+ pos) tmp)))
+        tmp
+    )
+)
+(defun flymake-set-at(list pos val)
+    "set val at position pos in list"
+    (let ((tmp (copy-sequence list))) ; (???)
+        (setcar (nthcdr pos tmp) val)
+        tmp
+    )
+)
+(defvar flymake-pid-to-names(flymake-makehash)
+    "pid -> source buffer name, output file name mapping"
+)
+(defun flymake-reg-names(pid source-buffer-name)
+    "Save into in pid map"
+    (unless (stringp source-buffer-name)
+        (error "invalid buffer name")
+    )
+    (puthash pid (list source-buffer-name) flymake-pid-to-names)
+)
+(defun flymake-get-source-buffer-name(pid)
+    "Return buffer name stored in pid map"
+    (nth 0 (gethash pid flymake-pid-to-names))
+)
+(defun flymake-unreg-names(pid)
+    "Delete pid->buffer name mapping"
+    (remhash pid flymake-pid-to-names)
+)
+(defun flymake-get-buffer-var(buffer var-name)
+    "switch to buffer if necessary and return local variable var"
+    (unless (bufferp buffer)
+        (error "invalid buffer")
+    )
+    (if (eq buffer (current-buffer))
+        (symbol-value var-name)
+    ;else
+        (save-excursion
+            (set-buffer buffer)
+            (symbol-value var-name)
+        )
+    )
+)
+(defun flymake-set-buffer-var(buffer var-name var-value)
+    "switch to buffer if necessary and set local variable var-name to var-value"
+    (unless (bufferp buffer)
+        (error "invalid buffer")
+    )
+    (if (eq buffer (current-buffer))
+        (set var-name var-value)
+    ;else
+        (save-excursion
+            (set-buffer buffer)
+            (set var-name var-value)
+        )
+    )
+)
+(defvar flymake-buffer-data(flymake-makehash)
+    "data specific to syntax check tool, in name-value pairs"
+)
+(make-variable-buffer-local 'flymake-buffer-data)
+(defun flymake-get-buffer-data(buffer)
+    (flymake-get-buffer-var buffer 'flymake-buffer-data)
+)
+(defun flymake-set-buffer-data(buffer data)
+    (flymake-set-buffer-var buffer 'flymake-buffer-data data)
+)
+(defun flymake-get-buffer-value(buffer name)
+    (gethash name (flymake-get-buffer-data buffer))
+)
+(defun flymake-set-buffer-value(buffer name value)
+    (puthash name value (flymake-get-buffer-data buffer))
+)
+(defvar flymake-output-residual nil
+  ""
+)
+(make-variable-buffer-local 'flymake-output-residual)
+(defun flymake-get-buffer-output-residual(buffer)
+    (flymake-get-buffer-var buffer 'flymake-output-residual)
+)
+(defun flymake-set-buffer-output-residual(buffer residual)
+    (flymake-set-buffer-var buffer 'flymake-output-residual residual)
+)
+(defcustom flymake-allowed-file-name-masks '((".+\\.c$" flymake-simple-make-init flymake-simple-cleanup flymake-get-real-file-name)
+                                             (".+\\.cpp$" flymake-simple-make-init flymake-simple-cleanup flymake-get-real-file-name)
+                                             (".+\\.xml$" flymake-xml-init flymake-simple-cleanup flymake-get-real-file-name)
+                                             (".+\\.html?$" flymake-xml-init flymake-simple-cleanup flymake-get-real-file-name)
+                                             (".+\\.cs$" flymake-simple-make-init flymake-simple-cleanup flymake-get-real-file-name)
+                                             (".+\\.pl$" flymake-perl-init flymake-simple-cleanup flymake-get-real-file-name)
+                                             (".+\\.h$" flymake-master-make-header-init flymake-master-cleanup flymake-get-real-file-name)
+                                             (".+\\.java$" flymake-simple-make-java-init flymake-simple-java-cleanup flymake-get-real-file-name)
+                                             (".+[0-9]+\\.tex$" flymake-master-tex-init flymake-master-cleanup flymake-get-real-file-name)
+                                             (".+\\.tex$" flymake-simple-tex-init flymake-simple-cleanup flymake-get-real-file-name)
+                                             (".+\\.idl$" flymake-simple-make-init flymake-simple-cleanup flymake-get-real-file-name)
+;                                            (".+\\.cpp$" 1)
+;                                            (".+\\.java$" 3)
+;                                            (".+\\.h$" 2 (".+\\.cpp$" ".+\\.c$")
+;                                                ("[ \t]*#[ \t]*include[ \t]*\"\\([\w0-9/\\_\.]*[/\\]*\\)\\(%s\\)\"" 1 2))
+;                                            (".+\\.idl$" 1)
+;                                            (".+\\.odl$" 1)
+;                                            (".+[0-9]+\\.tex$" 2 (".+\\.tex$")
+;                                                ("[ \t]*\\input[ \t]*{\\(.*\\)\\(%s\\)}" 1 2 ))
+;                                            (".+\\.tex$" 1)
+                                             )
+    "*Files syntax checking is allowed for"
+    :group 'flymake
+    :type '(repeat (string symbol symbol symbol))
+)
+(defun flymake-get-file-name-mode-and-masks(file-name)
+    "return the corresponding entry from flymake-allowed-file-name-masks"
+    (unless (stringp file-name)
+        (error "invalid file-name")
+    )
+    (let ((count           (length flymake-allowed-file-name-masks))
+          (idx             0)
+          (mode-and-masks  nil))
+        (while (and (not mode-and-masks) (< idx count))
+            (if (string-match (nth 0 (nth idx flymake-allowed-file-name-masks)) file-name)
+                (setq mode-and-masks (cdr (nth idx flymake-allowed-file-name-masks)))
+            )
+            (setq idx (1+ idx))
+        )
+        (flymake-log 3 "file %s, init=%s" file-name (car mode-and-masks))
+        mode-and-masks
+    )
+)
+(defun flymake-can-syntax-check-file(file-name)
+    "Determine whether we can syntax check file-name: nil if cannot, non-nil if can"
+    (if (flymake-get-init-function file-name)
+        t
+    ;else
+        nil
+    )
+)
+(defun flymake-get-init-function(file-name)
+    "return init function to be used for the file"
+    (let* ((init-f  (nth 0 (flymake-get-file-name-mode-and-masks file-name))))
+        ;(flymake-log 0 "calling %s" init-f)
+        ;(funcall init-f (current-buffer))
+    )
+    (nth 0 (flymake-get-file-name-mode-and-masks file-name))
+)
+(defun flymake-get-cleanup-function(file-name)
+    "return cleanup function to be used for the file"
+    (nth 1 (flymake-get-file-name-mode-and-masks file-name))
+)
+(defun flymake-get-real-file-name-function(file-name)
+    ""
+    (or (nth 2 (flymake-get-file-name-mode-and-masks file-name)) 'flymake-get-real-file-name)
+)
+(defcustom flymake-buildfile-dirs '("." ".." "../.." "../../.." "../../../.." "../../../../.." "../../../../../.." "../../../../../../.." "../../../../../../../.." "../../../../../../../../.." "../../../../../../../../../.." "../../../../../../../../../../..")
+    "dirs to look for buildfile"
+    :group 'flymake
+    :type '(repeat (string))
+)
+(defvar flymake-find-buildfile-cache (flymake-makehash 'equal))
+(defun flymake-get-buildfile-from-cache(dir-name)
+    (gethash dir-name flymake-find-buildfile-cache)
+)
+(defun flymake-add-buildfile-to-cache(dir-name buildfile)
+    (puthash dir-name buildfile flymake-find-buildfile-cache)
+)
+(defun flymake-clear-buildfile-cache()
+    (clrhash flymake-find-buildfile-cache)
+)
+(defun flymake-find-buildfile(buildfile-name source-dir-name dirs)
+    "find buildfile (i.e. Makefile, build.xml, etc.) starting from current directory. Return its path or nil if not found"
+    (if (flymake-get-buildfile-from-cache source-dir-name)
+        (progn
+            (flymake-get-buildfile-from-cache source-dir-name)
+        )
+    ;else
+        (let* ((buildfile-dir          nil)
+               (buildfile              nil)
+               (dir-count              (length dirs))
+               (dir-idx                0)
+               (found                  nil))
+            (while (and (not found) (< dir-idx dir-count))
+                (setq buildfile-dir (concat source-dir-name (nth dir-idx dirs)))
+                (setq buildfile (concat buildfile-dir "/" buildfile-name))
+                (when (file-exists-p buildfile)
+                    (setq found t)
+                )
+                (setq dir-idx (1+ dir-idx))
+            )
+            (if found
+                (progn
+                    (flymake-log 3 "found buildfile at %s/%s" buildfile-dir buildfile-name)
+                    (flymake-add-buildfile-to-cache source-dir-name buildfile-dir)
+                    buildfile-dir
+                )
+            ;else
+                (progn
+                    (flymake-log 3 "buildfile for %s not found" source-dir-name)
+                    nil
+                )
+            )
+        )
+    )
+)
+(defun flymake-fix-path-name(name)
+    "replace all occurences of '\' with '/'"
+    (when name
+        (let* ((new-name (flymake-replace-regexp-in-string "[\\]" "/" (expand-file-name name)))
+               (last-char (elt new-name (1- (length new-name)))))
+            (setq new-name (flymake-replace-regexp-in-string "\\./" "" new-name))
+            (if (equal "/" (char-to-string last-char))
+                (setq new-name (substring new-name 0 (1- (length new-name))))
+            )
+            new-name
+        )
+    )
+)
+(defun flymake-same-files(file-name-one file-name-two)
+    "t if file-name-one and file-name-two actually point to the same file"
+    (equal (flymake-fix-path-name file-name-one) (flymake-fix-path-name file-name-two))
+)
+(defun flymake-ensure-ends-with-slash(path)
+    (if (not (= (elt path (1- (length path))) (string-to-char "/")))
+        (concat path "/")
+    ;else
+        path
+    )
+)
+(defun flymake-get-common-path-prefix(string-one string-two)
+    "return common prefix for two paths"
+    (when (and string-one string-two)
+        (let* ((slash-pos-one  -1)
+               (slash-pos-two  -1)
+               (done           nil)
+               (prefix         nil))
+            (setq string-one (flymake-ensure-ends-with-slash string-one))
+            (setq string-two (flymake-ensure-ends-with-slash string-two))
+            (while (not done)
+                (setq slash-pos-one (string-match "/" string-one (1+ slash-pos-one)))
+                (setq slash-pos-two (string-match "/" string-two (1+ slash-pos-two)))
+                (if (and slash-pos-one slash-pos-two
+                         (= slash-pos-one slash-pos-two)
+                         (string= (substring string-one 0 slash-pos-one) (substring string-two 0 slash-pos-two)))
+                    (progn
+                        (setq prefix (substring string-one 0 (1+ slash-pos-one)))
+                    )
+                ;else
+                    (setq done t)
+                )
+            )
+            prefix
+        )
+    )
+)
+(defun flymake-build-relative-path(from-dir to-dir)
+    "return rel: from-dir/rel == to-dir"
+    (if (not (equal (elt from-dir 0) (elt to-dir 0)))
+        (error "first chars in paths %s, %s must be equal (same drive)" from-dir to-dir)
+    ;else
+        (let* ((from        (flymake-ensure-ends-with-slash (flymake-fix-path-name from-dir)))
+               (to          (flymake-ensure-ends-with-slash (flymake-fix-path-name to-dir)))
+               (prefix      (flymake-get-common-path-prefix from to))
+               (from-suffix (substring from (length prefix)))
+               (up-count    (length (flymake-split-string from-suffix "[/]")))
+               (to-suffix   (substring to   (length prefix)))
+               (idx         0)
+               (rel         nil))
+                    (if (and (> (length to-suffix) 0) (equal "/" (char-to-string (elt to-suffix 0))))
+                (setq to-suffix (substring to-suffix 1))
+            )
+            (while (< idx up-count)
+                (if (> (length rel) 0)
+                    (setq rel (concat rel "/"))
+                )
+                (setq rel (concat rel ".."))
+                (setq idx (1+ idx))
+            )
+            (if (> (length rel) 0)
+                (setq rel (concat rel "/"))
+            )
+            (if (> (length to-suffix) 0)
+               (setq rel (concat rel to-suffix))
+            )
+            (or rel "./")
+        )
+    )
+)
+(defcustom flymake-master-file-dirs '("." "./src" "./UnitTest")
+    "dirs where to llok for master files"
+    :group 'flymake
+    :type '(repeat (string))
+)
+(defcustom flymake-master-file-count-limit 32
+    "max number of master files to check"
+    :group 'flymake
+    :type 'integer
+)
+(defun flymake-find-possible-master-files(file-name master-file-dirs masks)
+    "find (by name and location) all posible master files, which are .cpp and .c for and .h.
+Files are searched for starting from the .h directory and max max-level parent dirs.
+File contents are not checked."
+    (let* ((dir-idx    0)
+          (dir-count  (length master-file-dirs))
+          (files  nil)
+          (done   nil)
+          (masks-count (length masks)))
+        (while (and (not done) (< dir-idx dir-count))
+            (let* ((dir (concat (flymake-fix-path-name (file-name-directory file-name)) "/" (nth dir-idx master-file-dirs)))
+                   (masks-idx 0))
+                (while (and (file-exists-p dir) (not done) (< masks-idx masks-count))
+                    (let* ((mask        (nth masks-idx masks))
+                           (dir-files   (directory-files dir t mask))
+                           (file-count  (length dir-files))
+                           (file-idx    0))
+                        (flymake-log 3 "dir %s, %d file(s) for mask %s" dir file-count mask)
+                        (while (and (not done) (< file-idx file-count))
+                            (when (not (file-directory-p (nth file-idx dir-files)))
+                                (setq files (cons (nth file-idx dir-files) files))
+                                (when (>= (length files) flymake-master-file-count-limit)
+                                    (flymake-log 3 "master file count limit (%d) reached" flymake-master-file-count-limit)
+                                    (setq done t)
+                                )
+                            )
+                            (setq file-idx (1+ file-idx))
+                        )
+                    )
+                    (setq masks-idx (1+ masks-idx))
+                )
+            )
+            (setq dir-idx (1+ dir-idx))
+        )
+        (when files
+            (setq flymake-included-file-name (file-name-nondirectory file-name))
+            (setq files (sort files 'flymake-master-file-compare))
+            (setq flymake-included-file-name nil)
+        )
+        (flymake-log 3 "found %d possible master file(s)" (length files))
+        files
+    )
+)
+(defvar flymake-included-file-name nil ; this is used to pass a parameter to a sort predicate below
+    ""
+)
+(defun flymake-master-file-compare(file-one file-two)
+    "used in sort to move most possible file names to the beginning of the list (File.h -> File.cpp moved to top"
+    (and (equal (file-name-sans-extension flymake-included-file-name)
+                (file-name-sans-extension (file-name-nondirectory file-one)))
+         (not (equal file-one file-two))
+    )
+)
+(defcustom flymake-check-file-limit 8192
+    "max number of chars to look at when checking possible master file"
+    :group 'flymake
+    :type 'integer
+)
+(defun flymake-check-patch-master-file-buffer(master-file-temp-buffer
+                                            master-file-name patched-master-file-name
+                                            source-file-name patched-source-file-name
+                                            include-dirs regexp-list)
+    "check whether master-file-name is indeed a master file for source-file-name.
+For .cpp master file this means it includes source-file-name (.h).
+If yes, patch a copy of master-file-name to include patched-source-file-name instead of source-file-name.
+Whenether a buffer for master-file-name exists, use it as a source instead of reading master file from disk"
+    (let* ((found                     nil)
+           (regexp                    (format (nth 0 regexp-list) ; "[ \t]*#[ \t]*include[ \t]*\"\\([\w0-9/\\_\.]*[/\\]*\\)\\(%s\\)\""
+                                              (file-name-nondirectory source-file-name)))
+           (path-idx                  (nth 1 regexp-list))
+           (name-idx                  (nth 2 regexp-list))
+           (inc-path                  nil)
+           (inc-name                  nil)
+           (search-limit              flymake-check-file-limit))
+        (save-excursion
+            (unwind-protect
+                (progn
+                    (set-buffer master-file-temp-buffer)
+                    (when (> search-limit (point-max))
+                        (setq search-limit (point-max))
+                    )
+                    (flymake-log 3 "checking %s against regexp %s" master-file-name regexp)
+                    (goto-char (point-min))
+                    (while (and (< (point) search-limit) (re-search-forward regexp search-limit t))
+                                                (let* ((match-beg   (match-beginning name-idx))
+                                                           (match-end   (match-end name-idx)))
+                                                        (flymake-log 3 "found possible match for %s" (file-name-nondirectory source-file-name))
+                                                        (setq inc-path (match-string path-idx))
+                                                        (setq inc-name (match-string name-idx))
+                                                        (when (string= inc-name (file-name-nondirectory source-file-name))
+                                                                (flymake-log 3 "inc-path=%s inc-name=%s" inc-path inc-name)
+                                                                (when (flymake-check-include source-file-name inc-path inc-name include-dirs)
+                                                                        (setq found t)
+                                                                        ; replace-match is not used here as it fails in xemacs with
+                                                                        ; 'last match not a buffer' error as check-includes calls replace-in-string
+                                                                        (flymake-replace-region (current-buffer) match-beg match-end
+                                                                                                                        (file-name-nondirectory patched-source-file-name))
+                                                                )
+                                                        )
+                                                        (forward-line 1)
+                                                )
+                    )
+                    (when found
+                        (flymake-save-buffer-in-file (current-buffer) patched-master-file-name)
+                    )
+                )
+                ;+(flymake-log 3 "killing buffer %s" (buffer-name master-file-temp-buffer))
+                (kill-buffer master-file-temp-buffer)
+            )
+        )
+        ;+(flymake-log 3 "check-patch master file %s: %s" master-file-name found)
+        (when found
+            (flymake-log 2 "found master file %s" master-file-name)
+        )
+        found
+    )
+)
+(defun flymake-replace-region(buffer beg end rep)
+    "replace text in buffer in region (beg; end) with rep"
+    (save-excursion
+        (delete-region beg end)
+            (goto-char beg)
+        (insert rep)
+        )
+)
+(defun flymake-read-file-to-temp-buffer(file-name)
+    "isert contents of file-name into newly created temp buffer"
+    (let* ((temp-buffer (get-buffer-create (generate-new-buffer-name (concat "flymake:" (file-name-nondirectory file-name))))))
+        (save-excursion
+            (set-buffer temp-buffer)
+            (insert-file-contents file-name)
+        )
+        temp-buffer
+    )
+)
+(defun flymake-copy-buffer-to-temp-buffer(buffer)
+    "copy contents of buffer into newly created temp buffer"
+    (let ((contents     nil)
+          (temp-buffer  nil))
+        (save-excursion
+            (set-buffer buffer)
+            (setq contents (buffer-string))
+            (setq temp-buffer (get-buffer-create (generate-new-buffer-name (concat "flymake:" (buffer-name buffer)))))
+            (set-buffer temp-buffer)
+            (insert contents)
+        )
+        temp-buffer
+    )
+)
+(defun flymake-check-include(source-file-name inc-path inc-name include-dirs)
+    "t if source-file-name is the one found via include dirs using inc-path and inc-name"
+    (if (file-name-absolute-p inc-path)
+        (flymake-same-files source-file-name (concat inc-path "/" inc-name))
+    ;else
+        (let* ((count      (length include-dirs))
+               (idx        0)
+               (file-name  nil)
+               (found      nil))
+            (while (and (not found) (< idx count))
+                (setq file-name (concat (file-name-directory source-file-name) "/" (nth idx include-dirs)))
+                (if (> (length inc-path) 0)
+                    (setq file-name (concat file-name "/" inc-path))
+                )
+                (setq file-name (concat file-name "/" inc-name))
+                (when (flymake-same-files source-file-name file-name)
+                    (setq found t)
+                )
+                (setq idx (1+ idx))
+            )
+            found
+        )
+    )
+)
+(defun flymake-find-buffer-for-file(file-name)
+    "buffer if there exists a buffer visiting file-name, nil otherwise"
+    (let ((buffer-name (get-file-buffer file-name)))
+        (if buffer-name
+            (get-buffer buffer-name)
+        )
+    )
+)
+(defun flymake-create-master-file(source-file-name patched-source-file-name get-incl-dirs-f create-temp-f masks include-regexp-list)
+    "save source-file-name with a different name, find master file, patch it and save it to."
+    (let* ((possible-master-files     (flymake-find-possible-master-files source-file-name flymake-master-file-dirs masks))
+           (master-file-count         (length possible-master-files))
+           (idx                       0)
+           (temp-buffer               nil)
+           (master-file-name          nil)
+           (patched-master-file-name  nil)
+           (found                     nil))
+        (while (and (not found) (< idx master-file-count))
+            (setq master-file-name (nth idx possible-master-files))
+            (setq patched-master-file-name (funcall create-temp-f master-file-name "flymake_master"))
+            (if (flymake-find-buffer-for-file master-file-name)
+                (setq temp-buffer (flymake-copy-buffer-to-temp-buffer (flymake-find-buffer-for-file master-file-name)))
+            ;else
+                (setq temp-buffer (flymake-read-file-to-temp-buffer master-file-name))
+            )
+            (setq found
+                  (flymake-check-patch-master-file-buffer
+                       temp-buffer
+                       master-file-name
+                       patched-master-file-name
+                       source-file-name
+                       patched-source-file-name
+                       (funcall get-incl-dirs-f (file-name-directory master-file-name))
+                       include-regexp-list))
+            (setq idx (1+ idx))
+        )
+        (if found
+            (list master-file-name patched-master-file-name)
+        ;else
+            (progn
+                (flymake-log 3 "none of %d master file(s) checked includes %s" master-file-count
+                           (file-name-nondirectory source-file-name))
+                nil
+            )
+        )
+    )
+)
+(defun flymake-save-buffer-in-file(buffer file-name)
+    (or buffer
+        (error "invalid buffer")
+    )
+    (save-excursion
+        (save-restriction
+            (set-buffer buffer)
+            (widen)
+            (make-directory (file-name-directory file-name) 1)
+            (write-region (point-min) (point-max) file-name nil 566)
+        )
+    )
+    (flymake-log 3 "saved buffer %s in file %s" (buffer-name buffer) file-name)
+)
+(defun flymake-save-string-to-file(file-name data)
+    "save string data to file file-name"
+    (write-region data nil file-name nil 566)
+)
+(defun flymake-read-file-to-string(file-name)
+    "read file contents and return them as a string"
+    (with-temp-buffer
+        (insert-file-contents file-name)
+        (buffer-substring (point-min) (point-max))
+    )
+)
+(defun flymake-process-filter(process output)
+    "flymake process filter: parse output, highlight err lines"
+    (let* ((pid               (process-id process))
+           (source-buffer     (get-buffer (flymake-get-source-buffer-name pid))))
+        (flymake-log 3 "received %d byte(s) of output from process %d" (length output) pid)
+        (when source-buffer
+            (flymake-parse-output-and-residual source-buffer output)
+        )
+    )
+)
+(defun flymake-process-sentinel(process event)
+   "Sentinel for syntax check buffers"
+   (if (memq (process-status process) '(signal exit))
+       (let*((exit-status       (process-exit-status process))
+             (command           (process-command process))
+             (pid               (process-id process))
+             (source-buffer     (get-buffer (flymake-get-source-buffer-name pid)))
+             (cleanup-f         (flymake-get-cleanup-function (buffer-file-name source-buffer))))
+         (flymake-log 2 "process %d exited with code %d" pid exit-status)
+         (condition-case err
+             (progn
+                 (flymake-log 3 "cleaning up using %s" cleanup-f)
+                 (funcall cleanup-f source-buffer)
+                 (flymake-unreg-names pid)
+                 (delete-process process)
+                 (when source-buffer
+                     (save-excursion
+                         (set-buffer source-buffer)
+                         (flymake-parse-residual source-buffer)
+                         (flymake-post-syntax-check source-buffer)
+                         (flymake-set-buffer-is-running source-buffer nil)
+                   )
+                )
+            )
+           (error
+              (let ((err-str (format "Error in process sentinel for buffer %s: %s"
+                                    source-buffer (error-message-string err))))
+                  (flymake-log 0 err-str)
+                  (flymake-set-buffer-is-running source-buffer nil)
+               )
+           )
+         )
+      )
+   )
+)
+(defun flymake-post-syntax-check(source-buffer)
+    ""
+   (flymake-set-buffer-err-info source-buffer (flymake-get-buffer-new-err-info source-buffer))
+   (flymake-set-buffer-new-err-info source-buffer nil)
+   (flymake-set-buffer-err-info source-buffer (flymake-fix-line-numbers
+                                             (flymake-get-buffer-err-info source-buffer)
+                                             1
+                                             (flymake-count-lines source-buffer)))
+   (flymake-delete-own-overlays source-buffer)
+   (flymake-highlight-err-lines source-buffer (flymake-get-buffer-err-info source-buffer))
+   (let ((err-count   (flymake-get-err-count (flymake-get-buffer-err-info source-buffer) "e"))
+         (warn-count  (flymake-get-err-count (flymake-get-buffer-err-info source-buffer) "w")))
+       (flymake-log 2 "%s: %d error(s), %d warning(s) in %.2f second(s)"
+                  (buffer-name source-buffer) err-count warn-count
+                  (- (flymake-float-time) (flymake-get-buffer-check-start-time source-buffer)))
+       (flymake-set-buffer-check-start-time source-buffer nil)
+       (if (and (equal 0 err-count) (equal 0 warn-count))
+           (if (equal 0 exit-status)
+               (flymake-report-status source-buffer "" "") ; PASSED
+           ;else
+               (if (not (flymake-get-buffer-check-was-interrupted source-buffer))
+                   (flymake-report-fatal-status (current-buffer) "CFGERR"
+                       (format "Configuration error has occured while running %s" command))
+               ;else
+                   (flymake-report-status source-buffer nil "") ; "STOPPED"
+               )
+           )
+       ;else
+           (flymake-report-status source-buffer (format "%d/%d" err-count warn-count) "")
+       )
+   )
+)
+(defun flymake-parse-output-and-residual(source-buffer output)
+    "split output into lines, merge in residual if necessary"
+    (save-excursion
+        (set-buffer source-buffer)
+        (let* ((buffer-residual     (flymake-get-buffer-output-residual source-buffer))
+               (total-output        (if buffer-residual (concat buffer-residual output) output))
+               (lines-and-residual  (flymake-split-output total-output))
+               (lines               (nth 0 lines-and-residual))
+               (new-residual        (nth 1 lines-and-residual)))
+            (flymake-set-buffer-output-residual source-buffer new-residual)
+            (flymake-set-buffer-new-err-info source-buffer (flymake-parse-err-lines
+                                                            (flymake-get-buffer-new-err-info source-buffer)
+                                                            source-buffer lines))
+        )
+    )
+)
+(defun flymake-parse-residual(source-buffer)
+    "parse residual if it's non empty"
+    (save-excursion
+        (set-buffer source-buffer)
+        (when (flymake-get-buffer-output-residual source-buffer)
+            (flymake-set-buffer-new-err-info source-buffer (flymake-parse-err-lines
+                                                           (flymake-get-buffer-new-err-info source-buffer)
+                                                           source-buffer
+                                                           (list (flymake-get-buffer-output-residual source-buffer))))
+            (flymake-set-buffer-output-residual source-buffer nil)
+        )
+    )
+)
+(defvar flymake-err-info nil
+    "sorted list of line numbers and lists of err info in the form (file, err-text)."
+)
+(make-variable-buffer-local 'flymake-err-info)
+(defun flymake-get-buffer-err-info(buffer)
+    (flymake-get-buffer-var buffer 'flymake-err-info)
+)
+(defun flymake-set-buffer-err-info(buffer err-info)
+    (flymake-set-buffer-var buffer 'flymake-err-info err-info)
+)
+(defun flymake-er-make-er(line-no line-err-info-list)
+    (list line-no line-err-info-list)
+)
+(defun flymake-er-get-line(err-info)
+    (nth 0 err-info)
+)
+(defun flymake-er-get-line-err-info-list(err-info)
+    (nth 1 err-info)
+)
+(defvar flymake-new-err-info nil
+    "the same as flymake -err-info, effective when a syntax check is in progress"
+)
+(make-variable-buffer-local 'flymake-new-err-info)
+(defun flymake-get-buffer-new-err-info(buffer)
+    (flymake-get-buffer-var buffer 'flymake-new-err-info)
+)
+(defun flymake-set-buffer-new-err-info(buffer new-err-info)
+    (flymake-set-buffer-var buffer 'flymake-new-err-info new-err-info)
+)
+;; getters/setters for line-err-info: (file, line, type, text).
+(defun flymake-ler-make-ler(file line type text &optional full-file)
+    (list file line type text full-file)
+)
+(defun flymake-ler-get-file(line-err-info)
+    (nth 0 line-err-info)
+)
+(defun flymake-ler-get-line(line-err-info)
+    (nth 1 line-err-info)
+)
+(defun flymake-ler-get-type(line-err-info)
+    (nth 2 line-err-info)
+)
+(defun flymake-ler-get-text(line-err-info)
+    (nth 3 line-err-info)
+)
+(defun flymake-ler-get-full-file(line-err-info)
+    (nth 4 line-err-info)
+)
+(defun flymake-ler-set-file(line-err-info file)
+    (flymake-ler-make-ler file
+                        (flymake-ler-get-line line-err-info)
+                        (flymake-ler-get-type line-err-info)
+                        (flymake-ler-get-text line-err-info)
+                        (flymake-ler-get-full-file line-err-info))
+)
+(defun flymake-ler-set-full-file(line-err-info full-file)
+    (flymake-ler-make-ler (flymake-ler-get-file line-err-info)
+                        (flymake-ler-get-line line-err-info)
+                        (flymake-ler-get-type line-err-info)
+                        (flymake-ler-get-text line-err-info)
+                        full-file)
+)
+(defun flymake-ler-set-line(line-err-info line)
+    (flymake-ler-make-ler (flymake-ler-get-file line-err-info)
+                        line
+                        (flymake-ler-get-type line-err-info)
+                        (flymake-ler-get-text line-err-info)
+                        (flymake-ler-get-full-file line-err-info))
+)
+(defun flymake-get-line-err-count(line-err-info-list type)
+    "return number of errors of specified type - e or w"
+    (let* ((idx        0)
+           (count      (length line-err-info-list))
+           (err-count  0))
+        (while (< idx count)
+            (when (equal type (flymake-ler-get-type (nth idx line-err-info-list)))
+                (setq err-count (1+ err-count))
+            )
+            (setq idx (1+ idx))
+        )
+        err-count
+    )
+)
+(defun flymake-get-err-count(err-info-list type)
+    "return number of errors of specified type for the err-info-list"
+    (let* ((idx        0)
+           (count      (length err-info-list))
+           (err-count  0))
+        (while (< idx count)
+            (setq err-count (+ err-count (flymake-get-line-err-count (nth 1 (nth idx err-info-list)) type)))
+            (setq idx (1+ idx))
+        )
+        err-count
+    )
+)
+(defun flymake-fix-line-numbers(err-info-list min-line max-line)
+    "replace line-numbers < min-line with min-line and > max-line with max-line - as some compilers might report line number outside the file being compiled"
+    (let* ((count     (length err-info-list))
+           (err-info  nil)
+           (line      0))
+        (while (> count 0)
+            (setq err-info (nth (1- count) err-info-list))
+            (setq line (flymake-er-get-line err-info))
+            (when (or (< line min-line) (> line max-line))
+                (setq line (if (< line min-line) min-line max-line))
+                (setq err-info-list (flymake-set-at err-info-list (1- count)
+                                            (flymake-er-make-er line
+                                                              (flymake-er-get-line-err-info-list err-info))))
+            )
+            (setq count (1- count))
+        )
+    )
+    err-info-list
+)
+(defun flymake-highlight-err-lines(buffer err-info-list)
+    "highlight err-lines in buffer using info from err-info-list"
+    (save-excursion
+        (set-buffer buffer)
+        (let* ((idx    0)
+               (count  (length err-info-list)))
+            (while (< idx count)
+                (flymake-highlight-line (car (nth idx err-info-list)) (nth 1 (nth idx err-info-list)))
+                (setq idx (1+ idx))
+            )
+        )
+    )
+)
+(defun flymake-overlay-p(ov)
+     "Determine whether overlay was created by flymake"
+     (and (overlayp ov) (overlay-get ov 'flymake-overlay))
+)
+(defun flymake-make-overlay(beg end tooltip-text face mouse-face)
+    "Allocate a flymake overlay in range beg end"
+    (when (not (flymake-region-has-flymake-overlays beg end))
+        (let ((ov (make-overlay beg end nil t t)))
+            (overlay-put ov 'face           face)
+            (overlay-put ov 'mouse-face     mouse-face)
+            (overlay-put ov 'help-echo      tooltip-text)
+            (overlay-put ov 'flymake-overlay  t)
+            (overlay-put ov 'priority 100)
+            ;+(flymake-log 3 "created overlay %s" ov)
+            ov
+        )
+        (flymake-log 3 "created an overlay at (%d-%d)" beg end)
+    )
+)
+(defun flymake-delete-own-overlays(buffer)
+    "Delete all flymake overlays in buffer"
+    (save-excursion
+        (set-buffer buffer)
+        (let ((ov (overlays-in (point-min) (point-max))))
+            (while (consp ov)
+                (when (flymake-overlay-p (car ov))
+                    (delete-overlay (car ov))
+                    ;+(flymake-log 3 "deleted overlay %s" ov)
+                )
+                (setq ov (cdr ov))
+            )
+        )
+    )
+)
+(defun flymake-region-has-flymake-overlays(beg end)
+    "t if specified regions has at least one flymake overlay, nil otrherwise"
+    (let ((ov                  (overlays-in beg end))
+          (has-flymake-overlays  nil))
+        (while (consp ov)
+            (when (flymake-overlay-p (car ov))
+                (setq has-flymake-overlays t)
+            )
+            (setq ov (cdr ov))
+        )
+    )
+)
+(defface flymake-errline-face
+;+   '((((class color)) (:foreground "OrangeRed" :bold t :underline t))
+;+   '((((class color)) (:underline "OrangeRed"))
+   '((((class color)) (:background "LightPink"))
+     (t (:bold t)))
+   "Face used for marking error lines"
+    :group 'flymake
+)
+(defface flymake-warnline-face
+   '((((class color)) (:background "LightBlue2"))
+     (t (:bold t)))
+   "Face used for marking warning lines"
+    :group 'flymake
+)
+(defun flymake-highlight-line(line-no line-err-info-list)
+    "highlight line line-no in current buffer, perhaps use text from line-err-info-list to enhance highlighting"
+    (goto-line line-no)
+    (let* ((line-beg (flymake-line-beginning-position))
+           (line-end (flymake-line-end-position))
+           (beg      line-beg)
+           (end      line-end)
+           (tooltip-text (flymake-ler-get-text (nth 0 line-err-info-list)))
+           (face     nil))
+        (goto-char line-beg)
+        (while (looking-at "[ \t]")
+            (forward-char)
+        )
+        (setq beg (point))
+        (goto-char line-end)
+        (while (and (looking-at "[ \t\r\n]") (> (point) 1))
+            (backward-char)
+        )
+        (setq end (1+ (point)))
+        (when (<= end beg)
+            (setq beg line-beg)
+            (setq end line-end)
+        )
+        (when (= end beg)
+            (goto-char end)
+            (forward-line)
+            (setq end (point))
+        )
+        (if (> (flymake-get-line-err-count line-err-info-list "e") 0)
+            (setq face 'flymake-errline-face)
+        ;else
+            (setq face 'flymake-warnline-face)
+        )
+        (flymake-make-overlay beg end tooltip-text face nil)
+    )
+)
+(defun flymake-parse-err-lines(err-info-list source-buffer lines)
+    "parse err lines, store info in err-info-list"
+    (let* ((count              (length lines))
+           (idx                0)
+           (line-err-info      nil)
+           (real-file-name     nil)
+           (source-file-name   (buffer-file-name source-buffer))
+           (get-real-file-name-f (flymake-get-real-file-name-function source-file-name)))
+        (while (< idx count)
+            (setq line-err-info (flymake-parse-line (nth idx lines)))
+            (when line-err-info
+                (setq real-file-name (funcall get-real-file-name-f source-buffer (flymake-ler-get-file line-err-info)))
+                (setq line-err-info (flymake-ler-set-full-file line-err-info real-file-name))
+                (if (flymake-same-files real-file-name source-file-name)
+                    (setq line-err-info (flymake-ler-set-file line-err-info nil))
+                ;else
+                    (setq line-err-info (flymake-ler-set-file line-err-info (file-name-nondirectory real-file-name)))
+                )
+                (setq err-info-list (flymake-add-err-info err-info-list line-err-info))
+            )
+            (flymake-log 3 "parsed '%s', %s line-err-info" (nth idx lines) (if line-err-info "got" "no"))
+            (setq idx (1+ idx))
+        )
+        err-info-list
+    )
+)
+(defun flymake-split-output(output)
+    "split output into lines, return last one as residual if it does not end with newline char. Returns ((lines) residual)"
+    (when (and output (> (length output) 0))
+        (let* ((lines (flymake-split-string output "[\n\r]+"))
+               (complete (equal "\n" (char-to-string (aref output (1- (length output))))))
+               (residual nil))
+            (when (not complete)
+                (setq residual (car (last lines)))
+                (setq lines (butlast lines))
+            )
+            (list lines residual)
+        )
+    )
+)
+(eval-when-compile (require 'compile))
+(defvar flymake-err-line-patterns  ; regexp file-idx line-idx col-idx (optional) text-idx(optional), match-end to end of string is error text
+    (append
+     '(
+    ; MS Visual C++ 6.0
+       ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) \: \\(\\(error\\|warning\\|fatal error\\) \\(C[0-9]+\\):[ \t\n]*\\(.+\\)\\)"
+        1 3 nil 4)
+    ; jikes
+       ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)\:\\([0-9]+\\)\:[0-9]+\:[0-9]+\:[0-9]+\: \\(\\(Error\\|Warning\\|Caution\\|Semantic Error\\):[ \t\n]*\\(.+\\)\\)"
+        1 3 nil 4)
+    ; MS midl
+       ("midl[ ]*:[ ]*\\(command line error .*\\)"
+        nil nil nil 1)
+    ; MS C#
+       ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\),[0-9]+)\: \\(\\(error\\|warning\\|fatal error\\) \\(CS[0-9]+\\):[ \t\n]*\\(.+\\)\\)"
+        1 3 nil 4)
+    ; perl
+       ("\\(.*\\) at \\([^ \n]+\\) line \\([0-9]+\\)[,.\n]" 2 3 nil 1)
+    ; LaTeX warnings (fileless) ("\\(LaTeX \\(Warning\\|Error\\): .*\\) on input line \\([0-9]+\\)" 20 3 nil 1)
+    ; ant/javac
+           (" *\\(\\[javac\\]\\)? *\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)\:\\([0-9]+\\)\:[ \t\n]*\\(.+\\)"
+        2 4 nil 5)
+      )
+     compilation-error-regexp-alist)
+    "patterns for matching error/warning lines, (regexp file-idx line-idx err-text-idx)"
+)
+;(defcustom flymake-err-line-patterns
+;  '(
+;    ; MS Visual C++ 6.0
+;    ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) \: \\(\\(error\\|warning\\|fatal error\\) \\(C[0-9]+\\):[ \t\n]*\\(.+\\)\\)"
+;       1 3 4)
+;   ; jikes
+;   ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)\:\\([0-9]+\\)\:[0-9]+\:[0-9]+\:[0-9]+\: \\(\\(Error\\|Warning\\|Caution\\):[ \t\n]*\\(.+\\)\\)"
+;       1 3 4))
+;    "patterns for matching error/warning lines, (regexp file-idx line-idx err-text-idx)"
+;   :group 'flymake
+;   :type '(repeat (string number number number))
+;)
+(defun flymake-parse-line(line)
+    "parse line to see whether it's an error of warning, return it's components or nil for no match"
+    (let ((raw-file-name nil)
+          (line-no 0)
+          (err-type "e")
+          (err-text nil)
+          (count (length flymake-err-line-patterns))
+          (idx   0)
+          (matched nil))
+        (while (and (< idx count) (not matched))
+            (when (string-match (car (nth idx flymake-err-line-patterns)) line)
+                (let* ((file-idx (nth 1 (nth idx flymake-err-line-patterns)))
+                       (line-idx (nth 2 (nth idx flymake-err-line-patterns))))
+                    (setq raw-file-name (if file-idx (match-string file-idx line) nil))
+                    (setq line-no       (if line-idx (string-to-int (match-string line-idx line)) 0))
+                    (setq err-text      (if (> (length (nth idx flymake-err-line-patterns)) 4)
+                                            (match-string (nth 4 (nth idx flymake-err-line-patterns)) line)
+                                          (flymake-patch-err-text (substring line (match-end 0)))))
+                    (or err-text (setq err-text "<no error text>"))
+                    (if (and err-text (string-match "^[wW]arning" err-text))
+                        (setq err-type "w")
+                    )
+                    (flymake-log 3 "parse line: file-idx=%s line-idx=%s file=%s line=%s text=%s" file-idx line-idx
+                                 raw-file-name line-no err-text)
+                    (setq matched t)
+                )
+            )
+            (setq idx (1+ idx))
+        )
+        (if matched
+           (flymake-ler-make-ler raw-file-name line-no err-type err-text)
+        ; else
+           ()
+        )
+    )
+)
+(defun flymake-find-err-info(err-info-list line-no)
+    "find (line-err-info-list pos) for specified line-no"
+    (if err-info-list
+        (let* ((line-err-info-list  nil)
+               (pos       0)
+               (count     (length err-info-list)))
+            (while (and (< pos count) (< (car (nth pos err-info-list)) line-no))
+                (setq pos (1+ pos))
+            )
+            (when (and (< pos count) (equal (car (nth pos err-info-list)) line-no))
+                (setq line-err-info-list (flymake-er-get-line-err-info-list (nth pos err-info-list)))
+            )
+            (list line-err-info-list pos)
+        )
+    ;else
+        '(nil 0)
+    )
+)
+(defun flymake-line-err-info-is-less-or-equal(line-one line-two)
+    (or (string< (flymake-ler-get-type line-one) (flymake-ler-get-type line-two))
+        (and (string= (flymake-ler-get-type line-one) (flymake-ler-get-type line-two))
+             (not (flymake-ler-get-file line-one)) (flymake-ler-get-file line-two)
+        )
+        (and (string= (flymake-ler-get-type line-one) (flymake-ler-get-type line-two))
+             (or (and      (flymake-ler-get-file line-one)       (flymake-ler-get-file line-two))
+                 (and (not (flymake-ler-get-file line-one)) (not (flymake-ler-get-file line-two)))
+             )
+        )
+    )
+)
+(defun flymake-add-line-err-info(line-err-info-list line-err-info)
+    "insert new err info favoring sorting: err-type e/w, filename nil/non-nill"
+    (if (not line-err-info-list)
+        (list line-err-info)
+    ;else
+        (let* ((count  (length line-err-info-list))
+               (idx    0))
+            (while (and (< idx count) (flymake-line-err-info-is-less-or-equal (nth idx line-err-info-list) line-err-info))
+                (setq idx (1+ idx))
+            )
+            (cond ((equal 0     idx)    (setq line-err-info-list (cons line-err-info line-err-info-list)))
+                  (t                    (setq line-err-info-list (flymake-ins-after line-err-info-list (1- idx) line-err-info)))
+            )
+            line-err-info-list
+        )
+    )
+)
+(defun flymake-add-err-info(err-info-list line-err-info)
+    "add error info (file line type text) to err info list preserving sort order"
+    (let* ((count               (length err-info-list))
+           (line-no             (if (flymake-ler-get-file line-err-info) 1 (flymake-ler-get-line line-err-info)))
+           (info-and-pos        (flymake-find-err-info err-info-list line-no))
+           (exists              (car info-and-pos))
+           (pos                 (nth 1 info-and-pos))
+           (line-err-info-list  nil)
+           (err-info            nil))
+        (if exists
+            (setq line-err-info-list (flymake-er-get-line-err-info-list (car (nthcdr pos err-info-list))))
+        )
+        (setq line-err-info-list (flymake-add-line-err-info line-err-info-list line-err-info))
+        (setq err-info (flymake-er-make-er line-no line-err-info-list))
+        (cond (exists             (setq err-info-list (flymake-set-at err-info-list pos err-info)))
+              ((equal 0 pos)      (setq err-info-list (cons err-info err-info-list)))
+              (t                  (setq err-info-list (flymake-ins-after err-info-list (1- pos) err-info)))
+        )
+        err-info-list
+    )
+)
+(defun flymake-get-project-include-dirs-imp(basedir)
+    "include dirs for the project current file belongs to"
+    (if (flymake-get-project-include-dirs-from-cache basedir)
+        (progn
+            (flymake-get-project-include-dirs-from-cache basedir)
+        )
+    ;else
+        (let* ((command-line  (concat "make -C\"" basedir "\" DUMPVARS=INCLUDE_DIRS dumpvars"))
+               (output        (shell-command-to-string command-line))
+               (lines         (flymake-split-string output "\n"))
+               (count         (length lines))
+               (idx           0)
+               (inc-dirs      nil))
+            (while (and (< idx count) (not (string-match "^INCLUDE_DIRS=.*" (nth idx lines))))
+               (setq idx (1+ idx))
+            )
+            (when (< idx count)
+                (let* ((inc-lines  (flymake-split-string (nth idx lines) " *-I"))
+                       (inc-count  (length inc-lines)))
+                    (while (> inc-count 0)
+                        (when (not (string-match "^INCLUDE_DIRS=.*" (nth (1- inc-count) inc-lines)))
+                            (setq inc-dirs (cons (flymake-replace-regexp-in-string "\"" "" (nth (1- inc-count) inc-lines)) inc-dirs))
+                        )
+                        (setq inc-count (1- inc-count))
+                    )
+                )
+            )
+            (flymake-add-project-include-dirs-to-cache basedir inc-dirs)
+            inc-dirs
+        )
+    )
+)
+(defcustom flymake-get-project-include-dirs-function 'flymake-get-project-include-dirs-imp
+    "function used to get project inc dirs, one paramater: basedir name"
+    :group 'flymake
+    :type 'function
+)
+(defun flymake-get-project-include-dirs(basedir)
+    (funcall flymake-get-project-include-dirs-function basedir)
+)
+(defun flymake-get-system-include-dirs()
+    "system include dirs - from the 'INCLUDE' env setting"
+    (let* ((includes (getenv "INCLUDE")))
+        (if includes (flymake-split-string includes path-separator) nil)
+    )
+)
+(defvar flymake-project-include-dirs-cache (flymake-makehash 'equal))
+(defun flymake-get-project-include-dirs-from-cache(base-dir)
+    (gethash base-dir flymake-project-include-dirs-cache)
+)
+(defun flymake-add-project-include-dirs-to-cache(base-dir include-dirs)
+    (puthash base-dir include-dirs flymake-project-include-dirs-cache)
+)
+(defun flymake-clear-project-include-dirs-cache()
+    (clrhash flymake-project-include-dirs-cache)
+)
+(defun flymake-get-include-dirs(base-dir)
+    "dirs to use when resolving local filenames"
+    (let* ((include-dirs (append '(".") (flymake-get-project-include-dirs base-dir) (flymake-get-system-include-dirs))))
+        include-dirs
+    )
+)
+(defun flymake-find-file(rel-file-name include-dirs)
+    "iterate through include-dirs, return first 'include-dir/rel-file-name' that exists, or just rel-file-name if not"
+    (let* ((count          (length include-dirs))
+           (idx            0)
+           (found          nil)
+           (full-file-name rel-file-name))
+        (while (and (not found) (< idx count))
+            (let* ((dir (nth idx include-dirs)))
+                (setq full-file-name  (concat dir "/" rel-file-name))
+                (when (file-exists-p full-file-name)
+                    (setq done t)
+                )
+            )
+            (setq idx (1+ idx))
+        )
+        (if found
+            full-file-name
+        ;else
+            rel-file-name
+        )
+    )
+)
+(defun flymake-restore-formatting(source-buffer)
+    "Remove any formatting made by flymake"
+)
+(defun flymake-get-program-dir(buffer)
+    "dir to start profram in"
+    (unless (bufferp buffer)
+        (error "invlid buffer")
+    )
+    (save-excursion
+        (set-buffer buffer)
+        default-directory
+    )
+)
+(defun flymake-safe-delete-file(file-name)
+    (when (and file-name (file-exists-p file-name))
+        (delete-file file-name)
+        (flymake-log 1 "deleted file %s" file-name)
+    )
+)
+(defun flymake-safe-delete-directory(dir-name)
+    (condition-case err
+        (progn
+            (delete-directory dir-name)
+            (flymake-log 1 "deleted dir %s" dir-name)
+        )
+        (error
+            (flymake-log 1 "failed to delete dir %s, error ignored" dir-name)
+        )
+    )
+)
+(defcustom flymake-compilation-prevents-syntax-check t
+    "if non-nil, syntax check won't be started in case compilation is running"
+    :group 'flymake
+    :type 'boolean
+)
+(defun flymake-start-syntax-check(buffer)
+    "start syntax checking for buffer"
+    (unless (bufferp buffer)
+        (error "expected a buffer")
+    )
+    (save-excursion
+        (set-buffer buffer)
+        (flymake-log 3 "flymake is running: %s" (flymake-get-buffer-is-running buffer))
+        (when (and (not (flymake-get-buffer-is-running buffer))
+                   (flymake-can-syntax-check-file (buffer-file-name buffer)))
+            (when (or (not flymake-compilation-prevents-syntax-check)
+                    (not (flymake-compilation-is-running))) ;+ (flymake-rep-ort-status buffer "COMP")
+                (flymake-clear-buildfile-cache)
+                (flymake-clear-project-include-dirs-cache)
+                (flymake-set-buffer-check-was-interrupted buffer nil)
+                (flymake-set-buffer-data buffer (flymake-makehash 'equal))
+                (let* ((source-file-name  (buffer-file-name buffer))
+                       (init-f (flymake-get-init-function source-file-name))
+                       (cleanup-f (flymake-get-cleanup-function source-file-name))
+                       (cmd-and-args (funcall init-f buffer))
+                       (cmd          (nth 0 cmd-and-args))
+                       (args         (nth 1 cmd-and-args))
+                                           (dir          (nth 2 cmd-and-args)))
+                    (if (not cmd-and-args)
+                        (progn
+                            (flymake-log 0 "init function %s for %s failed, cleaning up" init-f source-file-name)
+                            (funcall cleanup-f buffer)
+                        )
+                    ;else
+                        (progn
+                            (flymake-set-buffer-last-change-time buffer nil)
+                            (flymake-start-syntax-check-process buffer cmd args dir)
+                        )
+                    )
+                )
+            )
+        )
+    )
+)
+(defun flymake-start-syntax-check-process(buffer cmd args dir)
+    "start syntax check-process"
+    (let* ((process nil))
+        (condition-case err
+            (progn
+                            (when dir
+                                        (let ((default-directory dir))
+                                            (flymake-log 3 "starting process on dir %s" default-directory)
+                                        )
+                                )
+                                (setq process (get-process (apply 'start-process "flymake-proc" nil cmd args)))
+                (set-process-sentinel process 'flymake-process-sentinel)
+                (set-process-filter process 'flymake-process-filter)
+                (flymake-reg-names (process-id process) (buffer-name buffer))
+                (flymake-set-buffer-is-running buffer t)
+                (flymake-set-buffer-last-change-time buffer nil)
+                (flymake-set-buffer-check-start-time buffer (flymake-float-time))
+                (flymake-report-status buffer nil "*")
+                (flymake-log 2 "started process %d, command=%s, dir=%s"
+                           (process-id process) (process-command process) default-directory)
+                process
+            )
+            (error
+                (let ((err-str (format "Failed to launch syntax check process '%s' with args %s: %s"
+                             cmd args (error-message-string err)))
+                      (source-file-name (buffer-file-name buffer))
+                      (cleanup-f        (flymake-get-cleanup-function source-file-name)))
+                    (flymake-log 0 err-str)
+                    (funcall cleanup-f buffer)
+                    (flymake-report-fatal-status buffer "PROCERR" err-str)
+                )
+            )
+        )
+    )
+)
+(defun flymake-kill-process(pid &optional rest)
+    "kill process pid"
+    (signal-process pid 9)
+    (let* ((buffer-name (flymake-get-source-buffer-name pid)))
+        (when (and buffer-name (get-buffer buffer-name))
+            (flymake-set-buffer-check-was-interrupted (get-buffer buffer-name) t)
+        )
+    )
+    (flymake-log 1 "killed process %d" pid)
+)
+(defun flymake-stop-all-syntax-checks()
+    "kill all syntax check processes"
+    (interactive)
+    (let ((pids  (copy-hash-table flymake-pid-to-names)))
+        (maphash 'flymake-kill-process pids)
+    )
+)
+(defun flymake-compilation-is-running()
+   (and (boundp 'compilation-in-progress)
+        compilation-in-progress)
+)
+(defun flymake-compile()
+    "kill all flymake syntax checks, start compilation"
+    (interactive)
+    (flymake-stop-all-syntax-checks)
+    (call-interactively 'compile)
+)
+(defvar flymake-is-running nil
+  "t if flymake syntax check process is running for the current buffer"
+)
+(make-variable-buffer-local 'flymake-is-running)
+(defun flymake-get-buffer-is-running(buffer)
+    (flymake-get-buffer-var buffer 'flymake-is-running)
+)
+(defun flymake-set-buffer-is-running(buffer is-running)
+    (flymake-set-buffer-var buffer 'flymake-is-running is-running)
+)
+(defvar flymake-timer nil
+    "timer for starting syntax checks"
+)
+(make-variable-buffer-local 'flymake-timer)
+(defun flymake-get-buffer-timer(buffer)
+    (flymake-get-buffer-var buffer 'flymake-timer)
+)
+(defun flymake-set-buffer-timer(buffer timer)
+    (flymake-set-buffer-var buffer 'flymake-timer timer)
+)
+(defvar flymake-last-change-time nil
+    "time of last buffer change"
+)
+(make-variable-buffer-local 'flymake-last-change-time)
+(defun flymake-get-buffer-last-change-time(buffer)
+    (flymake-get-buffer-var buffer 'flymake-last-change-time)
+)
+(defun flymake-set-buffer-last-change-time(buffer change-time)
+    (flymake-set-buffer-var buffer 'flymake-last-change-time change-time)
+)
+(defvar flymake-check-start-time nil
+    "time at which syntax check was started")
+(make-variable-buffer-local 'flymake-check-start-time)
+(defun flymake-get-buffer-check-start-time(buffer)
+    (flymake-get-buffer-var buffer 'flymake-check-start-time)
+)
+(defun flymake-set-buffer-check-start-time(buffer check-start-time)
+    (flymake-set-buffer-var buffer 'flymake-check-start-time check-start-time)
+)
+(defvar flymake-check-was-interrupted nil
+    "t if syntax check was killed by flymake-compile"
+)
+(make-variable-buffer-local 'flymake-check-was-interrupted)
+(defun flymake-get-buffer-check-was-interrupted(buffer)
+    (flymake-get-buffer-var buffer 'flymake-check-was-interrupted)
+)
+(defun flymake-set-buffer-check-was-interrupted(buffer interrupted)
+    (flymake-set-buffer-var buffer 'flymake-check-was-interrupted interrupted)
+)
+(defcustom flymake-no-changes-timeout 0.5
+    "time to wait after last change before starting compilation"
+    :group 'flymake
+    :type 'number
+)
+(defun flymake-on-timer-event(buffer)
+    "start a syntax check for buffer if necessary"
+    ;+(flymake-log 3 "timer: running=%s, time=%s, cur-time=%s" (flymake-get-buffer-is-running buffer) (flymake-get-buffer-last-change-time buffer) (flymake-float-time))
+     (when (and (bufferp buffer) (not (flymake-get-buffer-is-running buffer)))
+        (save-excursion
+            (set-buffer buffer)
+            (when (and (flymake-get-buffer-last-change-time buffer)
+                       (> (flymake-float-time) (+ flymake-no-changes-timeout (flymake-get-buffer-last-change-time buffer))))
+                (flymake-set-buffer-last-change-time buffer nil)
+                (flymake-log 3 "starting syntax check as more than 1 second passed since last change")
+                (flymake-start-syntax-check buffer)
+            )
+        )
+    )
+)
+(defun flymake-start-syntax-check-for-current-buffer()
+    "run flymake-start-syntax-check for current buffer if it isn't already running"
+    (interactive)
+    (flymake-start-syntax-check (current-buffer))
+)
+(defun flymake-current-line-no()
+    "return number of current line in current buffer"
+    (interactive)
+    (let ((beg  (point-min))
+          (end  (if (= (point) (point-max)) (point) (1+ (point)))))
+        (count-lines beg end)
+    )
+)
+(defun flymake-get-line-count(buffer)
+    "return number of lines in buffer"
+    (unless (bufferp buffer)
+        (error "invalid buffer")
+    )
+    (save-excursion
+        (set-buffer buffer)
+        (count-lines (point-min) (point-max))
+    )
+)
+(defun flymake-count-lines(buffer)
+    "return number of lines in buffer"
+    (save-excursion
+        (set-buffer buffer)
+        (count-lines (point-min) (point-max))
+    )
+)
+(defun flymake-get-point-pixel-pos()
+    "return point position in pixels: (x, y)"
+    (let ((mouse-pos  (mouse-position))
+          (pixel-pos  nil)
+          (ret        nil))
+        (if (car (cdr mouse-pos))
+            (progn
+                (set-mouse-position (flymake-selected-frame) (current-column) (flymake-current-row))
+                (setq pixel-pos (mouse-pixel-position))
+                (set-mouse-position (car mouse-pos) (car (cdr mouse-pos)) (cdr (cdr mouse-pos)))
+                (setq ret (list (car (cdr pixel-pos)) (cdr (cdr pixel-pos))))
+             )
+        ;else
+            (progn
+                (setq ret '(0 0))
+            )
+        )
+        (flymake-log 3 "mouse pos is %s" ret)
+        ret
+    )
+)
+(defun flymake-display-err-menu-for-current-line()
+   "Display a menu with errors/warnings for current line if it has errors and/or warnings"
+   (interactive)
+   (let* ((line-no             (flymake-current-line-no))
+          (line-err-info-list  (nth 0 (flymake-find-err-info (flymake-get-buffer-err-info (current-buffer)) line-no)))
+          (menu-data           (flymake-make-err-menu-data line-no line-err-info-list))
+          (choice              nil)
+          (mouse-pos           (flymake-get-point-pixel-pos))
+          (moved-mouse-pos     (list (car mouse-pos) (+ 10 (car (cdr mouse-pos)))))
+          (menu-pos            (list (flymake-get-point-pixel-pos) (selected-window))))
+       (if menu-data
+           (progn
+               (setq choice (flymake-popup-menu menu-pos menu-data))
+                           (flymake-log 3 "choice=%s" choice)
+               (when choice
+                               (eval choice)
+                       )
+            )
+       ;else
+           (flymake-log 1 "no errors for line %d" line-no)
+       )
+   )
+)
+(defun flymake-make-err-menu-data(line-no line-err-info-list)
+   "Make a (menu-title (item-title item-action)*) list with errors/warnings from line-err-info"
+   (let* ((menu-items  nil))
+       (when line-err-info-list
+           (let* ((count           (length line-err-info-list))
+                  (menu-item-text  nil))
+               (while (> count 0)
+                    (setq menu-item-text (flymake-ler-get-text (nth (1- count) line-err-info-list)))
+                    (let* ((file       (flymake-ler-get-file (nth (1- count) line-err-info-list)))
+                           (full-file  (flymake-ler-get-full-file (nth (1- count) line-err-info-list)))
+                           (line       (flymake-ler-get-line (nth (1- count) line-err-info-list))))
+                        (if file
+                            (setq menu-item-text (concat menu-item-text " - " file "(" (format "%d" line) ")"))
+                        )
+                        (setq menu-items (cons (list menu-item-text
+                                                     (if file (list 'flymake-goto-file-and-line full-file line) nil))
+                                               menu-items))
+                    )
+                    (setq count (1- count))
+               )
+               (flymake-log 3 "created menu-items with %d item(s)" (length menu-items))
+           )
+       )
+       (if menu-items
+           (let* ((menu-title  (format "Line %d: %d error(s), %d warning(s)" line-no
+                                      (flymake-get-line-err-count line-err-info-list "e")
+                                      (flymake-get-line-err-count line-err-info-list "w"))))
+               (list menu-title menu-items)
+           )
+       ;else
+           nil
+       )
+   )
+)
+(defun flymake-goto-file-and-line(file line)
+    "try to get buffer for file and goto line line in it"
+    (if (not (file-exists-p file))
+        (flymake-log 1 "file %s does not exists" file)
+    ;else
+        (progn
+            (find-file file)
+            (goto-line line)
+        )
+    )
+)
+;; flymake minor mode declarations
+(defvar flymake-mode nil)
+(make-variable-buffer-local 'flymake-mode)
+(defvar flymake-mode-line nil
+    ""
+)
+(make-variable-buffer-local 'flymake-mode-line)
+(defun flymake-get-buffer-mode-line(buffer)
+    (flymake-get-buffer-var buffer 'flymake-mode-line)
+)
+(defun flymake-set-buffer-mode-line(buffer mode-line-string)
+    (flymake-set-buffer-var buffer 'flymake-mode-line mode-line-string)
+)
+(defvar flymake-mode-line-e-w nil)
+(make-variable-buffer-local 'flymake-mode-line-e-w)
+(defun flymake-get-buffer-mode-line-e-w(buffer)
+    (flymake-get-buffer-var buffer 'flymake-mode-line-e-w)
+)
+(defun flymake-set-buffer-mode-line-e-w(buffer e-w)
+    (flymake-set-buffer-var buffer 'flymake-mode-line-e-w e-w)
+)
+(defvar flymake-mode-line-status nil)
+(make-variable-buffer-local 'flymake-mode-line-status)
+(defun flymake-get-buffer-mode-line-status(buffer)
+    (flymake-get-buffer-var buffer 'flymake-mode-line-status)
+)
+(defun flymake-set-buffer-mode-line-status(buffer status)
+    (flymake-set-buffer-var buffer 'flymake-mode-line-status status)
+)
+(defun flymake-report-status(buffer e-w &optional status)
+    "show status in the mode line"
+    (when (bufferp buffer)
+        (save-excursion
+            (set-buffer buffer)
+            (when e-w
+                (flymake-set-buffer-mode-line-e-w buffer e-w)
+            )
+            (when status
+                (flymake-set-buffer-mode-line-status buffer status)
+            )
+            (let* ((mode-line " Flymake"))
+                (when (> (length (flymake-get-buffer-mode-line-e-w buffer)) 0)
+                    (setq mode-line (concat mode-line ":"  (flymake-get-buffer-mode-line-e-w buffer)))
+                )
+                (setq mode-line (concat mode-line (flymake-get-buffer-mode-line-status buffer)))
+                (flymake-set-buffer-mode-line buffer mode-line)
+                (force-mode-line-update)
+            )
+        )
+    )
+)
+(defun flymake-display-warning(warning)
+    "display a warning to the user"
+    (message-box warning)
+)
+(defcustom flymake-gui-warnings-enabled t
+    "enables/disables gui warnings"
+        :group 'flymake
+        :type 'boolean
+)
+(defun flymake-report-fatal-status(buffer status warning)
+    "display a warning and switch flymake mode OFF"
+        (when flymake-gui-warnings-enabled
+        (flymake-display-warning (format "Flymake: %s. Flymake will be switched OFF" warning))
+        )
+    (save-excursion
+        (set-buffer buffer)
+        (flymake-mode 0)
+        (flymake-log 0 "switched OFF Flymake mode for buffer %s due to fatal status %s, warning %s"
+                     (buffer-name buffer) status warning)
+    )
+)
+(defun flymake-mode(&optional arg)
+    "toggle flymake-mode"
+    (interactive)
+    (let ((old-flymake-mode flymake-mode))
+        (setq turn-on
+            (if (null arg)
+                (not flymake-mode)
+            ;else
+                (> (prefix-numeric-value arg) 0))
+        )
+        (if turn-on
+            (if (flymake-can-syntax-check-file (buffer-file-name))
+                (flymake-mode-on)
+            ;else
+                (flymake-log 2 "flymake cannot check syntax in buffer %s" (buffer-name))
+            )
+        ;else
+            (flymake-mode-off)
+        )
+        (force-mode-line-update)
+    )
+)
+;;;###autoload
+(unless (assq 'flymake-mode minor-mode-alist)
+    (setq minor-mode-alist (cons '(flymake-mode flymake-mode-line) minor-mode-alist))
+)
+;;;###autoload
+(defun flymake-mode-on()
+    "turn flymake mode on"
+    (when (not flymake-mode)
+        (make-local-variable 'after-change-functions)
+        (setq after-change-functions (cons 'flymake-after-change-function after-change-functions))
+        (add-hook 'after-save-hook 'flymake-after-save-hook)
+        (add-hook 'kill-buffer-hook 'flymake-kill-buffer-hook)
+        ;+(add-hook 'find-file-hooks 'flymake-find-file-hook)
+        (flymake-report-status (current-buffer) "" "")
+        (flymake-set-buffer-timer (current-buffer) (run-at-time nil 1 'flymake-on-timer-event (current-buffer)))
+        (setq flymake-mode t)
+        (flymake-log 1 "flymake mode turned ON for buffer %s" (buffer-name (current-buffer)))
+        (when flymake-start-syntax-check-on-find-file
+            (flymake-start-syntax-check-for-current-buffer) ; will be started by on-load hook
+        )
+    )
+)
+;;;###autoload
+(defun flymake-mode-off()
+    "turn flymake mode off"
+    (when flymake-mode
+        (setq after-change-functions (delq 'flymake-after-change-function  after-change-functions))
+        (remove-hook 'after-save-hook (function flymake-after-save-hook) t)
+        (remove-hook 'kill-buffer-hook (function flymake-kill-buffer-hook) t)
+        ;+(remove-hook 'find-file-hooks (function flymake-find-file-hook) t)
+        (flymake-delete-own-overlays (current-buffer))
+        (when (flymake-get-buffer-timer (current-buffer))
+            (cancel-timer (flymake-get-buffer-timer (current-buffer)))
+            (flymake-set-buffer-timer (current-buffer) nil)
+        )
+        (flymake-set-buffer-is-running (current-buffer) nil)
+        (setq flymake-mode nil)
+        (flymake-log 1 "flymake mode turned OFF for buffer %s" (buffer-name (current-buffer)))
+    )
+)
+(defcustom flymake-start-syntax-check-on-newline t
+    "start syntax check if newline char was added/removed from the buffer"
+    :group 'flymake
+    :type 'boolean
+)
+(defun flymake-after-change-function(start stop len)
+    "Start syntax check for current buffer if it isn't already running"
+    ;+(flymake-log 0 "setting change time to %s" (flymake-float-time))
+    (let((new-text (buffer-substring start stop)))
+        (when (and flymake-start-syntax-check-on-newline (equal new-text "\n"))
+            (flymake-log 3 "starting syntax check as new-line has been seen")
+            (flymake-start-syntax-check-for-current-buffer)
+        )
+        (flymake-set-buffer-last-change-time (current-buffer) (flymake-float-time))
+    )
+)
+(defun flymake-after-save-hook()
+    (if (local-variable-p 'flymake-mode (current-buffer)) ; (???) other way to determine whether flymake is active in buffer being saved?
+        (progn
+            (flymake-log 3 "starting syntax check as buffer was saved")
+            (flymake-start-syntax-check-for-current-buffer) ; no more mode 3. cannot start check if mode 3 (to temp copies) is active - (???)
+        )
+    )
+)
+(defun flymake-kill-buffer-hook()
+    (when (flymake-get-buffer-timer (current-buffer))
+        (cancel-timer (flymake-get-buffer-timer (current-buffer)))
+        (flymake-set-buffer-timer (current-buffer) nil)
+    )
+)
+(defcustom flymake-start-syntax-check-on-find-file t
+    "statr syntax check on find file"
+    :group 'flymake
+    :type 'boolean
+)
+(defun flymake-find-file-hook()
+    ;+(when flymake-start-syntax-check-on-find-file
+    ;+    (flymake-log 3 "starting syntax check on file open")
+    ;+    (flymake-start-syntax-check-for-current-buffer)
+    ;+)
+    (when (and (not (local-variable-p 'flymake-mode (current-buffer)))
+           (flymake-can-syntax-check-file (buffer-file-name (current-buffer))))
+        (flymake-mode)
+        (flymake-log 3 "automatically turned ON flymake mode")
+    )
+)
+(defun flymake-get-first-err-line-no(err-info-list)
+    "return first line-no with error"
+    (when err-info-list
+        (flymake-er-get-line (car err-info-list))
+    )
+)
+(defun flymake-get-last-err-line-no(err-info-list)
+    "return last line-no with error"
+    (when err-info-list
+        (flymake-er-get-line (nth (1- (length err-info-list)) err-info-list))
+    )
+)
+(defun flymake-get-next-err-line-no(err-info-list line-no)
+    "return next line with erroe"
+    (when err-info-list
+        (let* ((count  (length err-info-list))
+               (idx    0))
+            (while (and (< idx count) (>= line-no (flymake-er-get-line (nth idx err-info-list))))
+                (setq idx (1+ idx))
+            )
+            (if (< idx count)
+                (flymake-er-get-line (nth idx err-info-list))
+            )
+        )
+    )
+)
+(defun flymake-get-prev-err-line-no(err-info-list line-no)
+    "return prev line with error"
+    (when err-info-list
+        (let* ((count (length err-info-list)))
+            (while (and (> count 0) (<= line-no (flymake-er-get-line (nth (1- count) err-info-list))))
+                (setq count (1- count))
+            )
+            (if (> count 0)
+                (flymake-er-get-line (nth (1- count) err-info-list))
+            )
+        )
+    )
+)
+(defun flymake-skip-whitespace()
+    "move forward until nonwhitespace is reached"
+    (while (looking-at "[ \t]")
+        (forward-char)
+    )
+)
+(defun flymake-goto-line(line-no)
+    "goto-line, then skip whitespace"
+    (goto-line line-no)
+    (flymake-skip-whitespace)
+)
+(defun flymake-goto-next-error()
+    "go to next error in err ring"
+    (interactive)
+    (let ((line-no (flymake-get-next-err-line-no (flymake-get-buffer-err-info (current-buffer)) (flymake-current-line-no))))
+        (when (not line-no)
+            (setq line-no (flymake-get-first-err-line-no (flymake-get-buffer-err-info (current-buffer))))
+            (flymake-log 1 "passed end of file")
+        )
+        (if line-no
+            (flymake-goto-line line-no)
+        ;else
+            (flymake-log 1 "no errors in current buffer")
+        )
+    )
+)
+(defun flymake-goto-prev-error()
+    "go to prev error in err ring"
+    (interactive)
+    (let ((line-no (flymake-get-prev-err-line-no (flymake-get-buffer-err-info (current-buffer)) (flymake-current-line-no))))
+        (when (not line-no)
+            (setq line-no (flymake-get-last-err-line-no (flymake-get-buffer-err-info (current-buffer))))
+            (flymake-log 1 "passed beginning of file")
+        )
+        (if line-no
+            (flymake-goto-line line-no)
+        ;else
+            (flymake-log 1 "no errors in current buffer")
+        )
+    )
+)
+(defun flymake-patch-err-text(string)
+    (if (string-match "^[\n\t :0-9]*\\(.*\\)$" string)
+        (match-string 1 string)
+    ;else
+        string
+    )
+)
+;;;; general init-cleanup and helper routines
+(defun flymake-create-temp-inplace(file-name prefix)
+    (unless (stringp file-name)
+        (error "invalid file-name")
+    )
+    (or prefix
+        (setq prefix "flymake")
+    )
+    (let* ((temp-name   (concat (file-name-sans-extension file-name)
+                                "_" prefix
+                                (and (file-name-extension file-name)
+                                     (concat "." (file-name-extension file-name))))))
+        (flymake-log 3 "create-temp-inplace: file=%s temp=%s" file-name temp-name)
+        temp-name
+    )
+)
+(defun flymake-create-temp-with-folder-structure(file-name prefix)
+    (unless (stringp file-name)
+        (error "invalid file-name")
+    )
+    (let* ((dir       (file-name-directory file-name))
+                   (slash-pos (string-match "/" dir))
+                   (temp-dir  (concat (flymake-ensure-ends-with-slash (flymake-get-temp-dir)) (substring dir (1+ slash-pos)))))
+            (file-truename (concat (flymake-ensure-ends-with-slash temp-dir)
+                                (file-name-nondirectory file-name)))
+    )
+)
+(defun flymake-strrchr(str ch)
+    (let* ((count  (length str))
+           (pos    nil))
+        (while (and (not pos) (> count 0))
+            (if (= ch (elt str (1- count)))
+                (setq pos (1- count))
+            )
+            (setq count (1- count))
+        )
+        pos
+    )
+)
+(defun flymake-delete-temp-directory(dir-name)
+    "attempt to delete temp dir created by flymake-create-temp-with-folder-structure, do not fail on error"
+    (let* ((temp-dir    (flymake-get-temp-dir))
+           (suffix      (substring dir-name (1+ (length temp-dir))))
+           (slash-pos   nil))
+        (while (> (length suffix) 0)
+            ;+(flymake-log 0 "suffix=%s" suffix)
+                        (flymake-safe-delete-directory (file-truename (concat (flymake-ensure-ends-with-slash temp-dir) suffix)))
+            (setq slash-pos (flymake-strrchr suffix (string-to-char "/")))
+            (if slash-pos
+                (setq suffix (substring suffix 0 slash-pos))
+            ;else
+                (setq suffix "")
+            )
+        )
+    )
+)
+(defun flymake-init-create-temp-buffer-copy(buffer create-temp-f)
+    "make a temporary copy of the current buffer, save its name in buffer data and return the name"
+    (let*  ((source-file-name       (buffer-file-name buffer))
+            (temp-source-file-name  (funcall create-temp-f source-file-name "flymake")))
+        (flymake-save-buffer-in-file buffer temp-source-file-name)
+        (flymake-set-buffer-value buffer "temp-source-file-name" temp-source-file-name)
+        temp-source-file-name
+    )
+)
+(defun flymake-simple-cleanup(buffer)
+    "cleanup after flymake-init-create-temp-buffer-copy -- delete temp file"
+    (let* ((temp-source-file-name (flymake-get-buffer-value buffer "temp-source-file-name")))
+        (flymake-safe-delete-file temp-source-file-name)
+        (flymake-set-buffer-last-change-time buffer nil)
+    )
+)
+(defun flymake-get-real-file-name(buffer file-name-from-err-msg)
+    "Translate file name from error message to `real' file name. Return full-name. Names are real, not patched"
+    (let* ((real-name              nil)
+           (source-file-name       (buffer-file-name buffer))
+           (master-file-name       (flymake-get-buffer-value buffer "master-file-name"))
+           (temp-source-file-name  (flymake-get-buffer-value buffer "temp-source-file-name"))
+           (temp-master-file-name  (flymake-get-buffer-value buffer "temp-master-file-name"))
+           (base-dirs              (list (flymake-get-buffer-value buffer "base-dir")
+                                         (file-name-directory source-file-name)
+                                         (if master-file-name (file-name-directory master-file-name) nil)))
+           (files                  (list (list source-file-name       source-file-name)
+                                         (list temp-source-file-name  source-file-name)
+                                         (list master-file-name       master-file-name)
+                                         (list temp-master-file-name  master-file-name))))
+        (when (equal 0 (length file-name-from-err-msg))
+            (setq file-name-from-err-msg source-file-name)
+        )
+        (setq real-name (flymake-get-full-patched-file-name file-name-from-err-msg base-dirs files))
+        ; if real-name is nil, than file name from err msg is none of the files we've patched
+        (if (not real-name)
+            (setq real-name (flymake-get-full-nonpatched-file-name file-name-from-err-msg base-dirs))
+        )
+        (if (not real-name)
+            (setq real-name file-name-from-err-msg)
+        )
+        (setq real-name (flymake-fix-path-name real-name))
+        (flymake-log 3 "get-real-file-name: file-name=%s real-name=%s" file-name-from-err-msg real-name)
+        real-name
+    )
+)
+(defun flymake-get-full-patched-file-name(file-name-from-err-msg base-dirs files)
+    (let* ((base-dirs-count  (length base-dirs))
+           (file-count       (length files))
+           (real-name        nil))
+        (while (and (not real-name) (> base-dirs-count 0))
+            (setq file-count (length files))
+            (while (and (not real-name) (> file-count 0))
+                (let* ((this-dir        (nth (1- base-dirs-count) base-dirs))
+                       (this-file       (nth 0 (nth (1- file-count) files)))
+                       (this-real-name  (nth 1 (nth (1- file-count) files))))
+                    ;+(flymake-log 0 "this-dir=%s this-file=%s this-real=%s msg-file=%s" this-dir this-file this-real-name file-name-from-err-msg)
+                    (when (and this-dir this-file (flymake-same-files
+                                                   (flymake-get-absolute-file-name-basedir file-name-from-err-msg this-dir)
+                                                   this-file))
+                        (setq real-name this-real-name)
+                    )
+                )
+                (setq file-count (1- file-count))
+            )
+            (setq base-dirs-count (1- base-dirs-count))
+        )
+        real-name
+    )
+)
+(defun flymake-get-full-nonpatched-file-name(file-name-from-err-msg base-dirs)
+    (let* ((real-name  nil))
+        (if (file-name-absolute-p file-name-from-err-msg)
+            (setq real-name file-name-from-err-msg)
+        ;else
+            (let* ((base-dirs-count  (length base-dirs)))
+                (while (and (not real-name) (> base-dirs-count 0))
+                    (let* ((full-name (flymake-get-absolute-file-name-basedir file-name-from-err-msg
+                                                                              (nth (1- base-dirs-count) base-dirs))))
+                        (if (file-exists-p full-name)
+                            (setq real-name full-name)
+                        )
+                        (setq base-dirs-count (1- base-dirs-count))
+                    )
+                )
+            )
+        )
+        real-name
+    )
+)
+(defun flymake-get-absolute-file-name-basedir(file-name dir-name)
+    (if (file-name-absolute-p file-name)
+        file-name
+    ;else
+        (concat dir-name "/" file-name)
+    )
+)
+(defun flymake-init-find-buildfile-dir(buffer source-file-name buildfile-name)
+    "find buildfile, store its dir in buffer data and return its dir, if found"
+    (let* ((buildfile-dir  (flymake-find-buildfile buildfile-name
+                                                   (file-name-directory source-file-name)
+                                                   flymake-buildfile-dirs)))
+        (if (not buildfile-dir)
+            (progn
+                (flymake-log 1 "no buildfile (%s) for %s" buildfile-name source-file-name)
+                (flymake-report-fatal-status buffer "NOMK" (format "No buildfile (%s) found for %s" buildfile-name source-file-name))
+            )
+        ;else
+            (progn
+                (flymake-set-buffer-value buffer "base-dir" buildfile-dir)
+            )
+        )
+        buildfile-dir
+    )
+)
+(defun flymake-init-create-temp-source-and-master-buffer-copy(buffer get-incl-dirs-f create-temp-f master-file-masks include-regexp-list)
+    "find master file (or buffer), create it's copy along with a copy of the source file"
+    (let* ((source-file-name       (buffer-file-name buffer))
+           (temp-source-file-name  (flymake-init-create-temp-buffer-copy buffer create-temp-f))
+           (master-file-name       nil)
+           (temp-master-file-name  nil)
+           (master-and-temp-master (flymake-create-master-file
+                                    source-file-name temp-source-file-name
+                                    get-incl-dirs-f create-temp-f
+                                    master-file-masks include-regexp-list)))
+        (if (not master-and-temp-master)
+            (progn
+                (flymake-log 1 "cannot find master file for %s" source-file-name)
+                (flymake-report-status buffer "!" "") ; NOMASTER
+            )
+        ;else
+            (progn
+                (setq master-file-name       (nth 0 master-and-temp-master))
+                (setq temp-master-file-name  (nth 1 master-and-temp-master))
+                (flymake-set-buffer-value buffer "master-file-name"      master-file-name)
+                (flymake-set-buffer-value buffer "temp-master-file-name" temp-master-file-name)
+            )
+        )
+        temp-master-file-name
+    )
+)
+(defun flymake-master-cleanup(buffer)
+    (flymake-simple-cleanup buffer)
+    (flymake-safe-delete-file (flymake-get-buffer-value buffer "temp-master-file-name"))
+)
+;;;; make-specific init-cleanup routines
+(defun flymake-get-syntax-check-program-args(source-file-name base-dir use-relative-base-dir use-relative-source get-cmd-line-f)
+    "create a command line for the syntax check command, using get-cmd-line-f"
+    (let* ((my-base-dir  base-dir)
+           (my-source    source-file-name))
+        (when use-relative-base-dir
+            (setq my-base-dir (flymake-build-relative-path (file-name-directory source-file-name) base-dir))
+        )
+        (when use-relative-source
+            (setq my-source (concat (flymake-build-relative-path base-dir (file-name-directory source-file-name))
+                                    (file-name-nondirectory source-file-name)))
+        )
+        (funcall get-cmd-line-f my-source my-base-dir)
+    )
+)
+(defun flymake-get-make-cmdline(source base-dir)
+    (list "make"
+          (list "-s"
+                        "-C"
+                        base-dir
+                        (concat "CHK_SOURCES=" source)
+                        "SYNTAX_CHECK_MODE=1"
+                        "check-syntax"))
+)
+(defun flymake-get-ant-cmdline(source base-dir)
+    (list "ant"
+          (list "-buildfile"
+                (concat base-dir "/" "build.xml")
+                (concat "-DCHK_SOURCES=" source)
+                "check-syntax"))
+)
+(defun flymake-simple-make-init-impl(buffer create-temp-f use-relative-base-dir use-relative-source build-file-name get-cmdline-f)
+    "create syntax check command line for a directly checked source file, use create-temp-f for creating temp copy"
+    (let* ((args          nil)
+           (source-file-name   (buffer-file-name buffer))
+           (buildfile-dir      (flymake-init-find-buildfile-dir buffer source-file-name build-file-name)))
+        (if buildfile-dir
+            (let* ((temp-source-file-name  (flymake-init-create-temp-buffer-copy buffer create-temp-f)))
+                (setq args (flymake-get-syntax-check-program-args temp-source-file-name buildfile-dir
+                                                               use-relative-base-dir use-relative-source
+                                                               get-cmdline-f))
+            )
+        )
+        args
+    )
+)
+(defun flymake-simple-make-init(buffer)
+    (flymake-simple-make-init-impl buffer 'flymake-create-temp-inplace t t "Makefile" 'flymake-get-make-cmdline)
+)
+(defun flymake-master-make-init(buffer get-incl-dirs-f master-file-masks include-regexp-list)
+    "create make command line for a source file checked via master file compilation"
+    (let* ((make-args          nil)
+           (temp-master-file-name (flymake-init-create-temp-source-and-master-buffer-copy
+                                   buffer get-incl-dirs-f 'flymake-create-temp-inplace
+                                   master-file-masks include-regexp-list)))
+        (when temp-master-file-name
+            (let* ((buildfile-dir (flymake-init-find-buildfile-dir buffer temp-master-file-name "Makefile")))
+                (if  buildfile-dir
+                                    (setq make-args (flymake-get-syntax-check-program-args
+                                                                         temp-master-file-name buildfile-dir nil nil 'flymake-get-make-cmdline))
+                )
+            )
+        )
+                make-args
+    )
+)
+(defun flymake-find-make-buildfile(source-dir)
+    (flymake-find-buildfile "Makefile" source-dir flymake-buildfile-dirs)
+)
+;;;; .h/make specific
+(defun flymake-master-make-header-init(buffer)
+    (flymake-master-make-init buffer
+                              'flymake-get-include-dirs
+                              '(".+\\.cpp$" ".+\\.c$")
+                              '("[ \t]*#[ \t]*include[ \t]*\"\\([\w0-9/\\_\.]*[/\\]*\\)\\(%s\\)\"" 1 2))
+)
+;;;; .java/make specific
+(defun flymake-simple-make-java-init(buffer)
+    (flymake-simple-make-init-impl buffer 'flymake-create-temp-with-folder-structure nil nil "Makefile" 'flymake-get-make-cmdline)
+)
+(defun flymake-simple-ant-java-init(buffer)
+    (flymake-simple-make-init-impl buffer 'flymake-create-temp-with-folder-structure nil nil "build.xml" 'flymake-get-ant-cmdline)
+)
+(defun flymake-simple-java-cleanup(buffer)
+    "cleanup after flymake-simple-make-java-init -- delete temp file and dirs"
+    (let* ((temp-source-file-name (flymake-get-buffer-value buffer "temp-source-file-name")))
+        (flymake-safe-delete-file temp-source-file-name)
+        (when temp-source-file-name
+            (flymake-delete-temp-directory (file-name-directory temp-source-file-name))
+        )
+    )
+)
+;;;; perl-specific init-cleanup routines
+(defun flymake-perl-init(buffer)
+    (let* ((temp-file   (flymake-init-create-temp-buffer-copy buffer 'flymake-create-temp-inplace))
+                   (local-file  (concat (flymake-build-relative-path (file-name-directory (buffer-file-name (current-buffer)))
+                                                                                                                         (file-name-directory temp-file))
+                                                                (file-name-nondirectory temp-file))))
+        (list "perl" (list "-wc " local-file))
+        )
+)
+;;;; tex-specific init-cleanup routines
+(defun flymake-get-tex-args(file-name)
+    ;(list "latex" (list "-c-style-errors" file-name))
+    (list "texify" (list "--pdf" "--tex-option=-c-style-errors" file-name))
+)
+(defun flymake-simple-tex-init(buffer)
+    (flymake-get-tex-args (flymake-init-create-temp-buffer-copy buffer 'flymake-create-temp-inplace))
+)
+(defun flymake-master-tex-init(buffer)
+    (let* ((temp-master-file-name (flymake-init-create-temp-source-and-master-buffer-copy
+                                   buffer 'flymake-get-include-dirs-dot 'flymake-create-temp-inplace
+                                   '(".+\\.tex$")
+                                   '("[ \t]*\\input[ \t]*{\\(.*\\)\\(%s\\)}" 1 2))))
+        (when temp-master-file-name
+            (flymake-get-tex-args temp-master-file-name)
+        )
+    )
+)
+(defun flymake-get-include-dirs-dot(base-dir)
+    '(".")
+)
+;;;; xml-specific init-cleanup routines
+(defun flymake-xml-init(buffer)
+    (list "xml" (list "val" (flymake-init-create-temp-buffer-copy buffer 'flymake-create-temp-inplace)))
+)
+;;; arch-tag: 8f0d6090-061d-4cac-8862-7c151c4a02dd
+;;; flymake.el ends here
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index f23eabe6e9c..88d41650c07 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -1700,8 +1700,7 @@ If ALL is nil, only match comments that start in column > 0."
                  (while repeat
                    (setq repeat nil)
                    ;; Adapted from f90-find-breakpoint.
-                    (re-search-backward fortran-break-delimiters-re
+                    (re-search-backward fortran-break-delimiters-re bol)
-                                        (line-beginning-position))
                    (if (not fortran-break-before-delimiters)
                        (if (looking-at fortran-no-break-re)
                            ;; Deal with cases such as "**" split over
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 5163471f47a..2f267787707 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1,6 +1,6 @@
 ;;; gdb-ui.el --- User Interface for running GDB
-;; Author: Nick Roberts <nick@nick.uklinux.net>
+;; Author: Nick Roberts <nickrob@gnu.org>
 ;; Maintainer: FSF
 ;; Keywords: unix, tools
@@ -40,8 +40,15 @@
 ;; Kingdon and uses GDB's annotation interface. You don't need to know about
 ;; annotations to use this mode as a debugger, but if you are interested
 ;; developing the mode itself, then see the Annotations section in the GDB
-;; info manual. Some GDB/MI commands are also used through th CLI command
+;; info manual. 
-;; 'interpreter mi <mi-command>'.
+;;
+;; GDB developers plan to make the annotation interface obsolete. A new
+;; interface called GDB/MI (machine interface) has been designed to replace
+;; it. Some GDB/MI commands are used in this file through the CLI command
+;; 'interpreter mi <mi-command>'. A file called gdb-mi.el is included in the
+;; GDB repository for future releases (6.2 onwards) that uses GDB/MI as the
+;; primary interface to GDB. It is still under development and is part of a
+;; process to migrate Emacs from annotations to GDB/MI.
 ;;
 ;; Known Bugs:
 ;;
@@ -53,7 +60,7 @@
 (defvar gdb-current-address "main" "Initialisation for Assembler buffer.")
 (defvar gdb-previous-address nil)
 (defvar gdb-previous-frame nil)
-(defvar gdb-current-frame "main")
+(defvar gdb-current-frame nil)
 (defvar gdb-current-language nil)
 (defvar gdb-view-source t "Non-nil means that source code can be viewed.")
 (defvar gdb-selected-view 'source "Code type that user wishes to view.")
@@ -63,7 +70,8 @@
 (defvar gdb-overlay-arrow-position nil)
 (defvar gdb-variables '()
  "A list of variables that are local to the GUD buffer.")
+(defvar gdb-server-prefix nil)
+ 
 ;;;###autoload
 (defun gdba (command-line)
  "Run gdb on program FILE in buffer *gud-FILE*.
@@ -73,23 +81,34 @@ and source-file directory for your debugger.
 If `gdb-many-windows' is nil (the default value) then gdb just
 pops up the GUD buffer unless `gdb-show-main' is t. In this case
 it starts with two windows: one displaying the GUD buffer and the
-other with the source file with the main routine of the debugee.
+other with the source file with the main routine of the inferior.
-If `gdb-many-windows' is t the layout below will appear
+If `gdb-many-windows' is t, regardless of the value of
-regardless of the value of `gdb-show-main' unless
+`gdb-show-main', the layout below will appear unless
 `gdb-use-inferior-io-buffer' is nil when the source buffer
 occupies the full width of the frame. Keybindings are given in
 relevant buffer.
+Watch expressions appear in the speedbar/slowbar.
+The following interactive lisp functions help control operation :
+`gdb-many-windows'    - Toggle the number of windows gdb uses.
+`gdb-restore-windows' - To restore the window layout.
+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
+ GUD buffer (I/O of GDB)          | Locals buffer
                                  |
                                  |
                                  |
 ---------------------------------------------------------------------
-Source buffer                     | Input/Output (of debugee) buffer
+ Source buffer                    | Input/Output (of inferior) buffer
                                  | (comint-mode)
                                  |
                                  |
@@ -98,28 +117,12 @@ Source buffer                     | Input/Output (of debugee) buffer
                                  |
                                  |
 ---------------------------------------------------------------------
-Stack buffer                      | Breakpoints buffer
+ Stack buffer                     | Breakpoints buffer
 RET      gdb-frames-select       | SPC    gdb-toggle-breakpoint
                                  | RET    gdb-goto-breakpoint
                                  |   d    gdb-delete-breakpoint
 ---------------------------------------------------------------------
+"
-All the buffers share the toolbar and source should always display in the same
-window e.g after typing g on a breakpoint in the breakpoints buffer. Breakpoint
-icons are displayed both by setting a break with gud-break and by typing break
-in the GUD buffer.
-This works best (depending on the size of your monitor) using most of the
-screen.
-Displayed expressions appear in separate frames. Arrays may be displayed
-as slices and visualised using the graph program from plotutils if installed.
-Pointers in structures may be followed in a tree-like fashion.
-The following interactive lisp functions help control operation :
-`gdb-many-windows'    - Toggle the number of windows gdb uses.
-`gdb-restore-windows' - To restore the window layout."
  ;;
  (interactive (list (gud-query-cmdline 'gdba)))
  ;;
@@ -179,12 +182,17 @@ The following interactive lisp functions help control operation :
  (setq gdb-current-address "main")
  (setq gdb-previous-address nil)
  (setq gdb-previous-frame nil)
-  (setq gdb-current-frame "main")
+  (setq gdb-current-frame nil)
  (setq gdb-view-source t)
  (setq gdb-selected-view 'source)
  (setq gdb-var-list nil)
  (setq gdb-var-changed nil)
  (setq gdb-first-prompt nil)
+  (setq gdb-prompting nil)
+  (setq gdb-current-item nil)
+  (setq gdb-pending-triggers nil)
+  (setq gdb-output-sink 'user)
+  (setq gdb-server-prefix "server ")
  ;;
  (mapc 'make-local-variable gdb-variables)
  (setq gdb-buffer-type 'gdba)
@@ -213,16 +221,26 @@ speedbar."
  (require 'tooltip)
  (let ((expr (tooltip-identifier-from-point (point))))
    (if (and (string-equal gdb-current-language "c")
-             gdb-use-colon-colon-notation)
+             gdb-use-colon-colon-notation gdb-current-frame)
        (setq expr (concat gdb-current-frame "::" expr)))
    (catch 'already-watched
      (dolist (var gdb-var-list)
        (if (string-equal expr (car var)) (throw 'already-watched nil)))
      (set-text-properties 0 (length expr) nil expr)
      (gdb-enqueue-input
-       (list (concat "server interpreter mi \"-var-create - * "  expr "\"\n")
+       (list 
+        (if (eq gud-minor-mode 'gdba)
+            (concat "server interpreter mi \"-var-create - * "  expr "\"\n")
+          (concat"-var-create - * "  expr "\n"))
             `(lambda () (gdb-var-create-handler ,expr))))))
-  (select-window (get-buffer-window gud-comint-buffer)))
+  (select-window (get-buffer-window gud-comint-buffer 'visible)))
+(defun gdb-goto-info ()
+  "Go to Emacs info node: GDB Graphical Interface."
+  (interactive)
+  (select-frame (make-frame))
+  (require 'info)
+  (Info-goto-node "(emacs)GDB Graphical Interface"))
 (defconst gdb-var-create-regexp
 "name=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\",type=\"\\(.*?\\)\"")
@@ -306,12 +324,15 @@ speedbar."
       (setq gdb-var-list (nreverse var-list))))))
 (defun gdb-var-update ()
-  (if (not (member 'gdb-var-update (gdb-get-pending-triggers)))
+  (if (not (member 'gdb-var-update gdb-pending-triggers))
      (progn
-        (gdb-enqueue-input (list "server interpreter mi \"-var-update *\"\n"
+        (gdb-enqueue-input
+         (list 
+          (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
+              "server interpreter mi \"-var-update *\"\n"
+            "-var-update *\n")
                                 'gdb-var-update-handler))
-        (gdb-set-pending-triggers (cons 'gdb-var-update
+        (push 'gdb-var-update gdb-pending-triggers))))
-                                        (gdb-get-pending-triggers))))))
 (defconst gdb-var-update-regexp "name=\"\\(.*?\\)\"")
@@ -321,12 +342,15 @@ speedbar."
    (while (re-search-forward gdb-var-update-regexp nil t)
        (let ((varnum (match-string 1)))
          (gdb-enqueue-input
-           (list (concat "server interpreter mi \"-var-evaluate-expression "
+           (list
-                         varnum "\"\n")
+            (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
+                (concat "server interpreter mi \"-var-evaluate-expression "
+                        varnum "\"\n")
+              (concat "-var-evaluate-expression " varnum "\n"))
                     `(lambda () (gdb-var-evaluate-expression-handler
                                  ,varnum t)))))))
-  (gdb-set-pending-triggers
+  (setq gdb-pending-triggers
-   (delq 'gdb-var-update (gdb-get-pending-triggers))))
+   (delq 'gdb-var-update gdb-pending-triggers)))
 (defun gdb-var-delete ()
  "Delete watched expression from the speedbar."
@@ -339,8 +363,11 @@ speedbar."
               (varnum (cadr var)))
          (unless (string-match "\\." varnum)
            (gdb-enqueue-input
-             (list (concat "server interpreter mi \"-var-delete "
+             (list 
-                           varnum "\"\n")
+              (if (with-current-buffer gud-comint-buffer
+                    (eq gud-minor-mode 'gdba))
+                  (concat "server interpreter mi \"-var-delete " varnum "\"\n")
+                (concat "-var-delete " varnum "\n"))
                   'ignore))
            (setq gdb-var-list (delq var gdb-var-list))
            (dolist (varchild gdb-var-list)
@@ -354,8 +381,11 @@ speedbar."
         (varnum (cadr var)) (value))
    (setq value (read-string "New value: "))
    (gdb-enqueue-input
-     (list (concat "server interpreter mi \"-var-assign "
+     (list
-                   varnum " " value "\"\n")
+      (if (with-current-buffer gud-comint-buffer
+            (eq gud-minor-mode 'gdba))
+          (concat "server interpreter mi \"-var-assign " varnum " " value "\"\n")
+        (concat "-var-assign " varnum " " value "\n"))
           'ignore))))
 (defcustom gdb-show-changed-values t
@@ -370,49 +400,25 @@ TEXT is the text of the button we clicked on, a + or - item.
 TOKEN is data related to this node.
 INDENT is the current indentation depth."
  (cond ((string-match "+" text)        ;expand this node
-         (gdb-var-list-children token))
+         (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
+             (gdb-var-list-children token)
+           (gdbmi-var-list-children token)))
        ((string-match "-" text)        ;contract this node
         (dolist (var gdb-var-list)
           (if (string-match (concat token "\\.") (nth 1 var))
               (setq gdb-var-list (delq var gdb-var-list))))
         (setq gdb-var-changed t))))
-;; ======================================================================
+(defvar gdb-buffer-type nil
-;;
-;; In this world, there are gdb variables (of unspecified
-;; representation) and buffers associated with those objects.
-;; The list of  variables is built up by the expansions of
-;; def-gdb-variable
-(defmacro def-gdb-var (root-symbol &optional default doc)
-  (let* ((root (symbol-name root-symbol))
-         (accessor (intern (concat "gdb-get-" root)))
-         (setter (intern (concat "gdb-set-" root)))
-         (name (intern (concat "gdb-" root))))
-    `(progn
-       (defvar ,name ,default ,doc)
-       (if (not (memq ',name gdb-variables))
-           (push ',name gdb-variables))
-       (defun ,accessor ()
-         (buffer-local-value ',name gud-comint-buffer))
-       (defun ,setter (val)
-         (with-current-buffer gud-comint-buffer
-           (setq ,name val))))))
-(def-gdb-var buffer-type nil
  "One of the symbols bound in `gdb-buffer-rules'.")
-(def-gdb-var burst ""
+(defvar gdb-input-queue ()
-  "A string of characters from gdb that have not yet been processed.")
-(def-gdb-var input-queue ()
  "A list of gdb command objects.")
-(def-gdb-var prompting nil
+(defvar gdb-prompting nil
  "True when gdb is idle with no pending input.")
-(def-gdb-var output-sink 'user
+(defvar gdb-output-sink 'user
  "The disposition of the output of the current gdb command.
 Possible values are these symbols:
@@ -430,12 +436,14 @@ Possible values are these symbols:
             gdb mode sends to gdb on its own behalf.
    post-emacs -- ignore output until the prompt annotation is
                  received, then go to USER disposition.
-")
-(def-gdb-var current-item nil
+gdba (gdb-ui.el) uses all five values,  gdbmi (gdb-mi.el) only two
+(user and emacs).")
+(defvar gdb-current-item nil
  "The most recent command item sent to gdb.")
-(def-gdb-var pending-triggers '()
+(defvar gdb-pending-triggers '()
  "A list of trigger functions that have run later than their output
 handlers.")
@@ -479,8 +487,8 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
          (set (make-local-variable 'gdb-buffer-type) key)
          (if (cdr (cdr rules))
              (funcall (car (cdr (cdr rules)))))
-          (set (make-local-variable 'gud-comint-buffer) gud-comint-buffer)
+          (set (make-local-variable 'gud-minor-mode) 
-          (set (make-local-variable 'gud-minor-mode) 'gdba)
+               (with-current-buffer gud-comint-buffer gud-minor-mode))
          (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
          new))))
@@ -548,7 +556,7 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
    (define-key map "\C-c\C-d" 'gdb-inferior-io-eof)
    map))
-(define-derived-mode gdb-inferior-io-mode comint-mode "Debuggee I/O"
+(define-derived-mode gdb-inferior-io-mode comint-mode "Inferior I/O"
  "Major mode for gdb inferior-io."
  :syntax-table nil :abbrev-table nil
  ;; We want to use comint because it has various nifty and familiar
@@ -620,20 +628,18 @@ This filter may simply queue output for a later time."
 ;; is a query, or other non-top-level prompt.
 (defun gdb-enqueue-input (item)
-  (if (gdb-get-prompting)
+  (if gdb-prompting
      (progn
        (gdb-send-item item)
-        (gdb-set-prompting nil))
+        (setq gdb-prompting nil))
-    (gdb-set-input-queue
+    (push item gdb-input-queue)))
-     (cons item (gdb-get-input-queue)))))
 (defun gdb-dequeue-input ()
-  (let ((queue (gdb-get-input-queue)))
+  (let ((queue gdb-input-queue))
    (and queue
         (let ((last (car (last queue))))
-           (unless (nbutlast queue) (gdb-set-input-queue '()))
+           (unless (nbutlast queue) (setq gdb-input-queue '()))
           last))))
 ;;
 ;; output -- things gdb prints to emacs
@@ -662,6 +668,8 @@ This filter may simply queue output for a later time."
    ("commands" gdb-subprompt)
    ("overload-choice" gdb-subprompt)
    ("query" gdb-subprompt)
+    ;; Need this prompt for GDB 6.1
+    ("nquery" gdb-subprompt)
    ("prompt-for-continue" gdb-subprompt)
    ("post-prompt" gdb-post-prompt)
    ("source" gdb-source)
@@ -688,89 +696,97 @@ This filter may simply queue output for a later time."
         (string-to-int (match-string 2 args))))
  (setq gdb-current-address (match-string 3 args))
  (setq gdb-view-source t)
-;; cover for auto-display output which comes *before*
+  ;; cover for auto-display output which comes *before*
-;; stopped annotation
+  ;; stopped annotation
-    (if (eq (gdb-get-output-sink) 'inferior) (gdb-set-output-sink 'user)))
+  (if (eq gdb-output-sink 'inferior) (setq gdb-output-sink 'user)))
 (defun gdb-send-item (item)
  (if gdb-enable-debug-log (push (cons 'send item) gdb-debug-log))
-  (gdb-set-current-item item)
+  (setq gdb-current-item item)
-  (if (stringp item)
+  (with-current-buffer gud-comint-buffer
-      (progn
+    (if (eq gud-minor-mode 'gdba)
-        (gdb-set-output-sink 'user)
+        (progn
-        (process-send-string (get-buffer-process gud-comint-buffer) item))
+          (if (stringp item)
-    (progn
+              (progn
+                (setq gdb-output-sink 'user)
+                (process-send-string (get-buffer-process gud-comint-buffer) item))
+            (progn
+              (gdb-clear-partial-output)
+              (setq gdb-output-sink 'pre-emacs)
+              (process-send-string (get-buffer-process gud-comint-buffer)
+                                   (car item)))))
+      ; case: eq gud-minor-mode 'gdbmi
      (gdb-clear-partial-output)
-      (gdb-set-output-sink 'pre-emacs)
+      (setq gdb-output-sink 'emacs)
      (process-send-string (get-buffer-process gud-comint-buffer)
-                           (car item)))))
+                         (car item)))))
 (defun gdb-pre-prompt (ignored)
  "An annotation handler for `pre-prompt'. This terminates the collection of
 output from a previous command if that happens to be in effect."
-  (let ((sink (gdb-get-output-sink)))
+  (let ((sink gdb-output-sink))
    (cond
     ((eq sink 'user) t)
     ((eq sink 'emacs)
-      (gdb-set-output-sink 'post-emacs))
+      (setq gdb-output-sink 'post-emacs))
     (t
-      (gdb-set-output-sink 'user)
+      (setq gdb-output-sink 'user)
      (error "Phase error in gdb-pre-prompt (got %s)" sink)))))
 (defun gdb-prompt (ignored)
  "An annotation handler for `prompt'.
 This sends the next command (if any) to gdb."
  (when gdb-first-prompt (gdb-ann3))
-  (let ((sink (gdb-get-output-sink)))
+  (let ((sink gdb-output-sink))
    (cond
     ((eq sink 'user) t)
     ((eq sink 'post-emacs)
-      (gdb-set-output-sink 'user)
+      (setq gdb-output-sink 'user)
      (let ((handler
-             (car (cdr (gdb-get-current-item)))))
+             (car (cdr gdb-current-item))))
        (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
          (funcall handler))))
     (t
-      (gdb-set-output-sink 'user)
+      (setq gdb-output-sink 'user)
      (error "Phase error in gdb-prompt (got %s)" sink))))
  (let ((input (gdb-dequeue-input)))
    (if input
        (gdb-send-item input)
      (progn
-        (gdb-set-prompting t)
+        (setq gdb-prompting t)
        (gud-display-frame)))))
 (defun gdb-subprompt (ignored)
  "An annotation handler for non-top-level prompts."
-  (gdb-set-prompting t))
+  (setq gdb-prompting t))
 (defun gdb-starting (ignored)
  "An annotation handler for `starting'.  This says that I/O for the
 subprocess is now the program being debugged, not GDB."
-  (let ((sink (gdb-get-output-sink)))
+  (let ((sink gdb-output-sink))
    (cond
     ((eq sink 'user)
      (progn
        (setq gud-running t)
        (if gdb-use-inferior-io-buffer
-            (gdb-set-output-sink 'inferior))))
+            (setq gdb-output-sink 'inferior))))
     (t (error "Unexpected `starting' annotation")))))
 (defun gdb-stopping (ignored)
  "An annotation handler for `exited' and other annotations which say that I/O
 for the subprocess is now GDB, not the program being debugged."
  (if gdb-use-inferior-io-buffer
-      (let ((sink (gdb-get-output-sink)))
+      (let ((sink gdb-output-sink))
        (cond
         ((eq sink 'inferior)
-          (gdb-set-output-sink 'user))
+          (setq gdb-output-sink 'user))
         (t (error "Unexpected stopping annotation"))))))
 (defun gdb-frame-begin (ignored)
-  (let ((sink (gdb-get-output-sink)))
+  (let ((sink gdb-output-sink))
    (cond
     ((eq sink 'inferior)
-      (gdb-set-output-sink 'user))
+      (setq gdb-output-sink 'user))
     ((eq sink 'user) t)
     ((eq sink 'emacs) t)
     (t (error "Unexpected frame-begin annotation (%S)" sink)))))
@@ -779,17 +795,17 @@ for the subprocess is now GDB, not the program being debugged."
  "An annotation handler for `stopped'.  It is just like gdb-stopping, except
 that if we already set the output sink to 'user in gdb-stopping, that is fine."
  (setq gud-running nil)
-  (let ((sink (gdb-get-output-sink)))
+  (let ((sink gdb-output-sink))
    (cond
     ((eq sink 'inferior)
-      (gdb-set-output-sink 'user))
+      (setq gdb-output-sink 'user))
     ((eq sink 'user) t)
     (t (error "Unexpected stopped annotation")))))
 (defun gdb-post-prompt (ignored)
  "An annotation handler for `post-prompt'. This begins the collection of
 output from the current command if that happens to be appropriate."
-  (if (not (gdb-get-pending-triggers))
+  (if (not gdb-pending-triggers)
      (progn
        (gdb-get-current-frame)
        (gdb-invalidate-frames)
@@ -806,13 +822,13 @@ output from the current command if that happens to be appropriate."
              (dolist (var gdb-var-list)
                (setcar (nthcdr 5 var) nil))))
          (gdb-var-update))))
-  (let ((sink (gdb-get-output-sink)))
+  (let ((sink gdb-output-sink))
    (cond
     ((eq sink 'user) t)
     ((eq sink 'pre-emacs)
-      (gdb-set-output-sink 'emacs))
+      (setq gdb-output-sink 'emacs))
     (t
-      (gdb-set-output-sink 'user)
+      (setq gdb-output-sink 'user)
      (error "Phase error in gdb-post-prompt (got %s)" sink)))))
 (defun gud-gdba-marker-filter (string)
@@ -874,7 +890,7 @@ output from the current command if that happens to be appropriate."
    output))
 (defun gdb-concat-output (so-far new)
-  (let ((sink (gdb-get-output-sink )))
+  (let ((sink gdb-output-sink))
    (cond
     ((eq sink 'user) (concat so-far new))
     ((or (eq sink 'pre-emacs) (eq sink 'post-emacs)) so-far)
@@ -936,19 +952,17 @@ output from the current command if that happens to be appropriate."
  `(defun ,name (&optional ignored)
     (if (and (,demand-predicate)
              (not (member ',name
-                           (gdb-get-pending-triggers))))
+                           gdb-pending-triggers)))
         (progn
           (gdb-enqueue-input
            (list ,gdb-command ',output-handler))
-           (gdb-set-pending-triggers
+           (push ',name gdb-pending-triggers)))))
-            (cons ',name
-                  (gdb-get-pending-triggers)))))))
 (defmacro def-gdb-auto-update-handler (name trigger buf-key custom-defun)
  `(defun ,name ()
-     (gdb-set-pending-triggers
+     (setq gdb-pending-triggers
      (delq ',trigger
-            (gdb-get-pending-triggers)))
+            gdb-pending-triggers))
     (let ((buf (gdb-get-buffer ',buf-key)))
       (and buf
            (with-current-buffer buf
@@ -1080,7 +1094,7 @@ static char *magick[] = {
    (dolist (buffer (buffer-list))
      (with-current-buffer buffer
        (if (and (eq gud-minor-mode 'gdba)
-                 (not (string-match "^\*" (buffer-name))))
+                 (not (string-match "\\`\\*.+\\*\\'" (buffer-name))))
            (gdb-remove-breakpoint-icons (point-min) (point-max)))))
    (with-current-buffer (gdb-get-buffer 'gdb-breakpoints-buffer)
      (save-excursion
@@ -1112,10 +1126,11 @@ static char *magick[] = {
                          (save-excursion
                            (goto-line (string-to-number line))
                            (gdb-put-breakpoint-icon (eq flag ?y)))))))))
-          (end-of-line))))))
+          (end-of-line)))))
+  (if (gdb-get-buffer 'gdb-assembler-buffer) (gdb-assembler-custom)))
 (defun gdb-mouse-toggle-breakpoint (event)
-  "Toggle breakpoint with mouse click in left margin."
+  "Toggle breakpoint in left fringe/margin with mouse click"
  (interactive "e")
  (mouse-minibuffer-check event)
  (let ((posn (event-end event)))
@@ -1135,14 +1150,24 @@ static char *magick[] = {
    (concat "*breakpoints of " (gdb-get-target-string) "*")))
 (defun gdb-display-breakpoints-buffer ()
+  "Display status of user-settable breakpoints."
  (interactive)
  (gdb-display-buffer
   (gdb-get-create-buffer 'gdb-breakpoints-buffer)))
+(defconst gdb-frame-parameters
+  '((height . 12) (width . 60)
+    (unsplittable . t)
+    (tool-bar-lines . nil)
+    (menu-bar-lines . nil)
+    (minibuffer . nil)))
 (defun gdb-frame-breakpoints-buffer ()
+  "Display status of user-settable breakpoints in a new frame."
  (interactive)
-  (switch-to-buffer-other-frame
+  (select-frame (make-frame gdb-frame-parameters))
-   (gdb-get-create-buffer 'gdb-breakpoints-buffer)))
+  (switch-to-buffer (gdb-get-create-buffer 'gdb-breakpoints-buffer))
+  (set-window-dedicated-p (selected-window) t))
 (defvar gdb-breakpoints-mode-map
  (let ((map (make-sparse-keymap))
@@ -1167,7 +1192,9 @@ static char *magick[] = {
  (setq mode-name "Breakpoints")
  (use-local-map gdb-breakpoints-mode-map)
  (setq buffer-read-only t)
-  (gdb-invalidate-breakpoints))
+  (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
+      (gdb-invalidate-breakpoints)
+    (gdbmi-invalidate-breakpoints)))
 (defun gdb-toggle-breakpoint ()
  "Enable/disable the breakpoint at current line."
@@ -1180,8 +1207,8 @@ static char *magick[] = {
       (list
        (concat
         (if (eq ?y (char-after (match-beginning 2)))
-             "server disable "
+             gdb-server-prefix "disable "
-           "server enable ")
+           gdb-server-prefix "enable ")
         (match-string 1) "\n")
        'ignore)))))
@@ -1192,28 +1219,31 @@ static char *magick[] = {
  (if (not (looking-at "\\([0-9]+\\).*point\\s-*\\S-*\\s-*\\(.\\)"))
      (error "Not recognized as break/watchpoint line")
    (gdb-enqueue-input
-     (list (concat "server delete " (match-string 1) "\n") 'ignore))))
+     (list (concat gdb-server-prefix "delete " (match-string 1) "\n") 'ignore))))
 (defun gdb-goto-breakpoint ()
-  "Display the file in the source buffer at the breakpoint specified on the
+  "Display the breakpoint location specified at current line."
-current line."
  (interactive)
  (save-excursion
    (beginning-of-line 1)
-    (re-search-forward "in\\s-+\\S-+\\s-+at\\s-+" nil t)
+    (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdbmi))
-    (looking-at "\\(\\S-*\\):\\([0-9]+\\)"))
+        (looking-at "[0-9]*\\s-*\\S-*\\s-*\\S-*\\s-*.\\s-*\\S-*\\s-*\\(\\S-*\\):\\([0-9]+\\)")
+      (re-search-forward "in\\s-+\\S-+\\s-+at\\s-+" nil t)
+      (looking-at "\\(\\S-*\\):\\([0-9]+\\)")))
  (if (match-string 2)
      (let ((line (match-string 2))
            (file (match-string 1)))
        (save-selected-window
-          (gdb-display-buffer (find-file-noselect
+          (let* ((buf (find-file-noselect (if (file-exists-p file)
-                               (if (file-exists-p file)
+                                              file
-                                   file
+                                            (expand-file-name file gdb-cdir))))
-                                 (expand-file-name file gdb-cdir))))
+                 (window (gdb-display-buffer buf)))
-          (goto-line (string-to-number line))))))
+                 (with-current-buffer buf
+                   (goto-line (string-to-number line))
+                   (set-window-point window (point))))))))
 (defun gdb-mouse-goto-breakpoint (event)
-  "Display the file in the source buffer at the selected breakpoint."
+  "Display the breakpoint location that you click on."
  (interactive "e")
  (mouse-set-point event)
  (gdb-goto-breakpoint))
@@ -1256,14 +1286,17 @@ current line."
    (concat "*stack frames of " (gdb-get-target-string) "*")))
 (defun gdb-display-stack-buffer ()
+  "Display backtrace of current stack."
  (interactive)
  (gdb-display-buffer
   (gdb-get-create-buffer 'gdb-stack-buffer)))
 (defun gdb-frame-stack-buffer ()
+  "Display backtrace of current stack in a new frame."
  (interactive)
-  (switch-to-buffer-other-frame
+  (select-frame (make-frame gdb-frame-parameters))
-   (gdb-get-create-buffer 'gdb-stack-buffer)))
+  (switch-to-buffer (gdb-get-create-buffer 'gdb-stack-buffer))
+  (set-window-dedicated-p (selected-window) t))
 (defvar gdb-frames-mode-map
  (let ((map (make-sparse-keymap)))
@@ -1281,25 +1314,25 @@ current line."
  (setq buffer-read-only t)
  (use-local-map gdb-frames-mode-map)
  (font-lock-mode -1)
-  (gdb-invalidate-frames))
+  (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
+      (gdb-invalidate-frames)
+    (gdbmi-invalidate-frames)))
 (defun gdb-get-frame-number ()
  (save-excursion
-    (let* ((pos (re-search-backward "^#\\([0-9]*\\)" nil t))
+    (let* ((pos (re-search-backward "^#*\\([0-9]*\\)" nil t))
           (n (or (and pos (match-string-no-properties 1)) "0")))
      n)))
 (defun gdb-frames-select ()
-  "Make the frame on the current line become the current frame and display the
+  "Select the frame and display the relevant source."
-source in the source buffer."
  (interactive)
  (gdb-enqueue-input
-   (list (concat "server frame " (gdb-get-frame-number) "\n") 'ignore))
+   (list (concat gdb-server-prefix "frame " (gdb-get-frame-number) "\n") 'ignore))
  (gud-display-frame))
 (defun gdb-frames-mouse-select (event)
-  "Make the selected frame become the current frame and display the source in
+  "Select the frame you click on and display the relevant source."
-the source buffer."
  (interactive "e")
  (mouse-set-point event)
  (gdb-frames-select))
@@ -1313,7 +1346,7 @@ the source buffer."
 (def-gdb-auto-updated-buffer gdb-threads-buffer
  gdb-invalidate-threads
-  "server info threads\n"
+  (concat gdb-server-prefix "info threads\n")
  gdb-info-threads-handler
  gdb-info-threads-custom)
@@ -1332,14 +1365,17 @@ the source buffer."
    (concat "*threads of " (gdb-get-target-string) "*")))
 (defun gdb-display-threads-buffer ()
+  "Display IDs of currently known threads."
  (interactive)
  (gdb-display-buffer
   (gdb-get-create-buffer 'gdb-threads-buffer)))
 (defun gdb-frame-threads-buffer ()
+  "Display IDs of currently known threads in a new frame."
  (interactive)
-  (switch-to-buffer-other-frame
+  (select-frame (make-frame gdb-frame-parameters))
-   (gdb-get-create-buffer 'gdb-threads-buffer)))
+  (switch-to-buffer (gdb-get-create-buffer 'gdb-threads-buffer))
+  (set-window-dedicated-p (selected-window) t))
 (defvar gdb-threads-mode-map
  (let ((map (make-sparse-keymap)))
@@ -1351,7 +1387,7 @@ the source buffer."
 (defun gdb-threads-mode ()
  "Major mode for gdb frames.
-\\{gdb-frames-mode-map}"
+\\{gdb-threads-mode-map}"
  (setq major-mode 'gdb-threads-mode)
  (setq mode-name "Threads")
  (setq buffer-read-only t)
@@ -1364,16 +1400,14 @@ the source buffer."
    (match-string-no-properties 1)))
 (defun gdb-threads-select ()
-  "Make the thread on the current line become the current thread and display the
+  "Select the thread and display the relevant source."
-source in the source buffer."
  (interactive)
  (gdb-enqueue-input
   (list (concat "thread " (gdb-get-thread-number) "\n") 'ignore))
  (gud-display-frame))
 (defun gdb-threads-mouse-select (event)
-  "Make the selected frame become the current frame and display the source in
+  "Select the thread you click on and display the relevant source."
-the source buffer."
  (interactive "e")
  (mouse-set-point event)
  (gdb-threads-select))
@@ -1387,7 +1421,7 @@ the source buffer."
 (def-gdb-auto-updated-buffer gdb-registers-buffer
  gdb-invalidate-registers
-  "server info registers\n"
+  (concat gdb-server-prefix "info registers\n")
  gdb-info-registers-handler
  gdb-info-registers-custom)
@@ -1413,14 +1447,17 @@ the source buffer."
    (concat "*registers of " (gdb-get-target-string) "*")))
 (defun gdb-display-registers-buffer ()
+  "Display integer register contents."
  (interactive)
  (gdb-display-buffer
   (gdb-get-create-buffer 'gdb-registers-buffer)))
 (defun gdb-frame-registers-buffer ()
+  "Display integer register contents in a new frame."
  (interactive)
-  (switch-to-buffer-other-frame
+  (select-frame (make-frame gdb-frame-parameters))
-   (gdb-get-create-buffer 'gdb-registers-buffer)))
+  (switch-to-buffer (gdb-get-create-buffer 'gdb-registers-buffer))
+  (set-window-dedicated-p (selected-window) t))
 ;;
 ;; Locals buffer.
@@ -1438,8 +1475,8 @@ the source buffer."
 ;; Abbreviate for arrays and structures.
 ;; These can be expanded using gud-display.
 (defun gdb-info-locals-handler nil
-  (gdb-set-pending-triggers (delq 'gdb-invalidate-locals
+  (setq gdb-pending-triggers (delq 'gdb-invalidate-locals
-                                  (gdb-get-pending-triggers)))
+                                  gdb-pending-triggers))
  (let ((buf (gdb-get-buffer 'gdb-partial-output-buffer)))
    (with-current-buffer buf
      (goto-char (point-min))
@@ -1474,24 +1511,29 @@ the source buffer."
 \\{gdb-locals-mode-map}"
  (setq major-mode 'gdb-locals-mode)
-  (setq mode-name "Locals")
+  (setq mode-name (concat "Locals:" gdb-current-frame))
  (setq buffer-read-only t)
  (use-local-map gdb-locals-mode-map)
-  (gdb-invalidate-locals))
+  (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
+      (gdb-invalidate-locals)
+    (gdbmi-invalidate-locals)))
 (defun gdb-locals-buffer-name ()
  (with-current-buffer gud-comint-buffer
    (concat "*locals of " (gdb-get-target-string) "*")))
 (defun gdb-display-locals-buffer ()
+  "Display local variables of current stack and their values."
  (interactive)
  (gdb-display-buffer
   (gdb-get-create-buffer 'gdb-locals-buffer)))
 (defun gdb-frame-locals-buffer ()
+  "Display local variables of current stack and their values in a new frame."
  (interactive)
-  (switch-to-buffer-other-frame
+  (select-frame (make-frame gdb-frame-parameters))
-   (gdb-get-create-buffer 'gdb-locals-buffer)))
+  (switch-to-buffer (gdb-get-create-buffer 'gdb-locals-buffer))
+  (set-window-dedicated-p (selected-window) t))
 ;;;; Window management
@@ -1510,9 +1552,9 @@ the source buffer."
           #'(lambda (win)
              (if (eq gud-comint-buffer (window-buffer win))
                  (set-window-dedicated-p win t))))
-          (setq answer (get-buffer-window buf))
+          (setq answer (get-buffer-window buf 'visible))
          (if (not answer)
-              (let ((window (get-lru-window)))
+              (let ((window (get-lru-window 'visible)))
                (if window
                    (progn
                      (set-window-buffer window buf)
@@ -1523,7 +1565,7 @@ the source buffer."
          (if (eq gud-comint-buffer (window-buffer win))
              (set-window-dedicated-p win nil)))))
    (if must-split
-        (let* ((largest (get-largest-window))
+        (let* ((largest (get-largest-window 'visible))
               (cur-size (window-height largest))
               (new-size (and size (< size cur-size) (- cur-size size))))
          (setq answer (split-window largest new-size))
@@ -1532,11 +1574,9 @@ the source buffer."
 (defun gdb-display-source-buffer (buffer)
  (if (eq gdb-selected-view 'source)
-      (progn
        (gdb-display-buffer buffer)
-        (get-buffer-window buffer))
+    (gdb-display-buffer (gdb-get-buffer 'gdb-assembler-buffer)))
-    (gdb-display-buffer (gdb-get-buffer 'gdb-assembler-buffer))
+    (get-buffer-window buffer 'visible))
-    nil))
 ;;; Shared keymap initialization:
@@ -1545,25 +1585,23 @@ the source buffer."
  (define-key gud-menu-map [frames]
    `(menu-item "GDB-Frames" ,menu :visible (eq gud-minor-mode 'gdba)))
  (define-key menu [gdb] '("Gdb" . gdb-frame-gdb-buffer))
-  (define-key menu [locals] '("Locals" . gdb-frame-locals-buffer))
+  (define-key menu [threads] '("Threads" . gdb-frame-threads-buffer))
+  (define-key menu [assembler] '("Machine" . gdb-frame-assembler-buffer))
  (define-key menu [registers] '("Registers" . gdb-frame-registers-buffer))
+  (define-key menu [locals] '("Locals" . gdb-frame-locals-buffer))
  (define-key menu [frames] '("Stack" . gdb-frame-stack-buffer))
-  (define-key menu [breakpoints] '("Breakpoints" . gdb-frame-breakpoints-buffer))
+  (define-key menu [breakpoints] '("Breakpoints" . gdb-frame-breakpoints-buffer)))
-  (define-key menu [threads] '("Threads" . gdb-frame-threads-buffer))
-;  (define-key menu [assembler] '("Machine" . gdb-frame-assembler-buffer))
-)
 (let ((menu (make-sparse-keymap "GDB-Windows")))
  (define-key gud-menu-map [displays]
    `(menu-item "GDB-Windows" ,menu :visible (eq gud-minor-mode 'gdba)))
  (define-key menu [gdb] '("Gdb" . gdb-display-gdb-buffer))
-  (define-key menu [locals] '("Locals" . gdb-display-locals-buffer))
+  (define-key menu [assembler] '("Machine" . gdb-display-assembler-buffer))
+  (define-key menu [threads] '("Threads" . gdb-display-threads-buffer))
  (define-key menu [registers] '("Registers" . gdb-display-registers-buffer))
+  (define-key menu [locals] '("Locals" . gdb-display-locals-buffer))
  (define-key menu [frames] '("Stack" . gdb-display-stack-buffer))
-  (define-key menu [breakpoints] '("Breakpoints" . gdb-display-breakpoints-buffer))
+  (define-key menu [breakpoints] '("Breakpoints" . gdb-display-breakpoints-buffer)))
-  (define-key menu [threads] '("Threads" . gdb-display-threads-buffer))
-;  (define-key menu [assembler] '("Machine" . gdb-display-assembler-buffer))
-)
 (let ((menu (make-sparse-keymap "View")))
   (define-key gud-menu-map [view]
@@ -1589,11 +1627,14 @@ the source buffer."
                          "Display locals, stack and breakpoint information")))
 (defun gdb-frame-gdb-buffer ()
+  "Display GUD buffer in a new frame."
  (interactive)
-  (switch-to-buffer-other-frame
+  (select-frame (make-frame gdb-frame-parameters))
-   (gdb-get-create-buffer 'gdba)))
+  (switch-to-buffer (gdb-get-create-buffer 'gdba))
+  (set-window-dedicated-p (selected-window) t))
 (defun gdb-display-gdb-buffer ()
+  "Display GUD buffer."
  (interactive)
  (gdb-display-buffer
   (gdb-get-create-buffer 'gdba)))
@@ -1601,6 +1642,7 @@ the source buffer."
 (defvar gdb-main-file nil "Source file from which program execution begins.")
 (defun gdb-view-source-function ()
+  "Select source view."
  (interactive)
  (if gdb-view-source
      (gdb-display-buffer
@@ -1610,8 +1652,10 @@ the source buffer."
  (setq gdb-selected-view 'source))
 (defun gdb-view-assembler()
+  "Select disassembly view."
  (interactive)
  (gdb-display-buffer (gdb-get-create-buffer 'gdb-assembler-buffer))
+  (gdb-invalidate-assembler)
  (setq gdb-selected-view 'assembler))
 ;(defun gdb-view-both()
@@ -1656,10 +1700,10 @@ the source buffer."
  (other-window 1))
 (defcustom gdb-many-windows nil
-  "Nil (the default value) means just pops up the GUD buffer
+  "Nil (the default value) means just pop up the GUD buffer
 unless `gdb-show-main' is t. In this case it starts with two
 windows: one displaying the GUD buffer and the other with the
-source file with the main routine of the debugee. Non-nil means
+source file with the main routine of the inferior. Non-nil means
 display the layout shown for `gdba'."
  :type 'boolean
  :group 'gud)
@@ -1701,15 +1745,15 @@ This arrangement depends on the value of `gdb-many-windows'."
  "Exit a debugging session cleanly by killing the gdb buffers and resetting
 the source buffers."
  (dolist (buffer (buffer-list))
-    (if (not (eq buffer gud-comint-buffer))
+    (unless (eq buffer gud-comint-buffer)
-        (with-current-buffer buffer
+      (with-current-buffer buffer
-          (if (memq gud-minor-mode '(gdba pdb))
+        (if (memq gud-minor-mode '(gdbmi gdba))
-              (if (string-match "^\*.+*$" (buffer-name))
+            (if (string-match "\\`\\*.+\\*\\'" (buffer-name))
-                  (kill-buffer nil)
+                (kill-buffer nil)
-                (gdb-remove-breakpoint-icons (point-min) (point-max) t)
+              (gdb-remove-breakpoint-icons (point-min) (point-max) t)
-                (setq gud-minor-mode nil)
+              (setq gud-minor-mode nil)
-                (kill-local-variable 'tool-bar-map)
+              (kill-local-variable 'tool-bar-map)
-                (setq gud-running nil))))))
+              (setq gud-running nil))))))
  (when (markerp gdb-overlay-arrow-position)
    (move-marker gdb-overlay-arrow-position nil)
    (setq gdb-overlay-arrow-position nil))
@@ -1791,11 +1835,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))
+              (if (get-buffer-window (current-buffer) 'visible)
-                  (set-window-margins (get-buffer-window
+                  (set-window-margins 
-                                       (current-buffer))
+                   (get-buffer-window (current-buffer) 'visible)
-                                      left-margin-width
+                   left-margin-width right-margin-width))))
-                                      right-margin-width))))
          (put-image
           (if enabled
               (or breakpoint-enabled-icon
@@ -1819,11 +1862,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))
+          (if (get-buffer-window (current-buffer) 'visible)
-              (set-window-margins (get-buffer-window
+              (set-window-margins 
-                                   (current-buffer))
+               (get-buffer-window (current-buffer) 'visible)
-                                  left-margin-width
+               left-margin-width right-margin-width))))
-                                  right-margin-width))))
      (gdb-put-string (if enabled "B" "b") (1+ start)))))
 (defun gdb-remove-breakpoint-icons (start end &optional remove-margin)
@@ -1832,11 +1874,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))
+    (if (get-buffer-window (current-buffer) 'visible)
-        (set-window-margins (get-buffer-window
+        (set-window-margins 
-                             (current-buffer))
+         (get-buffer-window (current-buffer) 'visible)
-                            left-margin-width
+         left-margin-width right-margin-width))))
-                            right-margin-width))))
 ;;
@@ -1848,7 +1889,7 @@ BUFFER nil or omitted means use the current buffer."
 (def-gdb-auto-updated-buffer gdb-assembler-buffer
  gdb-invalidate-assembler
-  (concat "server disassemble " gdb-current-address "\n")
+  (concat gdb-server-prefix "disassemble " gdb-current-address "\n")
  gdb-assembler-handler
  gdb-assembler-custom)
@@ -1887,7 +1928,7 @@ BUFFER nil or omitted means use the current buffer."
                  (if (re-search-forward address nil t)
                      (gdb-put-breakpoint-icon (eq flag ?y))))))))
    (if (not (equal gdb-current-address "main"))
-        (set-window-point (get-buffer-window buffer) pos))))
+        (set-window-point (get-buffer-window buffer 'visible) pos))))
 (defvar gdb-assembler-mode-map
  (let ((map (make-sparse-keymap)))
@@ -1913,14 +1954,17 @@ BUFFER nil or omitted means use the current buffer."
    (concat "*Machine Code " (gdb-get-target-string) "*")))
 (defun gdb-display-assembler-buffer ()
+  "Display disassembly view."
  (interactive)
  (gdb-display-buffer
   (gdb-get-create-buffer 'gdb-assembler-buffer)))
 (defun gdb-frame-assembler-buffer ()
+  "Display disassembly view in a new frame."
  (interactive)
-  (switch-to-buffer-other-frame
+  (select-frame (make-frame gdb-frame-parameters))
-   (gdb-get-create-buffer 'gdb-assembler-buffer)))
+  (switch-to-buffer (gdb-get-create-buffer 'gdb-assembler-buffer))
+  (set-window-dedicated-p (selected-window) t))
 ;; modified because if gdb-current-address has changed value a new command
 ;; must be enqueued to update the buffer with the new output
@@ -1929,44 +1973,44 @@ BUFFER nil or omitted means use the current buffer."
      (progn
        (unless (string-equal gdb-current-frame gdb-previous-frame)
          (if (or (not (member 'gdb-invalidate-assembler
-                               (gdb-get-pending-triggers)))
+                               gdb-pending-triggers))
                  (not (string-equal gdb-current-address
                                     gdb-previous-address)))
          (progn
            ;; take previous disassemble command off the queue
            (with-current-buffer gud-comint-buffer
-              (let ((queue (gdb-get-input-queue)) (item))
+              (let ((queue gdb-input-queue) (item))
                (dolist (item queue)
                  (if (equal (cdr item) '(gdb-assembler-handler))
-                      (gdb-set-input-queue
+                      (setq gdb-input-queue
-                       (delete item (gdb-get-input-queue)))))))
+                            (delete item gdb-input-queue))))))
            (gdb-enqueue-input
-             (list (concat "server disassemble " gdb-current-address "\n")
+             (list (concat gdb-server-prefix "disassemble " gdb-current-address "\n")
                   'gdb-assembler-handler))
-            (gdb-set-pending-triggers
+            (push 'gdb-invalidate-assembler gdb-pending-triggers)
-             (cons 'gdb-invalidate-assembler
-                   (gdb-get-pending-triggers)))
            (setq gdb-previous-address gdb-current-address)
            (setq gdb-previous-frame gdb-current-frame)))))))
 (defun gdb-get-current-frame ()
-  (if (not (member 'gdb-get-current-frame (gdb-get-pending-triggers)))
+  (if (not (member 'gdb-get-current-frame gdb-pending-triggers))
      (progn
        (gdb-enqueue-input
-         (list (concat "server info frame\n") 'gdb-frame-handler))
+         (list (concat gdb-server-prefix "info frame\n") 'gdb-frame-handler))
-        (gdb-set-pending-triggers
+        (push 'gdb-get-current-frame
-         (cons 'gdb-get-current-frame
+               gdb-pending-triggers))))
-               (gdb-get-pending-triggers))))))
 (defun gdb-frame-handler ()
-  (gdb-set-pending-triggers
+  (setq gdb-pending-triggers
-   (delq 'gdb-get-current-frame (gdb-get-pending-triggers)))
+   (delq 'gdb-get-current-frame gdb-pending-triggers))
  (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
    (goto-char (point-min))
    (forward-line)
-    (if (looking-at ".*=\\s-+0x\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*\\)")
+    (if (looking-at ".*=\\s-+0x\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*?\\);? ")
        (progn
          (setq gdb-current-frame (match-string 2))
+          (if (gdb-get-buffer 'gdb-locals-buffer)
+              (with-current-buffer (gdb-get-buffer 'gdb-locals-buffer)
+                (setq mode-name (concat "Locals:" gdb-current-frame))))
          (let ((address (match-string 1)))
            ;; remove leading 0s from output of info frame command.
            (if (string-match "^0+\\(.*\\)" address)
@@ -1986,5 +2030,5 @@ BUFFER nil or omitted means use the current buffer."
 (provide 'gdb-ui)
-;;; arch-tag: e9fb00c5-74ef-469f-a088-37384caae352
+;; arch-tag: e9fb00c5-74ef-469f-a088-37384caae352
 ;;; gdb-ui.el ends here
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 94937ba1e87..aa9a50a2580 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -216,7 +216,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
 `complation-last-buffer' rather than `grep-last-buffer'.")
 (defvar grep-regexp-alist
-  '(("^\\(.+?\\)[:( \t]+\\([0-9]+\\)[:) \t]" 1 2)
+  '(("^\\(.+?\\)[:( \t]+\\([0-9]+\\)\\([:) \t]\\)\\(?:\\([0-9]+\\)\\(?:-\\([0-9]+\\)\\)?\\3\\)?" 1 2 (4 . 5))
    ("^Binary file \\(.+\\) matches$" 1 nil nil 1))
  "Regexp used to match grep hits.  See `compilation-error-regexp-alist'.")
@@ -555,7 +555,7 @@ those sub directories of DIR."
                         nil)  ;; we change default-directory to dir
                       (and grep-tree-ignore-CVS-directories "-path '*/CVS' -prune -o ")
                       grep-tree-ignore-case))
-        (default-directory dir)
+        (default-directory (file-name-as-directory (expand-file-name dir)))
        (null-device nil))              ; see grep
    (grep command-args regexp)))
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index a34b0bb2d48..4ea4fcb6ea2 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -4,7 +4,7 @@
 ;; Maintainer: FSF
 ;; Keywords: unix, tools
-;; Copyright (C) 1992,93,94,95,96,1998,2000,02,2003 Free Software Foundation, Inc.
+;; Copyright (C) 1992,93,94,95,96,1998,2000,02,03,04 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
@@ -92,44 +92,44 @@ If SOFT is non-nil, returns nil if the symbol doesn't already exist."
 Used to grey out relevant toolbar icons.")
 (easy-mmode-defmap gud-menu-map
-  '(([refresh]  "Refresh" . gud-refresh)
+  '(([help]     menu-item "Help" gdb-goto-info
+                  :enable (memq gud-minor-mode '(gdbmi gdba)))
+    ([refresh]  "Refresh" . gud-refresh)
    ([run]      menu-item "Run" gud-run
-                     :enable (and (not gud-running)
+                  :enable (and (not gud-running)
-                                  (memq gud-minor-mode '(gdba gdb dbx jdb))))
+                               (memq gud-minor-mode '(gdbmi gdba gdb dbx jdb))))
    ([until]    menu-item "Continue to selection" gud-until
-                     :enable (and (not gud-running)
+                  :enable (and (not gud-running)
-                                  (memq gud-minor-mode '(gdba gdb perldb))))
+                               (memq gud-minor-mode '(gdbmi gdba gdb perldb))))
    ([remove]   menu-item "Remove Breakpoint" gud-remove
-                     :enable (not gud-running))
+                  :enable (not gud-running))
    ([tbreak]   menu-item "Temporary Breakpoint" gud-tbreak
-                     :enable (memq gud-minor-mode '(gdba gdb sdb xdb bashdb)))
+                  :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))
    ([up]       menu-item "Up Stack" gud-up
-                     :enable (and (not gud-running)
+                  :enable (and (not gud-running)
-                                  (memq gud-minor-mode
+                               (memq gud-minor-mode
-                                        '(gdba gdb dbx xdb jdb pdb bashdb))))
+                                     '(gdbmi gdba gdb dbx xdb jdb pdb bashdb))))
    ([down]     menu-item "Down Stack" gud-down
-                     :enable (and (not gud-running)
+                  :enable (and (not gud-running)
-                                  (memq gud-minor-mode
+                               (memq gud-minor-mode
-                                        '(gdba gdb dbx xdb jdb pdb bashdb))))
+                                     '(gdbmi gdba gdb dbx xdb jdb pdb bashdb))))
    ([print]    menu-item "Print Expression" gud-print
                     :enable (not gud-running))
    ([watch]    menu-item "Watch Expression" gud-watch
                     :enable (and (not gud-running)
-                                  (eq gud-minor-mode 'gdba)))
+                                  (memq gud-minor-mode '(gdbmi gdba))))
    ([finish]   menu-item "Finish Function" gud-finish
                     :enable (and (not gud-running)
                                  (memq gud-minor-mode
-                                        '(gdba gdb xdb jdb pdb bashdb))))
+                                        '(gdbmi gdba gdb xdb jdb pdb bashdb))))
    ([stepi]    menu-item "Step Instruction" gud-stepi
                     :enable (and (not gud-running)
-                                  (memq gud-minor-mode
+                                  (memq gud-minor-mode '(gdbmi gdba gdb dbx))))
-                                        '(gdba gdb dbx))))
    ([nexti]    menu-item "Next Instruction" gud-nexti
                     :enable (and (not gud-running)
-                                  (memq gud-minor-mode
+                                  (memq gud-minor-mode '(gdbmi gdba gdb dbx))))
-                                        '(gdba gdb dbx))))
    ([step]     menu-item "Step Line" gud-step
                     :enable (not gud-running))
    ([next]     menu-item "Next Line" gud-next
@@ -171,7 +171,8 @@ Used to grey out relevant toolbar icons.")
                     (gud-stepi . "gud-si")
                     (gud-nexti . "gud-ni")
                     (gud-up . "gud-up")
-                     (gud-down . "gud-down"))
+                     (gud-down . "gud-down")
+                     (gdb-goto-info . "help"))
                   map)
          (tool-bar-local-item-from-menu
           (car x) (cdr x) map gud-minor-mode-map)))))
@@ -312,11 +313,14 @@ t means that there is no stack, and we are in display-file mode.")
 (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 (eq gud-minor-mode 'gdba)))]
+     (with-current-buffer gud-comint-buffer
+       (not (memq gud-minor-mode '(gdbmi gdba))))]
    ["Edit value" speedbar-edit-line 
-     (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))]
+     (with-current-buffer gud-comint-buffer
+       (not (memq gud-minor-mode '(gdbmi gdba))))]
    ["Delete expression" gdb-var-delete 
-     (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))])
+     (with-current-buffer gud-comint-buffer
+       (not (memq gud-minor-mode '(gdbmi gdba))))])
  "Additional menu items to add to the speedbar frame.")
 ;; Make sure our special speedbar mode is loaded
@@ -330,7 +334,7 @@ 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
-     ((eq minor-mode 'gdba)
+     ((memq minor-mode '(gdbmi gdba))
      (when (or gdb-var-changed
                (not (save-excursion
                       (goto-char (point-min))
@@ -397,7 +401,7 @@ off the specialized speedbar mode."
              (speedbar-insert-button (car frame)
                                      'speedbar-file-face
                                      'speedbar-highlight-face
-                                      (cond ((memq minor-mode '(gdba gdb))
+                                      (cond ((memq minor-mode '(gdbmi gdba gdb))
                                             'gud-gdb-goto-stackframe)
                                            (t (error "Should never be here")))
                                        frame t)))
@@ -1401,7 +1405,7 @@ and source-file directory for your debugger."
    output))
-(defcustom gud-pdb-command-name "pdb"
+(defcustom gud-pdb-command-name "pydb"
  "File name for executing the Python debugger.
 This should be an executable on your path, or an absolute file name."
  :type 'string
@@ -2339,7 +2343,8 @@ comint mode, which see."
  ;; Don't put repeated commands in command history many times.
  (set (make-local-variable 'comint-input-ignoredups) t)
  (make-local-variable 'paragraph-start)
-  (set (make-local-variable 'gud-delete-prompt-marker) (make-marker)))
+  (set (make-local-variable 'gud-delete-prompt-marker) (make-marker))
+  (add-hook 'kill-buffer-hook 'gud-kill-buffer-hook nil t))
 ;; Cause our buffers to be displayed, by default,
 ;; in the selected window.
@@ -2384,8 +2389,11 @@ comint mode, which see."
                    (if (file-name-directory file-subst)
                        (expand-file-name file-subst)
                      file-subst)))
-         (filepart (and file-word (concat "-" (file-name-nondirectory file)))))
+         (filepart (and file-word (concat "-" (file-name-nondirectory file))))
+         (existing-buffer (get-buffer (concat "*gud" filepart "*"))))
    (pop-to-buffer (concat "*gud" filepart "*"))
+    (when (and existing-buffer (get-buffer-process existing-buffer))
+      (error "This program is already running under gdb"))
    ;; Set the dir, in case the buffer already existed with a different dir.
    (setq default-directory dir)
    ;; Set default-directory to the file's directory.
@@ -2507,14 +2515,14 @@ It is saved for when this flag is not set.")
         ;; Stop displaying an arrow in a source file.
         (setq overlay-arrow-position nil)
         (set-process-buffer proc nil)
-         (if (eq gud-minor-mode-type 'gdba)
+         (if (memq gud-minor-mode-type '(gdbmi gdba))
             (gdb-reset)
           (gud-reset)))
        ((memq (process-status proc) '(signal exit))
         ;; Stop displaying an arrow in a source file.
         (setq overlay-arrow-position nil)
         (with-current-buffer gud-comint-buffer
-           (if (eq gud-minor-mode 'gdba)
+           (if (memq gud-minor-mode-type '(gdbmi gdba))
               (gdb-reset)
             (gud-reset)))
         (let* ((obuf (current-buffer)))
@@ -2543,19 +2551,18 @@ It is saved for when this flag is not set.")
             (set-buffer obuf))))))
 (defun gud-kill-buffer-hook ()
-  (if gud-minor-mode
+  (setq gud-minor-mode-type gud-minor-mode)
-      (setq gud-minor-mode-type gud-minor-mode)))
+  (condition-case nil
+      (kill-process (get-buffer-process gud-comint-buffer))
-(add-hook 'kill-buffer-hook 'gud-kill-buffer-hook)
+    (error nil)))
 (defun gud-reset ()
  (dolist (buffer (buffer-list))
-    (if (not (eq buffer gud-comint-buffer))
+    (unless (eq buffer gud-comint-buffer)
-        (save-excursion
+      (with-current-buffer buffer
-          (set-buffer buffer)
+        (when gud-minor-mode
-          (when gud-minor-mode
+          (setq gud-minor-mode nil)
-            (setq gud-minor-mode nil)
+          (kill-local-variable 'tool-bar-map))))))
-            (kill-local-variable 'tool-bar-map))))))
 (defun gud-display-frame ()
  "Find and obey the last filename-and-line marker from the debugger.
@@ -2580,7 +2587,7 @@ Obeying it means displaying in another window the specified file and line."
          (with-current-buffer gud-comint-buffer
            (gud-find-file true-file)))
         (window (and buffer (or (get-buffer-window buffer)
-                                 (if (eq gud-minor-mode 'gdba)
+                                 (if (memq gud-minor-mode '(gdbmi gdba))
                                     (gdb-display-source-buffer buffer)
                                   (display-buffer buffer)))))
         (pos))
@@ -2704,7 +2711,7 @@ Obeying it means displaying in another window the specified file and line."
        (forward-line 0)
        (if (looking-at comint-prompt-regexp)
            (set-marker gud-delete-prompt-marker (point)))
-        (if (eq gud-minor-mode 'gdba)
+        (if (memq gud-minor-mode '(gdbmi gdba))
            (apply comint-input-sender (list proc command))
          (process-send-string proc (concat command "\n")))))))
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index a600939ef71..ae0c43c2730 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -1823,8 +1823,8 @@ Change the default directory for the process buffer to concur."
       'hide 'wait)
      ;; If we don't know anything about the class, update shell routines
      (if (and idlwave-shell-get-object-class
-               (not (assoc-ignore-case idlwave-shell-get-object-class
+               (not (assoc-string idlwave-shell-get-object-class
-                                       (idlwave-class-alist))))
+                                  (idlwave-class-alist) t)))
          (idlwave-shell-maybe-update-routine-info))
      idlwave-shell-get-object-class)))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index bfa507b851a..274480a36de 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003, 04  Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
+;; Maintainer: FSF
 ;; Created: Nov 2003
 ;; Keywords: languages
@@ -45,19 +46,18 @@
 ;; I've installed a minor mode to do the job properly in Emacs 22.
 ;; Other things seem more natural or canonical here, e.g. the
 ;; {beginning,end}-of-defun implementation dealing with nested
-;; definitions, and the inferior mode following `cmuscheme'.  (The
+;; definitions, and the inferior mode following `cmuscheme'.  The
-;; inferior mode should be able to find the source of errors from
+;; inferior mode can find the source of errors from
-;; `python-send-region' & al via `compilation-minor-mode', but I can't
+;; `python-send-region' & al via `compilation-minor-mode'.  Successive
-;; make that work with the current (March '04) compile.el.)
+;; TABs cycle between possible indentations for the line.  There is
-;; Successive TABs cycle between possible indentations for the line.
+;; symbol completion using lookup in Python.
 ;; Even where it has similar facilities, this is incompatible with
 ;; python-mode.el in various respects.  For instance, various key
 ;; bindings are changed to obey Emacs conventions, and things like
 ;; marking blocks and `beginning-of-defun' behave differently.
-;; TODO: See various Fixmes below.  It should be possible to arrange
+;; TODO: See various Fixmes below.
-;; some sort of completion using the inferior interpreter.
 ;;; Code:
@@ -66,10 +66,8 @@
 (require 'comint)
 (eval-when-compile
  (require 'compile)
-  (autoload 'Info-last "info")
-  (autoload 'Info-exit "info")
  (autoload 'info-lookup-maybe-add-help "info-look"))
-(autoload 'compilation-start "compile") ; spurious compiler warning anyway
+(autoload 'compilation-start "compile")
 (defgroup python nil
  "Silly walks in the Python language"
@@ -204,6 +202,8 @@ Used for syntactic keywords.  N is the match number (1, 2 or 3)."
    (define-key map "\C-c\C-z" 'python-switch-to-python)
    (define-key map "\C-c\C-m" 'python-load-file)
    (define-key map "\C-c\C-l" 'python-load-file) ; a la cmuscheme
+    (substitute-key-definition 'complete-symbol 'python-complete-symbol
+                               map global-map)
    ;; Fixme: Add :help to menu.
    (easy-menu-define python-menu map "Python Mode menu"
      '("Python"
@@ -262,9 +262,7 @@ Used for syntactic keywords.  N is the match number (1, 2 or 3)."
 ;;;; Utility stuff
 (defsubst python-in-string/comment ()
-  "Return non-nil if point is in a Python literal (a comment or string).
+  "Return non-nil if point is in a Python literal (a comment or string)."
-Optional argument LIM indicates the beginning of the containing form,
-i.e. the limit on how far back to scan."
  (syntax-ppss-context (syntax-ppss)))
 (defconst python-space-backslash-table
@@ -299,16 +297,18 @@ comments and strings, or that the bracket/paren nesting depth is nonzero."
               (syntax-ppss (line-beginning-position)))))))
 (defun python-comment-line-p ()
-  "Return non-nil if current line has only a comment or is blank."
+  "Return non-nil iff current line has only a comment."
  (save-excursion
-    (back-to-indentation)
+    (end-of-line)
-    (looking-at (rx (or (syntax comment-start) line-end)))))
+    (when (eq 'comment (syntax-ppss-context (syntax-ppss)))
+      (back-to-indentation)
+      (looking-at (rx (or (syntax comment-start) line-end))))))
 (defun python-beginning-of-string ()
  "Go to beginning of string around point.
 Do nothing if not in string."
  (let ((state (syntax-ppss)))
-    (when (nth 3 state)
+    (when (eq 'string (syntax-ppss-context state))
      (goto-char (nth 8 state)))))
 (defun python-open-block-statement-p (&optional bos)
@@ -323,7 +323,8 @@ BOS non-nil means point is known to be at beginning of statement."
                                     line-end))
                            (save-excursion (python-end-of-statement))
                            t)
-         (not (python-in-string/comment)))))
+         (not (progn (goto-char (match-beginning 0))
+                     (python-in-string/comment))))))
 (defun python-close-block-statement-p (&optional bos)
  "Return non-nil if current line is a statement closing a block.
@@ -384,7 +385,8 @@ Otherwise indent them to column zero."
 (defcustom python-honour-comment-indentation nil
  "Non-nil means indent relative to preceding comment line.
 Only do this for comments where the leading comment character is followed
-by space."
+by space.  This doesn't apply to comment lines, which are always indented
+in lines with preceding comments."
  :type 'boolean
  :group 'python)
@@ -514,6 +516,16 @@ Set `python-indent' locally to the value guessed."
                                     (- python-indent)))
                          0)))))))))
+(defun python-comment-indent ()
+  "`comment-indent-function' for Python."
+  ;; If previous non-blank line was a comment, use its indentation.
+  ;; FIXME: This seems unnecessary since the default code delegates to
+  ;; indent-according-to-mode.  --Stef
+  (unless (bobp)
+    (save-excursion
+      (forward-comment -1)
+      (if (eq ?# (char-after)) (current-column)))))
 ;;;; Cycling through the possible indentations with successive TABs.
 ;; These don't need to be buffer-local since they're only relevant
@@ -538,11 +550,17 @@ Set `python-indent' locally to the value guessed."
                      (point))))
 (defun python-indentation-levels ()
-  "Return a list of possible indentations for this statement.
+  "Return a list of possible indentations for this line.
 Includes the default indentation and those which would close all
-enclosing blocks."
+enclosing blocks.  Assumes the line has already been indented per
+`python-indent-line'.  Elements of the list are actually pairs:
+\(INDENTATION . TEXT), where TEXT is the initial text of the
+corresponding block opening (or nil)."
  (save-excursion
-    (let ((levels (list (cons (current-indentation) nil))))
+    (let ((levels (list (cons (current-indentation)
+                              (save-excursion
+                                (if (python-beginning-of-block)
+                                    (python-initial-text)))))))
      ;; Only one possibility if we immediately follow a block open or
      ;; are in a continuation line.
      (unless (or (python-continuation-line-p)
@@ -568,8 +586,7 @@ enclosing blocks."
      (if (> (- (point-max) pos) (point))
          (goto-char (- (point-max) pos))))))
-;; Fixme: Is the arg necessary?
+(defun python-indent-line ()
-(defun python-indent-line (&optional arg)
  "Indent current line as Python code.
 When invoked via `indent-for-tab-command', cycle through possible
 indentations for current line.  The cycle is broken by a command different
@@ -586,13 +603,30 @@ from `indent-for-tab-command', i.e. successive TABs do the cycling."
                 (beginning-of-line)
                 (delete-horizontal-space)
                 (indent-to (car (nth python-indent-index python-indent-list)))
-                 (let ((text (cdr (nth python-indent-index
+                 (if (python-block-end-p)
-                                       python-indent-list))))
+                     (let ((text (cdr (nth python-indent-index
-                   (if text (message "Closes: %s" text)))))
+                                           python-indent-list))))
+                       (if text
+                           (message "Closes: %s" text))))))
      (python-indent-line-1)
      (setq python-indent-list (python-indentation-levels)
            python-indent-list-length (length python-indent-list)
            python-indent-index (1- python-indent-list-length)))))
+(defun python-block-end-p ()
+  "Non-nil if this is a line in a statement closing a block,
+or a blank line indented to where it would close a block."
+  (and (not (python-comment-line-p))
+       (or (python-close-block-statement-p t)
+           (< (current-indentation)
+              (save-excursion
+                (python-previous-statement)
+                (current-indentation))))))
+;; Fixme: Define an indent-region-function.  It should probably leave
+;; lines alone if the indentation is already at one of the allowed
+;; levels.  Otherwise, M-C-\ typically keeps indenting more deeply
+;; down a function.
 ;;;; Movement.
@@ -629,8 +663,7 @@ start of buffer."
  "`end-of-defun-function' for Python.
 Finds end of innermost nested class or method definition."
  (let ((orig (point))
-        (pattern (rx (and line-start (0+ space)
+        (pattern (rx (and line-start (0+ space) (or "def" "class") space))))
-                          (or "def" "class") space))))
    ;; Go to start of current block and check whether it's at top
    ;; level.  If it is, and not a block start, look forward for
    ;; definition statement.
@@ -829,7 +862,8 @@ move and return nil.  Otherwise return t."
 Makes nested Imenu menus from nested `class' and `def' statements.
 The nested menus are headed by an item referencing the outer
 definition; it has a space prepended to the name so that it sorts
-first with `imenu--sort-by-name'."
+first with `imenu--sort-by-name' (though, unfortunately, sub-menus
+precede it)."
  (unless (boundp 'python-recursing)            ; dynamically bound below
    (goto-char (point-min)))            ; normal call from Imenu
  (let (index-alist                     ; accumulated value to return
@@ -914,13 +948,20 @@ See `python-check-command' for the default."
                                        (file-name-nondirectory name))))))))
  (setq python-saved-check-command command)
  (save-some-buffers (not compilation-ask-about-save) nil)
-  (compilation-start command))
+  (let ((compilation-error-regexp-alist
+         (cons '("(\\([^,]+\\), line \\([0-9]+\\))" 1 2)
+               compilation-error-regexp-alist)))
+    (compilation-start command)))
 ;;;; Inferior mode stuff (following cmuscheme).
+;; Fixme: Make sure we can work with IPython.
 (defcustom python-python-command "python"
  "*Shell command to run Python interpreter.
-Any arguments can't contain whitespace."
+Any arguments can't contain whitespace.
+Note that IPython may not work properly; it must at least be used with the
+`-cl' flag, i.e. use `ipython -cl'."
  :group 'python
  :type 'string)
@@ -937,40 +978,66 @@ Additional arguments are added when the command is used by `run-python'
 et al.")
 (defvar python-buffer nil
-  "*The current python process buffer.
+  "The current python process buffer."
-To run multiple Python processes, start the first with \\[run-python].
+  ;; Fixme: a single process is currently assumed, so that this doc
-It will be in a buffer named *Python*.  Rename that with
+  ;; is misleading.
-\\[rename-buffer].  Now start a new process with \\[run-python].  It
-will be in a new buffer, named *Python*.  Switch between the different
+;;   "*The current python process buffer.
-process buffers with \\[switch-to-buffer].
+;; To run multiple Python processes, start the first with \\[run-python].
+;; It will be in a buffer named *Python*.  Rename that with
-Commands that send text from source buffers to Python processes have
+;; \\[rename-buffer].  Now start a new process with \\[run-python].  It
-to choose a process to send to.  This is determined by global variable
+;; will be in a new buffer, named *Python*.  Switch between the different
-`python-buffer'.  Suppose you have three inferior Pythons running:
+;; process buffers with \\[switch-to-buffer].
-    Buffer      Process
-    foo         python
+;; Commands that send text from source buffers to Python processes have
-    bar         python<2>
+;; to choose a process to send to.  This is determined by global variable
-    *Python*    python<3>
+;; `python-buffer'.  Suppose you have three inferior Pythons running:
-If you do a \\[python-send-region-and-go] command on some Python source
+;;     Buffer   Process
-code, what process does it go to?
+;;     foo              python
+;;     bar              python<2>
- In a process buffer (foo, bar, or *Python*), send it to that process.
+;;     *Python*    python<3>
- In some other buffer (e.g. a source file), send it to the process
+;; If you do a \\[python-send-region-and-go] command on some Python source
-  attached to `python-buffer'.
+;; code, what process does it go to?
-Process selection is done by function `python-proc'.
+;; - In a process buffer (foo, bar, or *Python*), send it to that process.
-Whenever \\[run-python] starts a new process, it resets `python-buffer'
+;; - In some other buffer (e.g. a source file), send it to the process
-to be the new process's buffer.  If you only run one process, this will
+;;   attached to `python-buffer'.
-do the right thing.  If you run multiple processes, you can change
+;; Process selection is done by function `python-proc'.
-`python-buffer' to another process buffer with \\[set-variable].")
+;; Whenever \\[run-python] starts a new process, it resets `python-buffer'
+;; to be the new process's buffer.  If you only run one process, this will
+;; do the right thing.  If you run multiple processes, you can change
+;; `python-buffer' to another process buffer with \\[set-variable]."
+  )
 (defconst python-compilation-regexp-alist
+  ;; FIXME: maybe these should move to compilation-error-regexp-alist-alist.
  `((,(rx (and line-start (1+ (any " \t")) "File \""
               (group (1+ (not (any "\"<")))) ; avoid `<stdin>' &c
               "\", line " (group (1+ digit))))
-     1 python-compilation-line-number))
+     1 2)
+    (,(rx (and " in file " (group (1+ not-newline)) " on line "
+               (group (1+ digit))))
+     1 2))
  "`compilation-error-regexp-alist' for inferior Python.")
+(defvar inferior-python-mode-map
+  (let ((map (make-sparse-keymap)))
+    ;; This will inherit from comint-mode-map.
+    (define-key map "\C-c\C-l" 'python-load-file)
+    (define-key map "\C-c\C-v" 'python-check)
+    ;; Note that we _can_ still use these commands which send to the
+    ;; Python process even at the prompt iff we have a normal prompt,
+    ;; i.e. '>>> ' and not '... '.  See the comment before
+    ;; python-send-region.  Fixme: uncomment these if we address that.
+    ;; (define-key map [(meta ?\t)] 'python-complete-symbol)
+    ;; (define-key map "\C-c\C-f" 'python-describe-symbol)
+    map))
+;; Fixme: This should inherit some stuff from python-mode, but I'm not
+;; sure how much: at least some keybindings, like C-c C-f; syntax?;
+;; font-locking, e.g. for triple-quoted strings?
 (define-derived-mode inferior-python-mode comint-mode "Inferior Python"
  "Major mode for interacting with an inferior Python process.
 A Python process can be started with \\[run-python].
@@ -991,14 +1058,13 @@ For running multiple processes in multiple buffers, see `python-buffer'.
  :group 'python
  (set-syntax-table python-mode-syntax-table)
  (setq mode-line-process '(":%s"))
-  ;; Fixme: Maybe install some python-mode bindings too.
+  (set (make-local-variable 'comint-input-filter) 'python-input-filter)
-  (define-key inferior-python-mode-map "\C-c\C-l" 'python-load-file)
-  (define-key inferior-python-mode-map "\C-c\C-z" 'python-switch-to-python)
-  (add-hook 'comint-input-filter-functions 'python-input-filter nil t)
  (add-hook 'comint-preoutput-filter-functions #'python-preoutput-filter
            nil t)
-  ;; Still required by `comint-redirect-send-command', for instance:
+  ;; Still required by `comint-redirect-send-command', for instance
-  (set (make-local-variable 'comint-prompt-regexp) "^\\([>.]\\{3\\} \\)+")
+  ;; (and we need to match things like `>>> ... >>> '):
+  (set (make-local-variable 'comint-prompt-regexp)
+       (rx (and line-start (1+ (and (repeat 3 (any ">.")) ?\ )))))
  (set (make-local-variable 'compilation-error-regexp-alist)
       python-compilation-regexp-alist)
  (compilation-shell-minor-mode 1))
@@ -1009,15 +1075,9 @@ Default ignores all inputs of 0, 1, or 2 non-blank characters."
  :type 'regexp
  :group 'python)
-(defvar python-orig-start nil
-  "Marker to the start of the region passed to the inferior Python.
-It can also be a filename.")
 (defun python-input-filter (str)
  "`comint-input-filter' function for inferior Python.
-Don't save anything for STR matching `inferior-python-filter-regexp'.
+Don't save anything for STR matching `inferior-python-filter-regexp'."
-Also resets variables for adjusting error messages."
-  (setq python-orig-start nil)
  (not (string-match inferior-python-filter-regexp str)))
 ;; Fixme: Loses with quoted whitespace.
@@ -1030,21 +1090,8 @@ Also resets variables for adjusting error messages."
          (t (let ((pos (string-match "[^ \t]" string)))
               (if pos (python-args-to-list (substring string pos))))))))
-(defun python-compilation-line-number (file col)
-  "Return error descriptor of error found for FILE, column COL.
-Used as line-number hook function in `python-compilation-regexp-alist'."
-  (let ((line (string-to-number (match-string 2))))
-    (cons (point-marker)
-          (if (and (markerp python-orig-start)
-                   (marker-buffer python-orig-start))
-              (with-current-buffer (marker-buffer python-orig-start)
-                (goto-char python-orig-start)
-                (forward-line (1- line)))
-            (list (if (stringp python-orig-start) python-orig-start file)
-                  line nil)))))
 (defvar python-preoutput-result nil
-  "Data from output line last `_emacs_out' line seen by the preoutput filter.")
+  "Data from last `_emacs_out' line seen by the preoutput filter.")
 (defvar python-preoutput-continuation nil
  "If non-nil, funcall this when `python-preoutput-filter' sees `_emacs_ok'.")
@@ -1055,7 +1102,9 @@ Used as line-number hook function in `python-compilation-regexp-alist'."
 ;; `python-preoutput-continuation' if we get it.
 (defun python-preoutput-filter (s)
  "`comint-preoutput-filter-functions' function: ignore prompts not at bol."
-  (cond ((and (string-match "\\`[.>]\\{3\\} \\'" s)
+  (cond ((and (string-match (rx (and string-start (repeat 3 (any ".>"))
+                                     " " string-end))
+                            s)
              (/= (let ((inhibit-field-text-motion t))
                    (line-beginning-position))
                  (point)))
@@ -1076,10 +1125,10 @@ Used as line-number hook function in `python-compilation-regexp-alist'."
 CMD is the Python command to run.  NOSHOW non-nil means don't show the
 buffer automatically.
 If there is a process already running in `*Python*', switch to
-that buffer.  Interactively a prefix arg, allows you to edit the initial
+that buffer.  Interactively, a prefix arg allows you to edit the initial
-command line (default is the value of `python-command'); `-i' etc. args
+command line (default is `python-command'); `-i' etc. args will be added
-will be added to this as appropriate.  Runs the hooks
+to this as appropriate.  Runs the hook `inferior-python-mode-hook'
-`inferior-python-mode-hook' (after the `comint-mode-hook' is run).
+\(after the `comint-mode-hook' is run).
 \(Type \\[describe-mode] in the process buffer for a list of commands.)"
  (interactive (list (if current-prefix-arg
                         (read-string "Run Python: " python-command)
@@ -1089,82 +1138,78 @@ will be added to this as appropriate.  Runs the hooks
  ;; Fixme: Consider making `python-buffer' buffer-local as a buffer
  ;; (not a name) in Python buffers from which `run-python' &c is
  ;; invoked.  Would support multiple processes better.
-  (unless (comint-check-proc "*Python*")
+  (unless (comint-check-proc python-buffer)
-    (let ((cmdlist (append (python-args-to-list cmd) '("-i"))))
+    (let* ((cmdlist (append (python-args-to-list cmd) '("-i")))
+           (path (getenv "PYTHONPATH"))
+           (process-environment         ; to import emacs.py
+            (push (concat "PYTHONPATH=" data-directory
+                          (if path (concat ":" path)))
+                  process-environment)))
      (set-buffer (apply 'make-comint "Python" (car cmdlist) nil
-                         (cdr cmdlist))))
+                         (cdr cmdlist)))
+      (setq python-buffer "*Python*"))
    (inferior-python-mode)
    ;; Load function defintions we need.
    ;; Before the preoutput function was used, this was done via -c in
    ;; cmdlist, but that loses the banner and doesn't run the startup
-    ;; file.
+    ;; file.  The code might be inline here, but there's enough that it
-    (python-send-string "\
+    ;; seems worth putting in a separate file, and it's probably cleaner
-def _emacs_execfile (file):  # execute file and remove it
+    ;; to put it in a module.
-    from os import remove
+    (python-send-string "import emacs"))
-    try: execfile (file, globals (), globals ())
+  (unless noshow (pop-to-buffer python-buffer)))
-    finally: remove (file)
+;; Fixme: We typically lose if the inferior isn't in the normal REPL,
-def _emacs_args (name):  # get arglist of name for eldoc &c
+;; e.g. prompt is `help> '.  Probably raise an error if the form of
-    import inspect
+;; the prompt is unexpected; actually, it needs to be `>>> ', not
-    parts = name.split ('.')
+;; `... ', i.e. we're not inputting a block &c.  However, this may not
-    if len (parts) > 1:
+;; be the place to do it, e.g. we might actually want to send commands
-        try: exec 'import ' + parts[0]
+;; having set up such a state.
-        except: return None
-    try: exec 'func='+name # lose if name is keyword or undefined
+(defun python-send-command (command)
-    except: return None
+  "Like `python-send-string' but resets `compilation-minor-mode'."
-    if inspect.isbuiltin (func):
+  (goto-char (point-max))
-        doc = func.__doc__
+  (let ((end (marker-position (process-mark (python-proc)))))
-        if doc.find (' ->') != -1:
+    (compilation-forget-errors)
-            print '_emacs_out', doc.split (' ->')[0]
+    (python-send-string command)
-        elif doc.find ('\\n') != -1:
+    (set-marker compilation-parsing-end end)
-            print '_emacs_out', doc.split ('\\n')[0]
+    (setq compilation-last-buffer (current-buffer))))
-        return None
-    if inspect.ismethod (func): func = func.im_func
-    if not inspect.isfunction (func):
-        return None
-    (args, varargs, varkw, defaults) = inspect.getargspec (func)
-    print '_emacs_out', func.__name__+inspect.formatargspec (args, varargs, varkw, defaults)
-print '_emacs_ok'"))
-  (unless noshow (pop-to-buffer (setq python-buffer "*Python*"))))
 (defun python-send-region (start end)
  "Send the region to the inferior Python process."
  ;; The region is evaluated from a temporary file.  This avoids
  ;; problems with blank lines, which have different semantics
  ;; interactively and in files.  It also saves the inferior process
-  ;; buffer filling up with interpreter prompts.  We need a function
+  ;; buffer filling up with interpreter prompts.  We need a Python
-  ;; to remove the temporary file when it has been evaluated, which
+  ;; function to remove the temporary file when it has been evaluated
-  ;; unfortunately means using a not-quite pristine interpreter
+  ;; (though we could probably do it in Lisp with a Comint output
-  ;; initially.  Unfortunately we also get tracebacks which look like:
+  ;; filter).  This function also catches exceptions and truncates
-  ;; 
+  ;; tracebacks not to mention the frame of the function itself.
-  ;; >>> Traceback (most recent call last):
-  ;;   File "<stdin>", line 1, in ?
-  ;;   File "<string>", line 4, in _emacs_execfile
-  ;;   File "/tmp/py7734RSB", line 11
  ;;
  ;; The compilation-minor-mode parsing takes care of relating the
-  ;; reference to the temporary file to the source.  Fixme:
+  ;; reference to the temporary file to the source.
-  ;; comint-filter the first two lines of the traceback?
+  ;;
+  ;; Fixme: Write a `coding' header to the temp file if the region is
+  ;; non-ASCII.
  (interactive "r")
  (let* ((f (make-temp-file "py"))
-         (command (format "_emacs_execfile(%S)" f))
+         (command (format "emacs.eexecfile(%S)" f))
         (orig-start (copy-marker start)))
-    (if (save-excursion
+    (when (save-excursion
-          (goto-char start)
+            (goto-char start)
-          (/= 0 (current-indentation))) ; need dummy block
+            (/= 0 (current-indentation))) ; need dummy block
-        (write-region "if True:\n" nil f nil 'nomsg))
+      (save-excursion
+        (goto-char orig-start)
+        ;; Wrong if we had indented code at buffer start.
+        (set-marker orig-start (line-beginning-position 0)))
+      (write-region "if True:\n" nil f nil 'nomsg))
    (write-region start end f t 'nomsg)
-    (when python-buffer
+    (let ((proc (python-proc)))         ;Make sure we're running a process.
      (with-current-buffer python-buffer
-        (let ((end (marker-position (process-mark (python-proc)))))
+        (python-send-command command)
-          (set (make-local-variable 'python-orig-start) orig-start)
+        ;; Tell compile.el to redirect error locations in file `f' to
-          (set (make-local-variable 'compilation-error-list) nil)
+        ;; positions past marker `orig-start'.  It has to be done *after*
-          (let ((comint-input-filter-functions
+        ;; python-send-command's call to compilation-forget-errors.
-                 (delete 'python-input-filter comint-input-filter-functions)))
+        (compilation-fake-loc orig-start f)))))
-            (python-send-string command))
-          (set-marker compilation-parsing-end end)
-          (setq compilation-last-buffer (current-buffer)))))))
 (defun python-send-string (string)
  "Evaluate STRING in inferior Python process."
@@ -1177,6 +1222,8 @@ print '_emacs_ok'"))
  (interactive)
  (python-send-region (point-min) (point-max)))
+;; Fixme: Try to define the function or class within the relevant
+;; module, not just at top level.
 (defun python-send-defun ()
  "Send the current defun (class or method) to the inferior Python process."
  (interactive)
@@ -1223,39 +1270,33 @@ function location information for debugging, and supports users of
 module-qualified names."
  (interactive (comint-get-source "Load Python file: " python-prev-dir/file
                                  python-source-modes
-                                  t)) ; because execfile needs exact name
+                                  t))   ; because execfile needs exact name
-  (comint-check-source file-name) ; Check to see if buffer needs saved.
+  (comint-check-source file-name)     ; Check to see if buffer needs saving.
  (setq python-prev-dir/file (cons (file-name-directory file-name)
                                   (file-name-nondirectory file-name)))
-  (when python-buffer
+  (let ((proc (python-proc)))           ;Make sure we have a process.
    (with-current-buffer python-buffer
-      (let ((end (marker-position (process-mark (python-proc)))))
+      ;; Fixme: I'm not convinced by this logic from python-mode.el.
-        (set (make-local-variable 'compilation-error-list) nil)
+      (python-send-command
-        ;; (set (make-local-variable 'compilation-old-error-list) nil)
+       (if (string-match "\\.py\\'" file-name)
-        (let ((comint-input-filter-functions
+           (let ((module (file-name-sans-extension
-               (delete 'python-input-filter comint-input-filter-functions)))
+                          (file-name-nondirectory file-name))))
-          (python-send-string
+             (format "emacs.eimport(%S,%S)"
-           (if (string-match "\\.py\\'" file-name)
+                     module (file-name-directory file-name)))
-               ;; Fixme: make sure the directory is in the path list
+         (format "execfile(%S)" file-name)))
-               (let ((module (file-name-sans-extension
+      (message "%s loaded" file-name))))
-                              (file-name-nondirectory file-name))))
-                 (set (make-local-variable 'python-orig-start) nil)
+;; Fixme: If we need to start the process, wait until we've got the OK
-                 (format "\
+;; from the startup.
-if globals().has_key(%S): reload(%s)
-else: import %s
-" module module module))
-             (set (make-local-variable 'python-orig-start) file-name)
-             (format "execfile('%s')" file-name))))
-        (set-marker compilation-parsing-end end)
-        (setq compilation-last-buffer (current-buffer))))))
-;; Fixme: Should this start a process if there isn't one?  (Unlike cmuscheme.)
 (defun python-proc ()
-  "Return the current Python process.  See variable `python-buffer'."
+  "Return the current Python process.
-  (let ((proc (get-buffer-process (if (eq major-mode 'inferior-python-mode)
+See variable `python-buffer'.  Starts a new process if necessary."
-                                      (current-buffer)
+  (or (if python-buffer
-                                    python-buffer))))
+          (get-buffer-process (if (eq major-mode 'inferior-python-mode)
-    (or proc (error "No current process.  See variable `python-buffer'"))))
+                                  (current-buffer)
+                                python-buffer)))
+      (progn (run-python nil t)
+             (python-proc))))
 ;;;; Context-sensitive help.
@@ -1267,33 +1308,47 @@ else: import %s
  "Syntax table giving `.' symbol syntax.
 Otherwise inherits from `python-mode-syntax-table'.")
+(defvar view-return-to-alist)
+(eval-when-compile (autoload 'help-buffer "help-fns"))
 ;; Fixme: Should this actually be used instead of info-look, i.e. be
-;; bound to C-h S?
+;; bound to C-h S?  Can we use other pydoc stuff before python 2.2?
 (defun python-describe-symbol (symbol)
-  "Get help on SYMBOL using `pydoc'.
+  "Get help on SYMBOL using `help'.
-Interactively, prompt for symbol."
+Interactively, prompt for symbol.
-  ;; Note that we do this in the inferior process, not a separate one to
+Symbol may be anything recognized by the interpreter's `help' command --
+e.g. `CALLS' -- not just variables in scope.
+This only works for Python version 2.2 or newer since earlier interpreters
+don't support `help'."
+  ;; Note that we do this in the inferior process, not a separate one, to
  ;; ensure the environment is appropriate.
  (interactive
   (let ((symbol (with-syntax-table python-dotty-syntax-table
                   (current-word)))
-         (enable-recursive-minibuffers t)
+         (enable-recursive-minibuffers t))
-         val)
+     (list (read-string (if symbol
-     (setq val (read-string (if symbol
+                            (format "Describe symbol (default %s): " symbol)
-                                (format "Describe symbol (default %s): "
+                          "Describe symbol: ")
-                                      symbol)
+                        nil nil symbol))))
-                              "Describe symbol: ")
-                            nil nil symbol))
-     (list (or val symbol))))
  (if (equal symbol "") (error "No symbol"))
  (let* ((func `(lambda ()
-                  (comint-redirect-send-command (format "help(%S)\n" ,symbol)
+                  (comint-redirect-send-command (format "emacs.ehelp(%S)\n"
+                                                        ,symbol)
                                                "*Help*" nil))))
    ;; Ensure we have a suitable help buffer.
-    (let (temp-buffer-show-hook)        ; avoid xref stuff
+    ;; Fixme: Maybe process `Related help topics' a la help xrefs and
-      (with-output-to-temp-buffer "*Help*"
+    ;; allow C-c C-f in help buffer.
+    (let ((temp-buffer-show-hook        ; avoid xref stuff
+           (lambda ()
+             (toggle-read-only 1)
+             (setq view-return-to-alist
+                   (list (cons (selected-window) help-return-method))))))
+      (help-setup-xref (list 'python-describe-symbol symbol) (interactive-p))
+      (with-output-to-temp-buffer (help-buffer)
        (with-current-buffer standard-output
-          (set (make-local-variable 'comint-redirect-subvert-readonly) t))))
+          (set (make-local-variable 'comint-redirect-subvert-readonly) t)
+          (print-help-return-message))))
    (if (and python-buffer (get-buffer python-buffer))
        (with-current-buffer python-buffer
          (funcall func))
@@ -1302,6 +1357,15 @@ Interactively, prompt for symbol."
 (add-to-list 'debug-ignored-errors "^No symbol")
+(defun python-send-receive (string)
+  "Send STRING to inferior Python (if any) and return result.
+The result is what follows `_emacs_out' in the output (or nil)."
+  (let ((proc (python-proc)))
+    (python-send-string string)
+    (setq python-preoutput-result nil)
+    (accept-process-output proc 5)
+    python-preoutput-result))
 ;; Fixme: try to make it work with point in the arglist.  Also, is
 ;; there anything reasonable we can do with random methods?
 ;; (Currently only works with functions.)
@@ -1310,14 +1374,9 @@ Interactively, prompt for symbol."
 Only works when point is in a function name, not its arglist, for instance.
 Assumes an inferior Python is running."
  (let ((symbol (with-syntax-table python-dotty-syntax-table
-                  (current-word)))
+                  (current-word))))
-        (proc (and python-buffer (python-proc))))
+    (when symbol
-    (when (and proc symbol)
+      (python-send-receive (format "emacs.eargs(%S)" symbol)))))
-      (python-send-string
-       (format "_emacs_args(%S)" symbol))
-      (setq python-preoutput-result nil)
-      (accept-process-output proc 1)
-      python-preoutput-result)))
 ;;;; Info-look functionality.
@@ -1331,11 +1390,13 @@ Used with `eval-after-load'."
         ;; Whether info files have a Python version suffix, e.g. in Debian.
         (versioned
          (with-temp-buffer
-            (Info-mode)
+            (with-no-warnings (Info-mode))
            (condition-case ()
                ;; Don't use `info' because it would pop-up a *info* buffer.
-                (Info-goto-node (format "(python%s-lib)Miscellaneous Index"
+                (with-no-warnings
-                                        version))
+                 (Info-goto-node (format "(python%s-lib)Miscellaneous Index"
+                                         version))
+                 t)
              (error nil)))))
    (info-lookup-maybe-add-help
     :mode 'python-mode
@@ -1401,7 +1462,7 @@ The criterion is either a match for `jython-mode' via
                (while (re-search-forward
                        (rx (and line-start (or "import" "from") (1+ space)
                                 (group (1+ (not (any " \t\n."))))))
-                        10000        ; Probably not worth customizing.
+                        (+ (point-min) 10000) ; Probably not worth customizing.
                        t)
                  (if (member (match-string 1) python-jython-packages)
                      (throw 'done t))))
@@ -1519,11 +1580,97 @@ Uses `python-beginning-of-block', `python-end-of-block'."
  (python-end-of-block)
  (exchange-point-and-mark))
+;;;; Completion.
+(defun python-symbol-completions (symbol)
+  "Return a list of completions of the string SYMBOL from Python process.
+The list is sorted."
+  (when symbol
+    (let ((completions
+           (condition-case ()
+               (car (read-from-string (python-send-receive
+                                       (format "emacs.complete(%S)" symbol))))
+             (error nil))))
+      (sort
+       ;; We can get duplicates from the above -- don't know why.
+       (delete-dups completions)
+       #'string<))))
+(defun python-partial-symbol ()
+  "Return the partial symbol before point (for completion)."
+  (let ((end (point))
+        (start (save-excursion
+                 (and (re-search-backward
+                       (rx (and (or buffer-start (regexp "[^[:alnum:]._]"))
+                                (group (1+ (regexp "[[:alnum:]._]")))
+                                point))
+                       nil t)
+                      (match-beginning 1)))))
+    (if start (buffer-substring-no-properties start end))))
+;; Fixme: We should have an abstraction of this sort of thing in the
+;; core.
+(defun python-complete-symbol ()
+  "Perform completion on the Python symbol preceding point.
+Repeating the command scrolls the completion window."
+  (interactive)
+  (let ((window (get-buffer-window "*Completions*")))
+    (if (and (eq last-command this-command)
+             window (window-live-p window) (window-buffer window)
+             (buffer-name (window-buffer window)))
+        (with-current-buffer (window-buffer window)
+          (if (pos-visible-in-window-p (point-max) window)
+              (set-window-start window (point-min))
+            (save-selected-window
+              (select-window window)
+              (scroll-up))))
+      ;; Do completion.
+      (let* ((end (point))
+             (symbol (python-partial-symbol))
+             (completions (python-symbol-completions symbol))
+             (completion (if completions
+                             (try-completion symbol completions))))
+        (when symbol
+          (cond ((eq completion t))
+                ((null completion)
+                 (message "Can't find completion for \"%s\"" symbol)
+                 (ding))
+                ((not (string= symbol completion))
+                 (delete-region (- end (length symbol)) end)
+                 (insert completion))
+                (t
+                 (message "Making completion list...")
+                 (with-output-to-temp-buffer "*Completions*"
+                   (display-completion-list completions))
+                 (message "Making completion list...%s" "done"))))))))
+(eval-when-compile (require 'hippie-exp))
+(defun python-try-complete (old)
+  "Completion function for Python for use with `hippie-expand'."
+  (when (eq major-mode 'python-mode)    ; though we only add it locally
+    (unless old
+      (let ((symbol (python-partial-symbol)))
+        (he-init-string (- (point) (length symbol)) (point))
+        (if (not (he-string-member he-search-string he-tried-table))
+            (push he-search-string he-tried-table))
+        (setq he-expand-list
+              (and symbol (python-symbol-completions symbol)))))
+    (while (and he-expand-list
+                (he-string-member (car he-expand-list) he-tried-table))
+      (pop he-expand-list))
+    (if he-expand-list
+        (progn
+          (he-substitute-string (pop he-expand-list))
+          t)
+      (if old (he-reset-string))
+      nil)))
 ;;;; Modes.
 (defvar outline-heading-end-regexp)
 (defvar eldoc-print-current-symbol-info-function)
-(defvar python-mode-running)
 ;;;###autoload
 (define-derived-mode python-mode fundamental-mode "Python"
  "Major mode for editing Python files.
@@ -1565,11 +1712,10 @@ lines count as headers.
                                   ))
  (set (make-local-variable 'parse-sexp-lookup-properties) t)
  (set (make-local-variable 'comment-start) "# ")
-  ;; Fixme: define a comment-indent-function?
+  (set (make-local-variable 'comment-indent-function) #'python-comment-indent)
  (set (make-local-variable 'indent-line-function) #'python-indent-line)
  (set (make-local-variable 'paragraph-start) "\\s-*$")
-  (set (make-local-variable 'fill-paragraph-function)
+  (set (make-local-variable 'fill-paragraph-function) 'python-fill-paragraph)
-       'python-fill-paragraph)
  (set (make-local-variable 'require-final-newline) t)
  (set (make-local-variable 'add-log-current-defun-function)
       #'python-current-defun)
@@ -1587,6 +1733,9 @@ lines count as headers.
       #'python-eldoc-function)
  (add-hook 'eldoc-mode-hook
            '(lambda () (run-python 0 t)) nil t) ; need it running
+  (if (featurep 'hippie-exp)
+      (set (make-local-variable 'hippie-expand-try-functions-list)
+           (cons 'python-try-complete hippie-expand-try-functions-list)))
  (unless font-lock-mode (font-lock-mode 1))
  (when python-guess-indent (python-guess-indent))
  (set (make-local-variable 'python-command) python-python-command)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index df2bf6803da..adb5f7b402a 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -648,7 +648,7 @@ implemented as aliases.  See `sh-feature'."
    (rc "else")
-    (sh "do" "elif" "else" "if" "then" "trap" "type" "until" "while"))
+    (sh "!" "do" "elif" "else" "if" "then" "trap" "type" "until" "while"))
  "*List of keywords that may be immediately followed by a builtin or keyword.
 Given some confusion between keywords and builtins depending on shell and
 system, the distinction here has been based on whether they influence the
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 1a9251599ce..0e0d89b07e1 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -1,11 +1,12 @@
 ;;; sql.el --- specialized comint.el for SQL interpreters
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
+;; Copyright (C) 1998,99,2000,01,02,03,04  Free Software Foundation, Inc.
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Michael Mauger <mmaug@yahoo.com>
-;; Version: 1.8.0
+;; Version: 2.0.1
 ;; Keywords: comm languages processes
+;; URL: http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/progmodes/sql.el
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SqlMode
 ;; This file is part of GNU Emacs.
@@ -101,7 +102,7 @@
 ;;     (const :tag "XyzDB" xyz)
-;; 2) Add an entry to the `sql-product-support' list.
+;; 2) Add an entry to the `sql-product-alist' list.
 ;;     (xyz
 ;;      :font-lock sql-mode-xyz-font-lock-keywords
@@ -136,7 +137,7 @@
 ;;    using ANSI keywords.  See sql-mode-oracle-font-lock-keywords for
 ;;    a more complex example.
-;;     (defvar sql-mode-xyz-font-lock-keywords sql-mode-ansi-font-lock-keywords
+;;     (defvar sql-mode-xyz-font-lock-keywords nil
 ;;       "XyzDB SQL keywords used by font-lock.")
 ;; 6) Add a product highlighting function.
@@ -192,13 +193,18 @@
 ;;; Thanks to all the people who helped me out:
+;; Alex Schroeder <alex@gnu.org>
 ;; Kai Blauberg <kai.blauberg@metla.fi>
 ;; <ibalaban@dalet.com>
 ;; Yair Friedman <yfriedma@JohnBryce.Co.Il>
 ;; Gregor Zych <zych@pool.informatik.rwth-aachen.de>
 ;; nino <nino@inform.dk>
 ;; Berend de Boer <berend@pobox.com>
-;; Michael Mauger <mmaug@yahoo.com>
+;; Adam Jenkins <adam@thejenkins.org>
+;; Michael Mauger <mmaug@yahoo.com> -- improved product support
+;; Drew Adams <drew.adams@oracle.com> -- Emacs 20 support
+;; Harald Maier <maierh@myself.com> -- sql-send-string
+;; Stefan Monnier <monnier@iro.umontreal.ca> -- font-lock corrections
@@ -209,6 +215,8 @@
 (eval-when-compile
  (require 'regexp-opt))
 (require 'custom)
+(eval-when-compile ;; needed in Emacs 19, 20
+  (setq max-specpdl-size 2000))
 ;;; Allow customization
@@ -264,7 +272,7 @@ highlighted properly when you open them."
 (defvar sql-interactive-product nil
  "Product under `sql-interactive-mode'.")
-(defvar sql-product-support
+(defvar sql-product-alist
  '((ansi
     :font-lock sql-mode-ansi-font-lock-keywords)
    (db2
@@ -319,9 +327,9 @@ highlighted properly when you open them."
     :syntax-alist ((?$ . "w") (?# . "w")))
    (postgres
     :font-lock sql-mode-postgres-font-lock-keywords
-     :sqli-login (database server)
+     :sqli-login (user database server)
     :sqli-connect sql-connect-postgres
-     :sqli-prompt-regexp "^.*> *"
+     :sqli-prompt-regexp "^.*[#>] *"
     :sqli-prompt-length 5)
    (solid
     :font-lock sql-mode-solid-font-lock-keywords
@@ -372,10 +380,12 @@ following:
                        database.  Do product specific
                        configuration of comint in this function.
- :sqli-prompt-regexp    a regular expression string that matches the
+ :sqli-prompt-regexp    a regular expression string that matches
-                        prompt issued by the product interpreter.
+                        the prompt issued by the product
+                        interpreter.  (Not needed in 21.3+)
- :sqli-prompt-length    the length of the prompt on the line.
+ :sqli-prompt-length    the length of the prompt on the line.(Not
+                        needed in 21.3+)
 :syntax-alist          an alist of syntax table entries to enable
                        special character treatment by font-lock and
@@ -412,14 +422,14 @@ buffer is shown using `display-buffer'."
 (defvar sql-imenu-generic-expression
  ;; Items are in reverse order because they are rendered in reverse.
-  '(("Rules/Defaults" "^\\s-*create\\s-+\\(rule\\|default\\)\\s-+\\(\\w+\\)" 2)
+  '(("Rules/Defaults" "^\\s-*create\\s-+\\(\\w+\\s-+\\)*\\(rule\\|default\\)\\s-+\\(\\w+\\)" 3)
-    ("Sequences" "^\\s-*create\\s-+sequence\\s-+\\(\\w+\\)" 1)
+    ("Sequences" "^\\s-*create\\s-+\\(\\w+\\s-+\\)*sequence\\s-+\\(\\w+\\)" 2)
-    ("Triggers" "^\\s-*\\(create\\s-+\\(or\\s-+replace\\s-+\\)?\\)?trigger\\s-+\\(\\w+\\)" 3)
+    ("Triggers" "^\\s-*create\\s-+\\(\\w+\\s-+\\)*trigger\\s-+\\(\\w+\\)" 2)
-    ("Functions" "^\\s-*\\(create\\s-+\\(or\\s-+replace\\s-+\\)?\\)?function\\s-+\\(\\w+\\)" 3)
+    ("Functions" "^\\s-*\\(create\\s-+\\(\\w+\\s-+\\)*\\)?function\\s-+\\(\\w+\\)" 3)
-    ("Procedures" "^\\s-*\\(create\\s-+\\(or\\s-+replace\\s-+\\)?\\)?proc\\(edure\\)?\\s-+\\(\\w+\\)" 4)
+    ("Procedures" "^\\s-*\\(create\\s-+\\(\\w+\\s-+\\)*\\)?proc\\(edure\\)?\\s-+\\(\\w+\\)" 4)
-    ("Packages" "^\\s-*create\\s-+\\(or\\s-+replace\\s-+\\)?package\\s-+\\(body\\s-+\\)?\\(\\w+\\)" 3)
+    ("Packages" "^\\s-*create\\s-+\\(\\w+\\s-+\\)*package\\s-+\\(body\\s-+\\)?\\(\\w+\\)" 3)
-    ("Indexes" "^\\s-*create\\s-+index\\s-+\\(\\w+\\)" 1)
+    ("Indexes" "^\\s-*create\\s-+\\(\\w+\\s-+\\)*index\\s-+\\(\\w+\\)" 2)
-    ("Tables/Views" "^\\s-*create\\s-+\\(\\(global\\s-+\\)?\\(temporary\\s-+\\)?table\\|view\\)\\s-+\\(\\w+\\)" 4))
+    ("Tables/Views" "^\\s-*create\\s-+\\(\\w+\\s-+\\)*\\(table\\|view\\)\\s-+\\(\\w+\\)" 3))
  "Define interesting points in the SQL buffer for `imenu'.
 This is used to set `imenu-generic-expression' when SQL mode is
@@ -745,6 +755,7 @@ Based on `comint-mode-map'.")
  (let ((map (make-sparse-keymap)))
    (define-key map (kbd "C-c C-c") 'sql-send-paragraph)
    (define-key map (kbd "C-c C-r") 'sql-send-region)
+    (define-key map (kbd "C-c C-s") 'sql-send-string)
    (define-key map (kbd "C-c C-b") 'sql-send-buffer)
    map)
  "Mode map used for `sql-mode'.")
@@ -764,6 +775,7 @@ Based on `comint-mode-map'.")
                                       (get-buffer-process sql-buffer))]
   ["Send Buffer" sql-send-buffer (and (buffer-live-p sql-buffer)
                                       (get-buffer-process sql-buffer))]
+   ["Send String" sql-send-string t]
   ["--" nil nil]
   ["Start SQLi session" sql-product-interactive (sql-product-feature :sqli-connect)]
   ["Show SQLi buffer" sql-show-sqli-buffer t]
@@ -792,7 +804,7 @@ Based on `comint-mode-map'.")
    ["Linter" sql-highlight-linter-keywords
     :style radio
     :selected (eq sql-product 'linter)]
-    ["Microsoft" sql-highlight-ms-keywords
+    ["MS SQLServer" sql-highlight-ms-keywords
     :style radio
     :selected (eq sql-product 'ms)]
    ["MySQL" sql-highlight-mysql-keywords
@@ -828,24 +840,24 @@ Based on `comint-mode-map'.")
 (defvar sql-mode-abbrev-table nil
  "Abbrev table used in `sql-mode' and `sql-interactive-mode'.")
-(if sql-mode-abbrev-table
+(unless sql-mode-abbrev-table
-    ()
+  (define-abbrev-table 'sql-mode-abbrev-table nil)
-  (let ((nargs (cdr (subr-arity (symbol-function 'define-abbrev))))
+  (mapcar
-        d-a)
    ;; In Emacs 21.3+, provide SYSTEM-FLAG to define-abbrev.
-    (setq d-a
+   '(lambda (abbrev)
-          (if (>= nargs 6)
+      (let ((name (car abbrev))
-              '(lambda (name expansion) (define-abbrev sql-mode-abbrev-table name expansion nil 0 t))
+            (expansion (cdr abbrev)))
-            '(lambda (name expansion) (define-abbrev sql-mode-abbrev-table name expansion))))
+        (condition-case nil
+            (define-abbrev sql-mode-abbrev-table name expansion nil 0 t)
-    (define-abbrev-table 'sql-mode-abbrev-table nil)
+          (error
-    (funcall d-a "ins" "insert")
+           (define-abbrev sql-mode-abbrev-table name expansion)))))
-    (funcall d-a "upd" "update")
+   '(("ins" "insert")
-    (funcall d-a "del" "delete")
+    ("upd" "update")
-    (funcall d-a "sel" "select")
+    ("del" "delete")
-    (funcall d-a "proc" "procedure")
+    ("sel" "select")
-    (funcall d-a "func" "function")
+    ("proc" "procedure")
-    (funcall d-a "cr" "create")))
+    ("func" "function")
+    ("cr" "create"))))
 ;; Syntax Table
@@ -855,9 +867,7 @@ Based on `comint-mode-map'.")
    (modify-syntax-entry ?/ ". 14" table)
    (modify-syntax-entry ?* ". 23" table)
    ;; double-dash starts comment
-    (if (string-match "XEmacs\\|Lucid" emacs-version)
+    (modify-syntax-entry ?- ". 12b" table)
-        (modify-syntax-entry ?- ". 56" table)
-      (modify-syntax-entry ?- ". 12b" table))
    ;; newline and formfeed end coments
    (modify-syntax-entry ?\n "> b" table)
    (modify-syntax-entry ?\f "> b" table)
@@ -871,55 +881,117 @@ Based on `comint-mode-map'.")
 ;; Font lock support
 (defvar sql-mode-font-lock-object-name
-  (list (concat "^\\s-*\\(create\\(\\s-+or\\s-+replace\\)?\\|drop\\|alter\\)?\\s-+"
+  (list (concat "^\\s-*\\(create\\|drop\\|alter\\)\\s-+" ;; lead off with CREATE, DROP or ALTER
-                "\\(\\(global\\s-+\\)?\\(temporary\\s-+\\)?table\\|view\\|package\\(\\s-+body\\)?\\|"
+                "\\(\\w+\\s-+\\)*"  ;; optional intervening keywords
-                "proc\\(edure\\)?\\|function\\|trigger\\|sequence\\|rule\\|default\\)\\s-+\\(\\w+\\)")
+                "\\(table\\|view\\|package\\(\\s-+body\\)?\\|proc\\(edure\\)?"
-        8 'font-lock-function-name-face)
+                "\\|function\\|trigger\\|sequence\\|rule\\|default\\)\\s-+"
+                "\\(\\w+\\)")
-  "Pattern to match the names of top-level objects in a CREATE,
+        6 'font-lock-function-name-face)
-DROP or ALTER statement.
+  "Pattern to match the names of top-level objects.
-The format of variable should be a valid `font-lock-keywords'
-entry.")
+The pattern matches the name in a CREATE, DROP or ALTER
+statement.  The format of variable should be a valid
+`font-lock-keywords' entry.")
+(defmacro sql-keywords-re (&rest keywords)
+  "Compile-time generation of regexp matching any one of KEYWORDS."
+  `(eval-when-compile
+     (concat "\\b"
+             (regexp-opt ',keywords t)
+             "\\b")))
 (defvar sql-mode-ansi-font-lock-keywords
-  (let ((ansi-keywords (eval-when-compile
+  (let ((ansi-funcs (sql-keywords-re
-                         (concat "\\b"
+"abs" "avg" "bit_length" "cardinality" "cast" "char_length"
-                                 (regexp-opt '(
+"character_length" "coalesce" "convert" "count" "current_date"
+"current_path" "current_role" "current_time" "current_timestamp"
-"authorization" "avg" "begin" "close" "cobol" "commit"
+"current_user" "extract" "localtime" "localtimestamp" "lower" "max"
-"continue" "count" "declare" "double" "end" "escape"
+"min" "mod" "nullif" "octet_length" "overlay" "placing" "session_user"
-"exec" "fetch" "foreign" "fortran" "found" "go" "goto" "indicator"
+"substring" "sum" "system_user" "translate" "treat" "trim" "upper"
-"key" "language" "max" "min" "module" "numeric" "open" "pascal" "pli"
+"user"
-"precision" "primary" "procedure" "references" "rollback"
+))
-"schema" "section" "some" "sqlcode" "sqlerror" "sum" "work"
+        (ansi-non-reserved (sql-keywords-re
-) t) "\\b")))
+"ada" "asensitive" "assignment" "asymmetric" "atomic" "between"
-        (ansi-reserved-words (eval-when-compile
+"bitvar" "called" "catalog_name" "chain" "character_set_catalog"
-                               (concat "\\b"
+"character_set_name" "character_set_schema" "checked" "class_origin"
-                                       (regexp-opt '(
+"cobol" "collation_catalog" "collation_name" "collation_schema"
+"column_name" "command_function" "command_function_code" "committed"
-"all" "and" "any" "as" "asc" "between" "by" "check" "create"
+"condition_number" "connection_name" "constraint_catalog"
-"current" "default" "delete" "desc" "distinct" "exists" "float" "for"
+"constraint_name" "constraint_schema" "contains" "cursor_name"
-"from" "grant" "group" "having" "in" "insert" "into" "is"
+"datetime_interval_code" "datetime_interval_precision" "defined"
-"like" "not" "null" "of" "on" "option" "or" "order" "privileges"
+"definer" "dispatch" "dynamic_function" "dynamic_function_code"
-"public" "select" "set" "table" "to" "union" "unique"
+"existing" "exists" "final" "fortran" "generated" "granted"
-"update" "user" "values" "view" "where" "with"
+"hierarchy" "hold" "implementation" "infix" "insensitive" "instance"
+"instantiable" "invoker" "key_member" "key_type" "length" "m"
-) t) "\\b")))
+"message_length" "message_octet_length" "message_text" "method" "more"
-        (ansi-types (eval-when-compile
+"mumps" "name" "nullable" "number" "options" "overlaps" "overriding"
-                      (concat "\\b"
+"parameter_mode" "parameter_name" "parameter_ordinal_position"
-                              (regexp-opt '(
+"parameter_specific_catalog" "parameter_specific_name"
+"parameter_specific_schema" "pascal" "pli" "position" "repeatable"
-;; ANSI Keywords that look like types
+"returned_length" "returned_octet_length" "returned_sqlstate"
-"character" "cursor" "dec" "int" "real"
+"routine_catalog" "routine_name" "routine_schema" "row_count" "scale"
-;; ANSI Reserved Word that look like types
+"schema_name" "security" "self" "sensitive" "serializable"
-"char" "integer" "smallint"
+"server_name" "similar" "simple" "source" "specific_name" "style"
+"subclass_origin" "sublist" "symmetric" "system" "table_name"
-) t) "\\b"))))
+"transaction_active" "transactions_committed"
-    (list (cons ansi-keywords 'font-lock-keyword-face)
+"transactions_rolled_back" "transform" "transforms" "trigger_catalog"
-                (cons ansi-reserved-words 'font-lock-keyword-face)
+"trigger_name" "trigger_schema" "type" "uncommitted" "unnamed"
-          (cons ansi-types 'font-lock-type-face)))
+"user_defined_type_catalog" "user_defined_type_name"
+"user_defined_type_schema"
+))
+        (ansi-reserved (sql-keywords-re
+"absolute" "action" "add" "admin" "after" "aggregate" "alias" "all"
+"allocate" "alter" "and" "any" "are" "as" "asc" "assertion" "at"
+"authorization" "before" "begin" "both" "breadth" "by" "call"
+"cascade" "cascaded" "case" "catalog" "check" "class" "close"
+"collate" "collation" "column" "commit" "completion" "connect"
+"connection" "constraint" "constraints" "constructor" "continue"
+"corresponding" "create" "cross" "cube" "current" "cursor" "cycle"
+"data" "day" "deallocate" "declare" "default" "deferrable" "deferred"
+"delete" "depth" "deref" "desc" "describe" "descriptor" "destroy"
+"destructor" "deterministic" "diagnostics" "dictionary" "disconnect"
+"distinct" "domain" "drop" "dynamic" "each" "else" "end" "equals"
+"escape" "every" "except" "exception" "exec" "execute" "external"
+"false" "fetch" "first" "for" "foreign" "found" "free" "from" "full"
+"function" "general" "get" "global" "go" "goto" "grant" "group"
+"grouping" "having" "host" "hour" "identity" "ignore" "immediate" "in"
+"indicator" "initialize" "initially" "inner" "inout" "input" "insert"
+"intersect" "into" "is" "isolation" "iterate" "join" "key" "language"
+"last" "lateral" "leading" "left" "less" "level" "like" "limit"
+"local" "locator" "map" "match" "minute" "modifies" "modify" "module"
+"month" "names" "natural" "new" "next" "no" "none" "not" "null" "of"
+"off" "old" "on" "only" "open" "operation" "option" "or" "order"
+"ordinality" "out" "outer" "output" "pad" "parameter" "parameters"
+"partial" "path" "postfix" "prefix" "preorder" "prepare" "preserve"
+"primary" "prior" "privileges" "procedure" "public" "read" "reads"
+"recursive" "references" "referencing" "relative" "restrict" "result"
+"return" "returns" "revoke" "right" "role" "rollback" "rollup"
+"routine" "rows" "savepoint" "schema" "scroll" "search" "second"
+"section" "select" "sequence" "session" "set" "sets" "size" "some"
+"space" "specific" "specifictype" "sql" "sqlexception" "sqlstate"
+"sqlwarning" "start" "state" "statement" "static" "structure" "table"
+"temporary" "terminate" "than" "then" "timezone_hour"
+"timezone_minute" "to" "trailing" "transaction" "translation"
+"trigger" "true" "under" "union" "unique" "unknown" "unnest" "update"
+"usage" "using" "value" "values" "variable" "view" "when" "whenever"
+"where" "with" "without" "work" "write" "year"
+))
+        (ansi-types (sql-keywords-re
+"array" "binary" "bit" "blob" "boolean" "char" "character" "clob"
+"date" "dec" "decimal" "double" "float" "int" "integer" "interval"
+"large" "national" "nchar" "nclob" "numeric" "object" "precision"
+"real" "ref" "row" "scope" "smallint" "time" "timestamp" "varchar"
+"varying" "zone"
+)))
+    `((,ansi-non-reserved . font-lock-keyword-face)
+      (,ansi-reserved     . font-lock-keyword-face)
+      (,ansi-funcs        . font-lock-builtin-face)
+      (,ansi-types        . font-lock-type-face)))
  "ANSI SQL keywords used by font-lock.
@@ -930,66 +1002,156 @@ you define your own sql-mode-ansi-font-lock-keywords.  You may want to
 add functions and PL/SQL keywords.")
 (defvar sql-mode-oracle-font-lock-keywords
-  (let ((oracle-keywords (eval-when-compile
+  (let ((oracle-functions (sql-keywords-re
-                           (concat "\\b"
+"abs" "acos" "add_months" "ascii" "asciistr" "asin" "atan" "atan2"
-                                   (regexp-opt '(
+"avg" "bfilename" "bin_to_num" "bitand" "cast" "ceil" "chartorowid"
-;; Oracle (+ANSI) SQL keywords
+"chr" "coalesce" "compose" "concat" "convert" "corr" "cos" "cosh"
+"count" "covar_pop" "covar_samp" "cume_dist" "current_date"
-; ANSI keywords
+"current_timestamp" "current_user" "dbtimezone" "decode" "decompose"
-"authorization" "avg" "begin" "close" "cobol" "commit"
+"dense_rank" "depth" "deref" "dump" "empty_clob" "existsnode" "exp"
-"continue" "count" "declare" "double" "end" "escape"
+"extract" "extractvalue" "first" "first_value" "floor" "following"
-"exec" "fetch" "foreign" "fortran" "found" "go" "goto" "indicator"
+"from_tz" "greatest" "group_id" "grouping_id" "hextoraw" "initcap"
-"key" "language" "max" "min" "module" "numeric" "open" "pascal" "pli"
+"instr" "lag" "last" "last_day" "last_value" "lead" "least" "length"
-"precision" "primary" "procedure" "references" "rollback"
+"ln" "localtimestamp" "lower" "lpad" "ltrim" "make_ref" "max" "min"
-"schema" "section" "some" "sqlcode" "sqlerror" "sum" "work"
+"mod" "months_between" "new_time" "next_day" "nls_charset_decl_len"
+"nls_charset_id" "nls_charset_name" "nls_initcap" "nls_lower"
-; ANSI reserved words
+"nls_upper" "nlssort" "ntile" "nullif" "numtodsinterval"
-"all" "and" "any" "as" "asc" "between" "by" "check" "create"
+"numtoyminterval" "nvl" "nvl2" "over" "path" "percent_rank"
-"current" "default" "delete" "desc" "distinct" "exists" "float" "for"
+"percentile_cont" "percentile_disc" "power" "preceding" "rank"
-"from" "grant" "group" "having" "in" "insert" "into" "is"
+"ratio_to_report" "rawtohex" "rawtonhex" "reftohex" "regr_"
-"like" "not" "null" "of" "on" "option" "or" "order" "privileges"
+"regr_avgx" "regr_avgy" "regr_count" "regr_intercept" "regr_r2"
-"public" "select" "set" "table" "to" "union" "unique"
+"regr_slope" "regr_sxx" "regr_sxy" "regr_syy" "replace" "round"
-"update" "user" "values" "view" "where" "with"
+"row_number" "rowidtochar" "rowidtonchar" "rpad" "rtrim"
+"sessiontimezone" "sign" "sin" "sinh" "soundex" "sqrt" "stddev"
-"access" "add" "admin" "after" "allocate" "alter" "analyze" "archive"
+"stddev_pop" "stddev_samp" "substr" "sum" "sys_connect_by_path"
-"archivelog" "audit" "authid" "backup" "become" "before" "block"
+"sys_context" "sys_dburigen" "sys_extract_utc" "sys_guid" "sys_typeid"
-"body" "cache" "cancel" "cascade" "change" "checkpoint" "cluster"
+"sys_xmlagg" "sys_xmlgen" "sysdate" "systimestamp" "tan" "tanh"
-"comment" "compile" "compress" "compute" "connect" "constraint"
+"to_char" "to_clob" "to_date" "to_dsinterval" "to_lob" "to_multi_byte"
-"constraints" "contents" "controlfile" "cross" "currval" "cycle"
+"to_nchar" "to_nclob" "to_number" "to_single_byte" "to_timestamp"
-"database" "datafile" "dba" "deterministic" "disable" "dismount"
+"to_timestamp_tz" "to_yminterval" "translate" "treat" "trim" "trunc"
-"drop" "dump" "each" "else" "else" "elsif" "enable" "events" "except"
+"tz_offset" "uid" "unbounded" "unistr" "updatexml" "upper" "user"
-"exceptions" "exclusive" "execute" "exit" "explain" "extent"
+"userenv" "var_pop" "var_samp" "variance" "vsize" "width_bucket" "xml"
-"externally" "false" "file" "flush" "force" "freelist" "freelists"
+"xmlagg" "xmlattribute" "xmlcolattval" "xmlconcat" "xmlelement"
-"full" "function" "global" "grant" "groups" "identified" "if"
+"xmlforest" "xmlsequence" "xmltransform"
-"immediate" "including" "increment" "index" "initial" "initrans"
+))
-"inner" "instance" "intersect" "join" "layer" "left" "level" "link"
-"lists" "lock" "logfile" "long" "loop" "manage" "manual"
+        (oracle-keywords (sql-keywords-re
-"maxdatafiles" "maxextents" "maxinistances" "maxlogfiles"
+"abort" "access" "accessed" "account" "activate" "add" "admin"
-"maxloghistory" "maxlogmembers" "maxtrans" "maxvalue" "merge"
+"advise" "after" "agent" "aggregate" "all" "allocate" "allow" "alter"
-"minextents" "minus" "minvalue" "mode" "modify" "mount" "natural"
+"always" "analyze" "ancillary" "and" "any" "apply" "archive"
-"new" "next" "nextval" "noarchivelog" "noaudit" "nocache" "nocompress"
+"archivelog" "array" "as" "asc" "associate" "at" "attribute"
-"nocycle" "nomaxvalue" "nominvalue" "none" "noorder" "noresetlogs"
+"attributes" "audit" "authenticated" "authid" "authorization" "auto"
-"normal" "nosort" "nowait" "off" "offline" "old" "online" "only"
+"autoallocate" "automatic" "availability" "backup" "before" "begin"
-"optimal" "others" "out" "outer" "over" "own" "package" "parallel"
+"behalf" "between" "binding" "bitmap" "block" "blocksize" "body"
-"parallel_enable" "pctfree" "pctincrease" "pctused" "plan" "pragma"
+"both" "buffer_pool" "build" "by"  "cache" "call" "cancel"
-"preserve" "prior" "private" "profile" "quota" "raise" "raw" "read"
+"cascade" "case" "category" "certificate" "chained" "change" "check"
-"recover" "referencing" "rename" "replace" "resetlogs" "resource"
+"checkpoint" "child" "chunk" "class" "clear" "clone" "close" "cluster"
-"restrict_references" "restricted" "return" "returning" "reuse"
+"column" "column_value" "columns" "comment" "commit" "committed"
-"revoke" "right" "rnds" "rnps" "role" "roles" "row" "rowlabel"
+"compatibility" "compile" "complete" "composite_limit" "compress"
-"rownum" "rows" "savepoint" "scn" "segment" "sequence" "session"
+"compute" "connect" "connect_time" "consider" "consistent"
-"share" "shared" "size" "snapshot" "sort" "statement_id" "statistics"
+"constraint" "constraints" "constructor" "contents" "context"
-"stop" "storage" "subtype" "successful" "switch" "synonym" "sysdate"
+"continue" "controlfile" "corruption" "cost" "cpu_per_call"
-"system" "tables" "tablespace" "temporary" "then" "thread" "tracing"
+"cpu_per_session" "create" "cross" "cube" "current" "currval" "cycle"
-"transaction" "trigger" "triggers" "true" "truncate" "type" "uid"
+"dangling" "data" "database" "datafile" "datafiles" "day" "ddl"
-"under" "unlimited" "until" "use" "using" "validate" "when" "while"
+"deallocate" "debug" "default" "deferrable" "deferred" "definer"
-"wnds" "wnps" "write"
+"delay" "delete" "demand" "desc" "determines" "deterministic"
+"dictionary" "dimension" "directory" "disable" "disassociate"
-) t) "\\b")))
+"disconnect" "distinct" "distinguished" "distributed" "dml" "drop"
-        (oracle-warning-words (eval-when-compile
+"each" "element" "else" "enable" "end" "equals_path" "escape"
-                                 (concat "\\b"
+"estimate" "except" "exceptions" "exchange" "excluding" "exists"
-                                         (regexp-opt '(
+"expire" "explain" "extent" "external" "externally"
-;; PLSQL defined exceptions
+"failed_login_attempts" "fast" "file" "final" "finish" "flush" "for"
+"force" "foreign" "freelist" "freelists" "freepools" "fresh" "from"
+"full" "function" "functions" "generated" "global" "global_name"
+"globally" "grant" "group" "grouping" "groups" "guard" "hash"
+"hashkeys" "having" "heap" "hierarchy" "id" "identified" "identifier"
+"idle_time" "immediate" "in" "including" "increment" "index" "indexed"
+"indexes" "indextype" "indextypes" "indicator" "initial" "initialized"
+"initially" "initrans" "inner" "insert" "instance" "instantiable"
+"instead" "intersect" "into" "invalidate" "is" "isolation" "java"
+"join"  "keep" "key" "kill" "language" "left" "less" "level"
+"levels" "library" "like" "like2" "like4" "likec" "limit" "link"
+"list" "lob" "local" "location" "locator" "lock" "log" "logfile"
+"logging" "logical" "logical_reads_per_call"
+"logical_reads_per_session"  "managed" "management" "manual" "map"
+"mapping" "master" "matched" "materialized" "maxdatafiles"
+"maxextents" "maximize" "maxinstances" "maxlogfiles" "maxloghistory"
+"maxlogmembers" "maxsize" "maxtrans" "maxvalue" "member" "memory"
+"merge" "migrate" "minextents" "minimize" "minimum" "minus" "minvalue"
+"mode" "modify" "monitoring" "month" "mount" "move" "movement" "name"
+"named" "natural" "nested" "never" "new" "next" "nextval" "no"
+"noarchivelog" "noaudit" "nocache" "nocompress" "nocopy" "nocycle"
+"nodelay" "noforce" "nologging" "nomapping" "nomaxvalue" "nominimize"
+"nominvalue" "nomonitoring" "none" "noorder" "noparallel" "norely"
+"noresetlogs" "noreverse" "normal" "norowdependencies" "nosort"
+"noswitch" "not" "nothing" "notimeout" "novalidate" "nowait" "null"
+"nulls" "object" "of" "off" "offline" "oidindex" "old" "on" "online"
+"only" "open" "operator" "optimal" "option" "or" "order"
+"organization" "out" "outer" "outline" "overflow" "overriding"
+"package" "packages" "parallel" "parallel_enable" "parameters"
+"parent" "partition" "partitions" "password" "password_grace_time"
+"password_life_time" "password_lock_time" "password_reuse_max"
+"password_reuse_time" "password_verify_function" "pctfree"
+"pctincrease" "pctthreshold" "pctused" "pctversion" "percent"
+"performance" "permanent" "pfile" "physical" "pipelined" "plan"
+"post_transaction" "pragma" "prebuilt" "preserve" "primary" "private"
+"private_sga" "privileges" "procedure" "profile" "protection" "public"
+"purge" "query" "quiesce" "quota" "range" "read" "reads" "rebuild"
+"records_per_block" "recover" "recovery" "recycle" "reduced" "ref"
+"references" "referencing" "refresh" "register" "reject" "relational"
+"rely" "rename" "reset" "resetlogs" "resize" "resolve" "resolver"
+"resource" "restrict" "restrict_references" "restricted" "result"
+"resumable" "resume" "retention" "return" "returning" "reuse"
+"reverse" "revoke" "rewrite" "right" "rnds" "rnps" "role" "roles"
+"rollback" "rollup" "row" "rowdependencies" "rownum" "rows" "sample"
+"savepoint" "scan" "schema" "scn" "scope" "segment" "select"
+"selectivity" "self" "sequence" "serializable" "session"
+"sessions_per_user" "set" "sets" "settings" "shared" "shared_pool"
+"shrink" "shutdown" "siblings" "sid" "single" "size" "skip" "some"
+"sort" "source" "space" "specification" "spfile" "split" "standby"
+"start" "statement_id" "static" "statistics" "stop" "storage" "store"
+"structure" "subpartition" "subpartitions" "substitutable"
+"successful" "supplemental" "suspend" "switch" "switchover" "synonym"
+"sys" "system" "table" "tables" "tablespace" "tempfile" "template"
+"temporary" "test" "than" "then" "thread" "through" "time_zone"
+"timeout" "to" "trace" "transaction" "trigger" "triggers" "truncate"
+"trust" "type" "types" "unarchived" "under" "under_path" "undo"
+"uniform" "union" "unique" "unlimited" "unlock" "unquiesce"
+"unrecoverable" "until" "unusable" "unused" "update" "upgrade" "usage"
+"use" "using" "validate" "validation" "value" "values" "variable"
+"varray" "version" "view" "wait" "when" "whenever" "where" "with"
+"without" "wnds" "wnps" "work" "write" "xmldata" "xmlschema" "xmltype"
+))
+        (oracle-types (sql-keywords-re
+"bfile" "blob" "byte" "char" "character" "clob" "date" "dec" "decimal"
+"double" "float" "int" "integer" "interval" "long" "national" "nchar"
+"nclob" "number" "numeric" "nvarchar2" "precision" "raw" "real"
+"rowid" "second" "smallint" "time" "timestamp" "urowid" "varchar"
+"varchar2" "varying" "year" "zone"
+))
+        (plsql-functions (sql-keywords-re
+"%bulk_rowcount" "%found" "%isopen" "%notfound" "%rowcount" "%rowtype"
+"%type" "extend" "prior"
+))
+        (plsql-keywords (sql-keywords-re
+"autonomous_transaction" "bulk" "char_base" "collect" "constant"
+"cursor" "declare" "do" "elsif" "exception_init" "execute" "exit"
+"extends" "false" "fetch" "forall" "goto" "hour" "if" "interface"
+"loop" "minute" "number_base" "ocirowid" "opaque" "others" "rowtype"
+"separate" "serially_reusable" "sql" "sqlcode" "sqlerrm" "subtype"
+"the" "timezone_abbr" "timezone_hour" "timezone_minute"
+"timezone_region" "true" "varrying" "while"
+))
+        (plsql-type (sql-keywords-re
+"binary_integer" "boolean" "naturaln" "pls_integer" "positive"
+"positiven" "record" "signtype" "string"
+))
+        (plsql-warning (sql-keywords-re
 "access_into_null" "case_not_found" "collection_is_null"
 "cursor_already_open" "dup_val_on_index" "invalid_cursor"
 "invalid_number" "login_denied" "no_data_found" "not_logged_on"
@@ -997,15 +1159,11 @@ add functions and PL/SQL keywords.")
 "subscript_beyond_count" "subscript_outside_limit" "sys_invalid_rowid"
 "timeout_on_resource" "too_many_rows" "value_error" "zero_divide"
 "exception" "notfound"
+))
-) t) "\\b")))
+        (sqlplus-commands
+         (eval-when-compile (concat "^\\(\\("
-        (oracle-sqlplus-commands
+                                    (regexp-opt '(
-         (eval-when-compile
-           (concat "^\\(\\("
-                                         (regexp-opt '(
-;; SQL*Plus commands
 "@" "@@" "accept" "append" "archive" "attribute" "break"
 "btitle" "change" "clear" "column" "connect" "copy" "define"
 "del" "describe" "disconnect" "edit" "execute" "exit" "get" "help"
@@ -1040,73 +1198,16 @@ add functions and PL/SQL keywords.")
   "timi\\(ng\\)?\\|trim\\(out\\)?\\|trims\\(pool\\)?\\|"
   "und\\(erline\\)?\\|ver\\(ify\\)?\\|wra\\(p\\)?\\)\\)\\)"
   "\\b.*$"
-   )))
+   ))))
-        (oracle-types
+    `((,sqlplus-commands . font-lock-doc-face)
-         (eval-when-compile
+      (,oracle-functions . font-lock-builtin-face)
-                        (concat "\\b"
+      (,oracle-keywords  . font-lock-keyword-face)
-                                (regexp-opt '(
+      (,oracle-types     . font-lock-type-face)
-;; Oracle Keywords that look like types
+      (,plsql-functions  . font-lock-builtin-face)
-;; Oracle Reserved Words that look like types
+      (,plsql-keywords   . font-lock-keyword-face)
+      (,plsql-type       . font-lock-type-face)
-"bfile" "binary_integer" "blob" "boolean" "byte" "char" "character"
+      (,plsql-warning    . font-lock-warning-face)))
-"clob" "date" "day" "dec" "decimal" "double" "float" "int" "integer"
-"interval" "local" "long" "month" "natural" "naturaln" "nchar" "nclob"
-"number" "numeric" "nvarchar2" "pls_integer" "positive" "positiven"
-"precision" "raw" "real" "rowid" "second" "signtype" "smallint"
-"string" "time" "timestamp" "urowid" "varchar" "varchar2" "year"
-"zone"
-) t) "\\b")))
-        (oracle-builtin-functions (eval-when-compile
-                        (concat "\\b"
-                                (regexp-opt '(
-;; Misc Oracle builtin functions
-"abs" "acos" "add_months" "ascii" "asciistr" "asin" "atan" "atan2"
-"avg" "bfilename" "bin_to_num" "bitand" "case" "cast" "ceil"
-"chartorowid" "chr" "coalesce" "compose" "concat" "convert" "corr"
-"cos" "cosh" "count" "covar_pop" "covar_samp" "cume_dist"
-"current_date" "current_timestamp" "current_user" "dbtimezone"
-"decode" "decompose" "dense_rank" "depth" "deref" "dump" "empty_blob"
-"empty_clob" "existsnode" "exp" "extract" "extractvalue" "first"
-"first_value" "floor" "from_tz" "greatest" "group_id" "grouping"
-"grouping_id" "hextoraw" "initcap" "instr" "lag" "last" "last_day"
-"last_value" "lead" "least" "length" "ln" "localtimestamp" "log"
-"lower" "lpad" "ltrim" "make_ref" "max" "min" "mod" "months_between"
-"nchr" "new_time" "next_day" "nls_charset_decl_len" "nls_charset_id"
-"nls_charset_name" "nls_initcap" "nls_lower" "nlssort" "nls_upper"
-"ntile" "nullif" "numtodsinterval" "numtoyminterval" "nvl" "nvl2"
-"path" "percent_rank" "percentile_cont" "percentile_disc" "power"
-"rank" "ratio_to_report" "rawtohex" "rawtonhex" "ref" "reftohex"
-"regr_slope" "regr_intercept" "regr_count" "regr_r2" "regr_avgx"
-"regr_avgy" "regr_sxx" "regr_syy" "regr_sxy" "round"
-"row_number" "rowidtochar" "rowidtonchar" "rpad" "rtrim"
-"sessiontimezone" "sign" "sin" "sinh" "soundex" "sqrt" "stddev"
-"stddev_pop" "stddev_samp" "substr" "sum" "sys_connect_by_path"
-"sys_context" "sys_dburigen" "sys_extract_utc" "sys_guid" "sys_typeid"
-"sys_xmlagg" "sys_xmlgen" "sysdate" "systimestamp" "tan" "tanh"
-"to_char" "to_clob" "to_date" "to_dsinterval" "to_lob" "to_multi_byte"
-"to_nchar" "to_nclob" "to_number" "to_single_byte" "to_timestamp"
-"to_timestamp_tz" "to_yminterval" "translate" "treat" "trim" "trunc"
-"tz_offset" "uid" "unistr" "updatexml" "upper" "user" "userenv"
-"value" "var_pop" "var_samp" "variance" "vsize" "width_bucket"
-"xmlagg" "xmlcolattval" "xmlconcat" "xmlelement" "xmlforest"
-"xmlsequence" "xmltransform"
-) t) "\\b"))))
-    (list (cons oracle-sqlplus-commands 'font-lock-doc-face)
-          (cons oracle-keywords 'font-lock-keyword-face)
-                        (cons oracle-warning-words 'font-lock-warning-face)
-                        ;; XEmacs doesn't have font-lock-builtin-face
-                        (if (string-match "XEmacs\\|Lucid" emacs-version)
-                            (cons oracle-builtin-functions 'font-lock-preprocessor-face)
-                          ;; GNU Emacs 19 doesn't have it either
-                          (if (string-match "GNU Emacs 19" emacs-version)
-                (cons oracle-builtin-functions 'font-lock-keyword-face)
-                            ;; Emacs
-                            (cons oracle-builtin-functions 'font-lock-builtin-face)))
-          (cons oracle-types 'font-lock-type-face)))
  "Oracle SQL keywords used by font-lock.
@@ -1117,42 +1218,84 @@ you define your own sql-mode-oracle-font-lock-keywords.  You may want
 to add functions and PL/SQL keywords.")
 (defvar sql-mode-postgres-font-lock-keywords
-  (let ((postgres-reserved-words (eval-when-compile
+  (let ((pg-funcs (sql-keywords-re
-                                 (concat "\\b"
+"abbrev" "abs" "acos" "age" "area" "ascii" "asin" "atab2" "atan"
-                                         (regexp-opt '(
+"atan2" "avg" "bit_length" "both" "broadcast" "btrim" "cbrt" "ceil"
-"language"
+"center" "char_length" "chr" "coalesce" "col_description" "convert"
-) t) "\\b")))
+"cos" "cot" "count" "current_database" "current_date" "current_schema"
-        (postgres-types (eval-when-compile
+"current_schemas" "current_setting" "current_time" "current_timestamp"
-                          (concat "\\b"
+"current_user" "currval" "date_part" "date_trunc" "decode" "degrees"
-                                  (regexp-opt '(
+"diameter" "encode" "exp" "extract" "floor" "get_bit" "get_byte"
+"has_database_privilege" "has_function_privilege"
-"bool" "box" "circle" "char" "char2" "char4" "char8" "char16" "date"
+"has_language_privilege" "has_schema_privilege" "has_table_privilege"
-"float4" "float8" "int2" "int4" "int8" "line" "lseg" "money" "path"
+"height" "host" "initcap" "isclosed" "isfinite" "isopen" "leading"
-"point" "polygon" "serial" "text" "time" "timespan" "timestamp" "varchar"
+"length" "ln" "localtime" "localtimestamp" "log" "lower" "lpad"
+"ltrim" "masklen" "max" "min" "mod" "netmask" "network" "nextval"
-) t)"\\b")))
+"now" "npoints" "nullif" "obj_description" "octet_length" "overlay"
-        (postgres-builtin-functions (eval-when-compile
+"pclose" "pg_client_encoding" "pg_function_is_visible"
-                        (concat "\\b"
+"pg_get_constraintdef" "pg_get_indexdef" "pg_get_ruledef"
-                                (regexp-opt '(
+"pg_get_userbyid" "pg_get_viewdef" "pg_opclass_is_visible"
-;; Misc Postgres builtin functions
+"pg_operator_is_visible" "pg_table_is_visible" "pg_type_is_visible"
+"pi" "popen" "position" "pow" "quote_ident" "quote_literal" "radians"
-"abstime" "age" "area" "box" "center" "date_part" "date_trunc"
+"radius" "random" "repeat" "replace" "round" "rpad" "rtrim"
-"datetime" "dexp" "diameter" "dpow" "float" "float4" "height"
+"session_user" "set_bit" "set_byte" "set_config" "set_masklen"
-"initcap" "integer" "isclosed" "isfinite" "isoldpath" "isopen"
+"setval" "sign" "sin" "split_part" "sqrt" "stddev" "strpos" "substr"
-"length" "lower" "lpad" "ltrim" "pclose" "point" "points" "popen"
+"substring" "sum" "tan" "timeofday" "to_ascii" "to_char" "to_date"
-"position" "radius" "reltime" "revertpoly" "rpad" "rtrim" "substr"
+"to_hex" "to_number" "to_timestamp" "trailing" "translate" "trim"
-"substring" "text" "timespan" "translate" "trim" "upgradepath"
+"trunc" "upper" "variance" "version" "width"
-"upgradepoly" "upper" "varchar" "width"
+))
-) t) "\\b"))))
+        (pg-reserved (sql-keywords-re
-          (append sql-mode-ansi-font-lock-keywords
+"abort" "access" "add" "after" "aggregate" "alignment" "all" "alter"
-                  (list (cons postgres-reserved-words 'font-lock-keyword-face)
+"analyze" "and" "any" "as" "asc" "assignment" "authorization"
-                        ;; XEmacs doesn't have 'font-lock-builtin-face
+"backward" "basetype" "before" "begin" "between" "binary" "by" "cache"
-                        (if (string-match "XEmacs\\|Lucid" emacs-version)
+"called" "cascade" "case" "cast" "characteristics" "check"
-                            (cons postgres-builtin-functions 'font-lock-preprocessor-face)
+"checkpoint" "class" "close" "cluster" "column" "comment" "commit"
-                          ;; Emacs
+"committed" "commutator" "constraint" "constraints" "conversion"
-                          (cons postgres-builtin-functions 'font-lock-builtin-face))
+"copy" "create" "createdb" "createuser" "cursor" "cycle" "database"
-                  (cons postgres-types 'font-lock-type-face))))
+"deallocate" "declare" "default" "deferrable" "deferred" "definer"
+"delete" "delimiter" "desc" "distinct" "do" "domain" "drop" "each"
+"element" "else" "encoding" "encrypted" "end" "escape" "except"
+"exclusive" "execute" "exists" "explain" "extended" "external" "false"
+"fetch" "finalfunc" "for" "force" "foreign" "forward" "freeze" "from"
+"full" "function" "grant" "group" "gtcmp" "handler" "hashes" "having"
+"immediate" "immutable" "implicit" "in" "increment" "index" "inherits"
+"initcond" "initially" "input" "insensitive" "insert" "instead"
+"internallength" "intersect" "into" "invoker" "is" "isnull"
+"isolation" "join" "key" "language" "leftarg" "level" "like" "limit"
+"listen" "load" "local" "location" "lock" "ltcmp" "main" "match"
+"maxvalue" "merges" "minvalue" "mode" "move" "natural" "negator"
+"next" "nocreatedb" "nocreateuser" "none" "not" "nothing" "notify"
+"notnull" "null" "of" "offset" "oids" "on" "only" "operator" "or"
+"order" "output" "owner" "partial" "passedbyvalue" "password" "plain"
+"prepare" "primary" "prior" "privileges" "procedural" "procedure"
+"public" "read" "recheck" "references" "reindex" "relative" "rename"
+"reset" "restrict" "returns" "revoke" "rightarg" "rollback" "row"
+"rule" "schema" "scroll" "security" "select" "sequence" "serializable"
+"session" "set" "sfunc" "share" "show" "similar" "some" "sort1"
+"sort2" "stable" "start" "statement" "statistics" "storage" "strict"
+"stype" "sysid" "table" "temp" "template" "temporary" "then" "to"
+"transaction" "trigger" "true" "truncate" "trusted" "type"
+"unencrypted" "union" "unique" "unknown" "unlisten" "until" "update"
+"usage" "user" "using" "vacuum" "valid" "validator" "values"
+"variable" "verbose" "view" "volatile" "when" "where" "with" "without"
+"work"
+))
+        (pg-types (sql-keywords-re
+"anyarray" "bigint" "bigserial" "bit" "boolean" "box" "bytea" "char"
+"character" "cidr" "circle" "cstring" "date" "decimal" "double"
+"float4" "float8" "inet" "int2" "int4" "int8" "integer" "internal"
+"interval" "language_handler" "line" "lseg" "macaddr" "money"
+"numeric" "oid" "opaque" "path" "point" "polygon" "precision" "real"
+"record" "regclass" "regoper" "regoperator" "regproc" "regprocedure"
+"regtype" "serial" "serial4" "serial8" "smallint" "text" "time"
+"timestamp" "varchar" "varying" "void" "zone"
+)))
+  `((,pg-funcs    . font-lock-builtin-face)
+    (,pg-reserved . font-lock-keyword-face)
+    (,pg-types    . font-lock-type-face)))
  "Postgres SQL keywords used by font-lock.
@@ -1162,10 +1305,7 @@ function `regexp-opt'.  Therefore, take a look at the source before
 you define your own sql-mode-postgres-font-lock-keywords.")
 (defvar sql-mode-linter-font-lock-keywords
-  (let ((linter-keywords (eval-when-compile
+  (let ((linter-keywords (sql-keywords-re
-                           (concat "\\b"
-                                   (regexp-opt '(
 "autocommit" "autoinc" "autorowid" "cancel" "cascade" "channel"
 "committed" "count" "countblob" "cross" "current" "data" "database"
 "datafile" "datafiles" "datesplit" "dba" "dbname" "default" "deferred"
@@ -1190,12 +1330,9 @@ you define your own sql-mode-postgres-font-lock-keywords.")
 "trigger_info_size" "true" "trunc" "uncommitted" "unicode" "unknown"
 "unlimited" "unlisted" "user" "utf8" "value" "varying" "volumes"
 "wait" "windows_code" "workspace" "write" "xml"
+))
-) t) "\\b")))
+        (linter-reserved (sql-keywords-re
-        (linter-reserved-words (eval-when-compile
-                                 (concat "\\b"
-                                         (regexp-opt '(
 "access" "action" "add" "address" "after" "all" "alter" "always" "and"
 "any" "append" "as" "asc" "ascic" "async" "at_begin" "at_end" "audit"
 "aud_obj_name_len" "backup" "base" "before" "between" "blobfile"
@@ -1213,22 +1350,16 @@ you define your own sql-mode-postgres-font-lock-keywords.")
 "start" "stop" "sync" "synchronize" "synonym" "sysdate" "table" "then"
 "to" "union" "unique" "unlock" "until" "update" "using" "values"
 "view" "when" "where" "with" "without"
+))
-) t) "\\b")))
+        (linter-types (sql-keywords-re
-        (linter-types (eval-when-compile
-                        (concat "\\b"
-                                (regexp-opt '(
 "bigint" "bitmap" "blob" "boolean" "char" "character" "date"
 "datetime" "dec" "decimal" "double" "float" "int" "integer" "nchar"
 "number" "numeric" "real" "smallint" "varbyte" "varchar" "byte"
 "cursor" "long"
+))
-) t) "\\b")))
+        (linter-functions (sql-keywords-re
-        (linter-builtin-functions (eval-when-compile
-                        (concat "\\b"
-                                (regexp-opt '(
 "abs" "acos" "asin" "atan" "atan2" "avg" "ceil" "cos" "cosh" "divtime"
 "exp" "floor" "getbits" "getblob" "getbyte" "getlong" "getraw"
 "getstr" "gettext" "getword" "hextoraw" "lenblob" "length" "log"
@@ -1239,20 +1370,12 @@ you define your own sql-mode-postgres-font-lock-keywords.")
 "to_gmtime" "to_localtime" "to_number" "trim" "upper" "decode"
 "substr" "substring" "chr" "dayname" "days" "greatest" "hex" "initcap"
 "instr" "least" "multime" "replace" "width"
+)))
-) t) "\\b"))))
+    `((,linter-keywords  . font-lock-keyword-face)
-          (append sql-mode-ansi-font-lock-keywords
+      (,linter-reserved  . font-lock-keyword-face)
-            (list (cons linter-keywords 'font-lock-keywords-face)
+      (,linter-functions . font-lock-builtin-face)
-                        (cons linter-reserved-words 'font-lock-keyword-face)
+      (,linter-types     . font-lock-type-face)))
-                        ;; XEmacs doesn't have font-lock-builtin-face
-                        (if (string-match "XEmacs\\|Lucid" emacs-version)
-                            (cons linter-builtin-functions 'font-lock-preprocessor-face)
-                          ;; GNU Emacs 19 doesn't have it either
-                          (if (string-match "GNU Emacs 19" emacs-version)
-                        (cons linter-builtin-functions 'font-lock-keywords-face)
-                            ;; Emacs
-                            (cons linter-builtin-functions 'font-lock-builtin-face)))
-                  (cons linter-types 'font-lock-type-face))))
  "Linter SQL keywords used by font-lock.
@@ -1261,21 +1384,18 @@ regular expressions are created during compilation by calling the
 function `regexp-opt'.")
 (defvar sql-mode-ms-font-lock-keywords
-  (let ((ms-reserved-words (eval-when-compile
+  (let ((ms-reserved (sql-keywords-re
-                             (concat "\\b"
-                                     (regexp-opt '(
 "absolute" "add" "all" "alter" "and" "any" "as" "asc" "authorization"
 "avg" "backup" "begin" "between" "break" "browse" "bulk" "by"
 "cascade" "case" "check" "checkpoint" "close" "clustered" "coalesce"
 "column" "commit" "committed" "compute" "confirm" "constraint"
 "contains" "containstable" "continue" "controlrow" "convert" "count"
 "create" "cross" "current" "current_date" "current_time"
-"current_timestamp" "current_user" "database" "deallocate"
+"current_timestamp" "current_user" "database" "deallocate" "declare"
-"declare" "default" "delete" "deny" "desc" "disk" "distinct"
+"default" "delete" "deny" "desc" "disk" "distinct" "distributed"
-"distributed" "double" "drop" "dummy" "dump" "else" "end" "errlvl"
+"double" "drop" "dummy" "dump" "else" "end" "errlvl" "errorexit"
-"errorexit" "escape" "except" "exec" "execute" "exists" "exit" "fetch"
+"escape" "except" "exec" "execute" "exists" "exit" "fetch" "file"
-"file" "fillfactor" "first" "floppy" "for" "foreign" "freetext"
+"fillfactor" "first" "floppy" "for" "foreign" "freetext"
 "freetexttable" "from" "full" "goto" "grant" "group" "having"
 "holdlock" "identity" "identity_insert" "identitycol" "if" "in"
 "index" "inner" "insert" "intersect" "into" "is" "isolation" "join"
@@ -1295,29 +1415,21 @@ function `regexp-opt'.")
 "textsize" "then" "to" "top" "tran" "transaction" "trigger" "truncate"
 "tsequal" "uncommitted" "union" "unique" "update" "updatetext"
 "updlock" "use" "user" "values" "view" "waitfor" "when" "where"
-"while" "with" "work" "writetext"
+"while" "with" "work" "writetext" "collate" "function" "openxml"
-"collate" "function" "openxml" "returns"
+"returns"
+))
-) t) "\\b")))
-        (ms-types (eval-when-compile
-                    (concat "\\b"
-                            (regexp-opt '(
+        (ms-types (sql-keywords-re
 "binary" "bit" "char" "character" "cursor" "datetime" "dec" "decimal"
 "double" "float" "image" "int" "integer" "money" "national" "nchar"
 "ntext" "numeric" "numeric" "nvarchar" "precision" "real"
 "smalldatetime" "smallint" "smallmoney" "text" "timestamp" "tinyint"
 "uniqueidentifier" "varbinary" "varchar" "varying"
+))
-) t) "\\b")))
        (ms-vars "\\b@[a-zA-Z0-9_]*\\b")
-        (ms-builtin-functions (eval-when-compile
+        (ms-functions (sql-keywords-re
-                                (concat "\\b"
-                                        (regexp-opt '(
-;; Misc MS builtin functions
 "@@connections" "@@cpu_busy" "@@cursor_rows" "@@datefirst" "@@dbts"
 "@@error" "@@fetch_status" "@@identity" "@@idle" "@@io_busy"
 "@@langid" "@@language" "@@lock_timeout" "@@max_connections"
@@ -1346,14 +1458,12 @@ function `regexp-opt'.")
 "suser_id" "suser_name" "suser_sid" "suser_sname" "system_user" "tan"
 "textptr" "textvalid" "typeproperty" "unicode" "upper" "user"
 "user_id" "user_name" "var" "varp" "year"
+))
-) t) "\\b")))
+        (ms-commands
-        (ms-config-commands
         (eval-when-compile
           (concat "^\\(\\(set\\s-+\\("
                   (regexp-opt '(
 "datefirst" "dateformat" "deadlock_priority" "lock_timeout"
 "concat_null_yields_null" "cursor_close_on_commit"
 "disable_def_cnst_chk" "fips_flagger" "identity_insert" "language"
@@ -1364,19 +1474,14 @@ function `regexp-opt'.")
 "ansi_warnings" "forceplan" "showplan_all" "showplan_text"
 "statistics" "implicit_transactions" "remote_proc_transactions"
 "transaction" "xact_abort"
 ) t)
                   "\\)\\)\\|go\\s-*\\|use\\s-+\\|setuser\\s-+\\|dbcc\\s-+\\).*$"))))
-    (list (cons ms-config-commands 'font-lock-doc-face)
+    `((,ms-commands  . font-lock-doc-face)
-          (cons ms-reserved-words 'font-lock-keyword-face)
+      (,ms-reserved  . font-lock-keyword-face)
-          ;; XEmacs doesn't have 'font-lock-builtin-face
+      (,ms-functions . font-lock-builtin-face)
-          (if (string-match "XEmacs\\|Lucid" emacs-version)
+      (,ms-vars      . font-lock-variable-name-face)
-              (cons ms-builtin-functions 'font-lock-preprocessor-face)
+      (,ms-types     . font-lock-type-face)))
-            ;; Emacs
-            (cons ms-builtin-functions 'font-lock-builtin-face))
-          (cons ms-vars  'font-lock-variable-name-face)
-          (cons ms-types 'font-lock-type-face)))
  "Microsoft SQLServer SQL keywords used by font-lock.
@@ -1385,7 +1490,7 @@ regular expressions are created during compilation by calling the
 function `regexp-opt'.  Therefore, take a look at the source before
 you define your own sql-mode-ms-font-lock-keywords.")
-(defvar sql-mode-sybase-font-lock-keywords sql-mode-ansi-font-lock-keywords
+(defvar sql-mode-sybase-font-lock-keywords nil
  "Sybase SQL keywords used by font-lock.
 This variable is used by `sql-mode' and `sql-interactive-mode'.  The
@@ -1393,7 +1498,7 @@ regular expressions are created during compilation by calling the
 function `regexp-opt'.  Therefore, take a look at the source before
 you define your own sql-mode-sybase-font-lock-keywords.")
-(defvar sql-mode-informix-font-lock-keywords sql-mode-ansi-font-lock-keywords
+(defvar sql-mode-informix-font-lock-keywords nil
  "Informix SQL keywords used by font-lock.
 This variable is used by `sql-mode' and `sql-interactive-mode'.  The
@@ -1401,7 +1506,7 @@ regular expressions are created during compilation by calling the
 function `regexp-opt'.  Therefore, take a look at the source before
 you define your own sql-mode-informix-font-lock-keywords.")
-(defvar sql-mode-interbase-font-lock-keywords sql-mode-ansi-font-lock-keywords
+(defvar sql-mode-interbase-font-lock-keywords nil
  "Interbase SQL keywords used by font-lock.
 This variable is used by `sql-mode' and `sql-interactive-mode'.  The
@@ -1409,7 +1514,7 @@ regular expressions are created during compilation by calling the
 function `regexp-opt'.  Therefore, take a look at the source before
 you define your own sql-mode-interbase-font-lock-keywords.")
-(defvar sql-mode-ingres-font-lock-keywords sql-mode-ansi-font-lock-keywords
+(defvar sql-mode-ingres-font-lock-keywords nil
  "Ingres SQL keywords used by font-lock.
 This variable is used by `sql-mode' and `sql-interactive-mode'.  The
@@ -1417,7 +1522,7 @@ regular expressions are created during compilation by calling the
 function `regexp-opt'.  Therefore, take a look at the source before
 you define your own sql-mode-interbase-font-lock-keywords.")
-(defvar sql-mode-solid-font-lock-keywords sql-mode-ansi-font-lock-keywords
+(defvar sql-mode-solid-font-lock-keywords nil
  "Solid SQL keywords used by font-lock.
 This variable is used by `sql-mode' and `sql-interactive-mode'.  The
@@ -1425,7 +1530,76 @@ regular expressions are created during compilation by calling the
 function `regexp-opt'.  Therefore, take a look at the source before
 you define your own sql-mode-solid-font-lock-keywords.")
-(defvar sql-mode-mysql-font-lock-keywords sql-mode-ansi-font-lock-keywords
+(defvar sql-mode-mysql-font-lock-keywords
+  (let ((mysql-funcs (sql-keywords-re
+"ascii" "avg" "bdmpolyfromtext" "bdmpolyfromwkb" "bdpolyfromtext"
+"bdpolyfromwkb" "benchmark" "bin" "bit_and" "bit_length" "bit_or"
+"bit_xor" "both" "cast" "char_length" "character_length" "coalesce"
+"concat" "concat_ws" "connection_id" "conv" "convert" "count"
+"curdate" "current_date" "current_time" "current_timestamp" "curtime"
+"elt" "encrypt" "export_set" "field" "find_in_set" "found_rows" "from"
+"geomcollfromtext" "geomcollfromwkb" "geometrycollectionfromtext"
+"geometrycollectionfromwkb" "geometryfromtext" "geometryfromwkb"
+"geomfromtext" "geomfromwkb" "get_lock" "group_concat" "hex" "ifnull"
+"instr" "interval" "isnull" "last_insert_id" "lcase" "leading"
+"length" "linefromtext" "linefromwkb" "linestringfromtext"
+"linestringfromwkb" "load_file" "locate" "lower" "lpad" "ltrim"
+"make_set" "master_pos_wait" "max" "mid" "min" "mlinefromtext"
+"mlinefromwkb" "mpointfromtext" "mpointfromwkb" "mpolyfromtext"
+"mpolyfromwkb" "multilinestringfromtext" "multilinestringfromwkb"
+"multipointfromtext" "multipointfromwkb" "multipolygonfromtext"
+"multipolygonfromwkb" "now" "nullif" "oct" "octet_length" "ord"
+"pointfromtext" "pointfromwkb" "polyfromtext" "polyfromwkb"
+"polygonfromtext" "polygonfromwkb" "position" "quote" "rand"
+"release_lock" "repeat" "replace" "reverse" "rpad" "rtrim" "soundex"
+"space" "std" "stddev" "substring" "substring_index" "sum" "sysdate"
+"trailing" "trim" "ucase" "unix_timestamp" "upper" "user" "variance"
+))
+        (mysql-keywords (sql-keywords-re
+"action" "add" "after" "against" "all" "alter" "and" "as" "asc"
+"auto_increment" "avg_row_length" "bdb" "between" "by" "cascade"
+"case" "change" "character" "check" "checksum" "close" "collate"
+"collation" "column" "columns" "comment" "committed" "concurrent"
+"constraint" "create" "cross" "data" "database" "default"
+"delay_key_write" "delayed" "delete" "desc" "directory" "disable"
+"distinct" "distinctrow" "do" "drop" "dumpfile" "duplicate" "else"
+"enable" "enclosed" "end" "escaped" "exists" "fields" "first" "for"
+"force" "foreign" "from" "full" "fulltext" "global" "group" "handler"
+"having" "heap" "high_priority" "if" "ignore" "in" "index" "infile"
+"inner" "insert" "insert_method" "into" "is" "isam" "isolation" "join"
+"key" "keys" "last" "left" "level" "like" "limit" "lines" "load"
+"local" "lock" "low_priority" "match" "max_rows" "merge" "min_rows"
+"mode" "modify" "mrg_myisam" "myisam" "natural" "next" "no" "not"
+"null" "offset" "oj" "on" "open" "optionally" "or" "order" "outer"
+"outfile" "pack_keys" "partial" "password" "prev" "primary"
+"procedure" "quick" "raid0" "raid_type" "read" "references" "rename"
+"repeatable" "restrict" "right" "rollback" "rollup" "row_format"
+"savepoint" "select" "separator" "serializable" "session" "set"
+"share" "show" "sql_big_result" "sql_buffer_result" "sql_cache"
+"sql_calc_found_rows" "sql_no_cache" "sql_small_result" "starting"
+"straight_join" "striped" "table" "tables" "temporary" "terminated"
+"then" "to" "transaction" "truncate" "type" "uncommitted" "union"
+"unique" "unlock" "update" "use" "using" "values" "when" "where"
+"with" "write" "xor"
+))
+        (mysql-types (sql-keywords-re
+"bigint" "binary" "bit" "blob" "bool" "boolean" "char" "curve" "date"
+"datetime" "dec" "decimal" "double" "enum" "fixed" "float" "geometry"
+"geometrycollection" "int" "integer" "line" "linearring" "linestring"
+"longblob" "longtext" "mediumblob" "mediumint" "mediumtext"
+"multicurve" "multilinestring" "multipoint" "multipolygon"
+"multisurface" "national" "numeric" "point" "polygon" "precision"
+"real" "smallint" "surface" "text" "time" "timestamp" "tinyblob"
+"tinyint" "tinytext" "unsigned" "varchar" "year" "year2" "year4"
+"zerofill"
+)))
+    `((,mysql-funcs    . font-lock-builtin-face)
+      (,mysql-keywords . font-lock-keyword-face)
+      (,mysql-types    . font-lock-type-face)))
  "MySQL SQL keywords used by font-lock.
 This variable is used by `sql-mode' and `sql-interactive-mode'.  The
@@ -1433,7 +1607,7 @@ regular expressions are created during compilation by calling the
 function `regexp-opt'.  Therefore, take a look at the source before
 you define your own sql-mode-mysql-font-lock-keywords.")
-(defvar sql-mode-sqlite-font-lock-keywords sql-mode-ansi-font-lock-keywords
+(defvar sql-mode-sqlite-font-lock-keywords nil
  "SQLite SQL keywords used by font-lock.
 This variable is used by `sql-mode' and `sql-interactive-mode'.  The
@@ -1441,7 +1615,7 @@ regular expressions are created during compilation by calling the
 function `regexp-opt'.  Therefore, take a look at the source before
 you define your own sql-mode-sqlite-font-lock-keywords.")
-(defvar sql-mode-db2-font-lock-keywords sql-mode-ansi-font-lock-keywords
+(defvar sql-mode-db2-font-lock-keywords nil
  "DB2 SQL keywords used by font-lock.
 This variable is used by `sql-mode' and `sql-interactive-mode'.  The
@@ -1463,16 +1637,16 @@ highlighting rules in sql-mode.")
 (defun sql-product-feature (feature &optional product)
  "Lookup `feature' needed to support the current SQL product.
-See \[sql-product-support] for a list of products and supported features."
+See \[sql-product-alist] for a list of products and supported features."
-  (cadr
+  (plist-get
-   (memq feature
+   (cdr (assoc (or product sql-product)
-         (assoc (or product sql-product)
+               sql-product-alist))
-                sql-product-support))))
+   feature))
 (defun sql-product-font-lock (keywords-only imenu)
  "Sets `font-lock-defaults' and `font-lock-keywords' based on
 the product-specific keywords and syntax-alists defined in
-`sql-product-support'."
+`sql-product-alist'."
  (let
      ;; Get the product-specific syntax-alist.
      ((syntax-alist
@@ -1483,27 +1657,69 @@ the product-specific keywords and syntax-alists defined in
    ;; Get the product-specific keywords.
    (setq sql-mode-font-lock-keywords
          (append
-           (eval (sql-product-feature :font-lock))
+           (unless (eq sql-product 'ansi)
+             (eval (sql-product-feature :font-lock)))
+           ;; Always highlight ANSI keywords
+           (eval (sql-product-feature :font-lock 'ansi))
+           ;; Fontify object names in CREATE, DROP and ALTER DDL
+           ;; statements
           (list sql-mode-font-lock-object-name)))
-    ;; Setup font-lock.  (What is the minimum we should have to do
+    ;; Setup font-lock.  Force re-parsing of `font-lock-defaults'.
-    ;; here?)
+    (set (make-local-variable 'font-lock-set-defaults) nil)
-    (setq font-lock-set-defaults nil
+    (setq font-lock-defaults (list 'sql-mode-font-lock-keywords
-          font-lock-keywords sql-mode-font-lock-keywords
-          font-lock-defaults (list 'sql-mode-font-lock-keywords
                                   keywords-only t syntax-alist))
+    ;; Force font lock to reinitialize if it is already on
+    ;; Otherwise, we can wait until it can be started.
+    (when (and (fboundp 'font-lock-mode)
+               font-lock-mode)
+      (font-lock-mode-internal nil)
+      (font-lock-mode-internal t))
+    (add-hook 'font-lock-mode-hook
+              (lambda ()
+                ;; Provide defaults for new font-lock faces.
+                (defvar font-lock-builtin-face
+                  (if (boundp 'font-lock-preprocessor-face)
+                      font-lock-preprocessor-face
+                    font-lock-keyword-face))
+                (defvar font-lock-doc-face font-lock-string-face))
+              nil t)
    ;; Setup imenu; it needs the same syntax-alist.
    (when imenu
        (setq imenu-syntax-alist syntax-alist))))
 ;;;###autoload
-(defun sql-add-product-keywords (product keywords)
+(defun sql-add-product-keywords (product keywords &optional append)
-  "Append a `font-lock-keywords' entry to the existing entries defined
+  "Add highlighting KEYWORDS for SQL PRODUCT.
-  for the specified `product'."
+PRODUCT should be a symbol, the name of a sql product, such as
-  (let ((font-lock (sql-product-feature :font-lock product)))
+`oracle'.  KEYWORDS should be a list; see the variable
-       (set font-lock (append (eval font-lock) (list keywords)))))
+`font-lock-keywords'.  By default they are added at the beginning
+of the current highlighting list.  If optional argument APPEND is
+`set', they are used to replace the current highlighting list.
+If APPEND is any other non-nil value, they are added at the end
+of the current highlighting list.
+For example:
+ (sql-add-product-keywords 'ms
+  '((\"\\\\b\\\\w+_t\\\\b\" . font-lock-type-face)))
+adds a fontification pattern to fontify identifiers ending in
+`_t' as data types."
+  (let ((font-lock (sql-product-feature :font-lock product))
+        old)
+    (setq old (eval font-lock))
+    (set font-lock
+         (if (eq append 'set)
+             keywords
+           (if append
+               (append old keywords)
+             (append keywords old))))))
@@ -1517,10 +1733,6 @@ selected."
    ;; Setup font-lock
    (sql-product-font-lock nil t)
-    ;; Force fontification, if its enabled.
-    (if font-lock-mode
-        (font-lock-fontify-buffer))
    ;; Set the mode name to include the product.
    (setq mode-name (concat "SQL[" (prin1-to-string sql-product) "]"))))
@@ -1528,7 +1740,7 @@ selected."
  "Set `sql-product' to product and enable appropriate
 highlighting."
  (interactive "SEnter SQL product: ")
-  (when (not (assoc product sql-product-support))
+  (when (not (assoc product sql-product-alist))
    (error "SQL product %s is not supported; treated as ANSI" product)
    (setq product 'ansi))
@@ -1952,6 +2164,19 @@ Every newline in STRING will be preceded with a space and a backslash."
  (interactive)
  (sql-send-region (point-min) (point-max)))
+(defun sql-send-string (str)
+  "Send a string to the SQL process."
+  (interactive "sSQL Text: ")
+  (if (buffer-live-p sql-buffer)
+      (save-excursion
+        (comint-send-string sql-buffer str)
+        (comint-send-string sql-buffer "\n")
+        (message "Sent string to buffer %s." (buffer-name sql-buffer))
+        (if sql-pop-to-buffer-after-send-region
+            (pop-to-buffer sql-buffer)
+          (display-buffer sql-buffer)))
+    (message "No SQL process started.")))
 (defun sql-toggle-pop-to-buffer-after-send-region (&optional value)
  "Toggle `sql-pop-to-buffer-after-send-region'.
@@ -2611,6 +2836,8 @@ parameters and command options."
        (setq params (append params (list sql-database))))
    (if (not (string= "" sql-server))
        (setq params (append (list "-h" sql-server) params)))
+    (if (not (string= "" sql-user))
+        (setq params (append (list "-U" sql-user) params)))
    (set-buffer (apply 'make-comint "SQL" sql-postgres-program
                       nil params))))
author	Miles Bader	2004-06-28 07:56:49 +0000
committer	Miles Bader	2004-06-28 07:56:49 +0000
commit	327719ee8a3fcdb36ed6acaf6d8cb5fbdf0bd801 (patch)
tree	21de188e13b5e41a79bb50040933072ae0235217 /lisp/progmodes
parent	852f73b7fa7b71910282eacb6263b3ecfd4ee783 (diff)
parent	376de73927383d6062483db10b8a82448505f52b (diff)
download	emacs-327719ee8a3fcdb36ed6acaf6d8cb5fbdf0bd801.tar.gz emacs-327719ee8a3fcdb36ed6acaf6d8cb5fbdf0bd801.zip