diff options
| author | Karoly Lorentey | 2005-06-15 12:57:51 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-06-15 12:57:51 +0000 |
| commit | ef85512e51f043d73788f00a2aed13cccde0682c (patch) | |
| tree | fc1fa1378533250f260ef8eaa9a84ae882d9df84 /lisp/progmodes/flymake.el | |
| parent | 8736257554f49445f7b4402ac7a9436b38ce6452 (diff) | |
| parent | ef88a9999004e6c26148c8d280d6a41f623d7249 (diff) | |
| download | emacs-ef85512e51f043d73788f00a2aed13cccde0682c.tar.gz emacs-ef85512e51f043d73788f00a2aed13cccde0682c.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350-422)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-350
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-351
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-352
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-353
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-354
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-355
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-356
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-357
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-358
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-359
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-360
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-361
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-362
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-363
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-364
Remove "-face" suffix from widget faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-365
Remove "-face" suffix from custom faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Remove "-face" suffix from change-log faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-367
Remove "-face" suffix from compilation faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Remove "-face" suffix from diff-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-369
lisp/longlines.el (longlines-visible-face): Face removed
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-370
Remove "-face" suffix from woman faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-371
Remove "-face" suffix from whitespace-highlight face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-372
Remove "-face" suffix from ruler-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-373
Remove "-face" suffix from show-paren faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
Remove "-face" suffix from log-view faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Remove "-face" suffix from smerge faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-376
Remove "-face" suffix from show-tabs faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-377
Remove "-face" suffix from highlight-changes faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-378
Remove "-face" suffix from and downcase info faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-379
Remove "-face" suffix from pcvs faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-380
Update uses of renamed pcvs faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-381
Tweak ChangeLog
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-382
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-383
Remove "-face" suffix from strokes-char face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-384
Remove "-face" suffix from compare-windows face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-385
Remove "-face" suffix from calendar faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-386
Remove "-face" suffix from diary-button face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-387
Remove "-face" suffix from testcover faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-388
Remove "-face" suffix from viper faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-389
Remove "-face" suffix from org faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-390
Remove "-face" suffix from sgml-namespace face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-391
Remove "-face" suffix from table-cell face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-392
Remove "-face" suffix from tex-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-393
Remove "-face" suffix from texinfo-heading face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-394
Remove "-face" suffix from flyspell faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-395
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-396
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-397
Remove "-face" suffix from gomoku faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-398
Remove "-face" suffix from mpuz faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-399
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-400
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-401
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-402
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-403
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-404
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-405
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-406
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-407
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-408
Remove "-face" suffix from Buffer-menu-buffer face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-409
Remove "-face" suffix from antlr-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-410
Remove "-face" suffix from ebrowse faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-411
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-412
Remove "-face" suffix from flymake faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-413
Remove "-face" suffix from idlwave faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-414
Remove "-face" suffix from sh-script faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-415
Remove "-face" suffix from vhdl-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-416
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-417
Remove "-face" suffix from which-func face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-418
Remove "-face" suffix from cperl-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-419
Remove "-face" suffix from ld-script faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-420
Fix cperl-mode font-lock problem
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-421
Tweak which-func face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-422
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-80
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-81
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-82
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-350
Diffstat (limited to 'lisp/progmodes/flymake.el')
| -rw-r--r-- | lisp/progmodes/flymake.el | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 28a6aae2435..c47f2e34cd2 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el | |||
| @@ -704,7 +704,7 @@ It's flymake process filter." | |||
| 704 | (nth 1 err-info)) | 704 | (nth 1 err-info)) |
| 705 | 705 | ||
| 706 | (defvar flymake-new-err-info nil | 706 | (defvar flymake-new-err-info nil |
| 707 | "Same as 'flymake-err-info', effective when a syntax check is in progress.") | 707 | "Same as `flymake-err-info', effective when a syntax check is in progress.") |
| 708 | 708 | ||
| 709 | (make-variable-buffer-local 'flymake-new-err-info) | 709 | (make-variable-buffer-local 'flymake-new-err-info) |
| 710 | 710 | ||
| @@ -839,19 +839,23 @@ Return t if it has at least one flymake overlay, nil if no overlay." | |||
| 839 | (setq ov (cdr ov))) | 839 | (setq ov (cdr ov))) |
| 840 | has-flymake-overlays)) | 840 | has-flymake-overlays)) |
| 841 | 841 | ||
| 842 | (defface flymake-errline-face | 842 | (defface flymake-errline |
| 843 | ;;+ '((((class color)) (:foreground "OrangeRed" :bold t :underline t)) | 843 | ;;+ '((((class color)) (:foreground "OrangeRed" :bold t :underline t)) |
| 844 | ;;+ '((((class color)) (:underline "OrangeRed")) | 844 | ;;+ '((((class color)) (:underline "OrangeRed")) |
| 845 | '((((class color)) (:background "LightPink")) | 845 | '((((class color)) (:background "LightPink")) |
| 846 | (t (:bold t))) | 846 | (t (:bold t))) |
| 847 | "Face used for marking error lines." | 847 | "Face used for marking error lines." |
| 848 | :group 'flymake) | 848 | :group 'flymake) |
| 849 | ;; backward-compatibility alias | ||
| 850 | (put 'flymake-errline-face 'face-alias 'flymake-errline) | ||
| 849 | 851 | ||
| 850 | (defface flymake-warnline-face | 852 | (defface flymake-warnline |
| 851 | '((((class color)) (:background "LightBlue2")) | 853 | '((((class color)) (:background "LightBlue2")) |
| 852 | (t (:bold t))) | 854 | (t (:bold t))) |
| 853 | "Face used for marking warning lines." | 855 | "Face used for marking warning lines." |
| 854 | :group 'flymake) | 856 | :group 'flymake) |
| 857 | ;; backward-compatibility alias | ||
| 858 | (put 'flymake-warnline-face 'face-alias 'flymake-warnline) | ||
| 855 | 859 | ||
| 856 | (defun flymake-highlight-line (line-no line-err-info-list) | 860 | (defun flymake-highlight-line (line-no line-err-info-list) |
| 857 | "Highlight line LINE-NO in current buffer. | 861 | "Highlight line LINE-NO in current buffer. |
| @@ -886,8 +890,8 @@ Perhaps use text from LINE-ERR-INFO-ILST to enhance highlighting." | |||
| 886 | (setq end (point))) | 890 | (setq end (point))) |
| 887 | 891 | ||
| 888 | (if (> (flymake-get-line-err-count line-err-info-list "e") 0) | 892 | (if (> (flymake-get-line-err-count line-err-info-list "e") 0) |
| 889 | (setq face 'flymake-errline-face) | 893 | (setq face 'flymake-errline) |
| 890 | (setq face 'flymake-warnline-face)) | 894 | (setq face 'flymake-warnline)) |
| 891 | 895 | ||
| 892 | (flymake-make-overlay beg end tooltip-text face nil))) | 896 | (flymake-make-overlay beg end tooltip-text face nil))) |
| 893 | 897 | ||
| @@ -1312,7 +1316,7 @@ Return first 'INCLUDE-DIRS/REL-FILE-NAME' that exists, or just REL-FILE-NAME if | |||
| 1312 | (flymake-start-syntax-check buffer))))) | 1316 | (flymake-start-syntax-check buffer))))) |
| 1313 | 1317 | ||
| 1314 | (defun flymake-start-syntax-check-for-current-buffer () | 1318 | (defun flymake-start-syntax-check-for-current-buffer () |
| 1315 | "Run 'flymake-start-syntax-check' for current buffer if it isn't already running." | 1319 | "Run `flymake-start-syntax-check' for current buffer if it isn't already running." |
| 1316 | (interactive) | 1320 | (interactive) |
| 1317 | (flymake-start-syntax-check (current-buffer))) | 1321 | (flymake-start-syntax-check (current-buffer))) |
| 1318 | 1322 | ||
| @@ -1655,7 +1659,7 @@ With arg, turn Flymake mode on if and only if arg is positive." | |||
| 1655 | temp-source-file-name)) | 1659 | temp-source-file-name)) |
| 1656 | 1660 | ||
| 1657 | (defun flymake-simple-cleanup (buffer) | 1661 | (defun flymake-simple-cleanup (buffer) |
| 1658 | "Do cleanup after 'flymake-init-create-temp-buffer-copy'. | 1662 | "Do cleanup after `flymake-init-create-temp-buffer-copy'. |
| 1659 | Delete temp file." | 1663 | Delete temp file." |
| 1660 | (let* ((temp-source-file-name (flymake-get-buffer-value buffer "temp-source-file-name"))) | 1664 | (let* ((temp-source-file-name (flymake-get-buffer-value buffer "temp-source-file-name"))) |
| 1661 | (flymake-safe-delete-file temp-source-file-name) | 1665 | (flymake-safe-delete-file temp-source-file-name) |