1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-11 00:30:17 -08:00
Commit graph

4737 commits

Author SHA1 Message Date
Alan Mackenzie
ef8cdf8c2a Fix - typing on a C++ inher-intro or inher-cont line should preserve the
fontification of the inherited class names.  Analogously for namespace
names and Java import, extends, etc.

(cc-fonts.el): (c-make-font-lock-BO-decl-search-function): New function.
(c-basic-matchers-after - "Fontify the clauses after various keywords"):
Extract the three keyword lists for the 3 erroneous constructs from the
list of four, and use the new function above in place of an old one.
2011-08-28 11:42:33 +00:00
Alan Mackenzie
3fc9b21845 progmodes/cc-menus.el (cc-imenu-c++-generic-expression): Make it handle
function pointer parameters properly.
2011-08-27 08:41:23 +00:00
Stefan Monnier
867cab7493 * lisp/progmodes/sh-script.el (sh-maybe-here-document): Disable magic in
strings and comments.

Fixes: debbugs:9333
2011-08-22 18:10:21 -04:00
Juri Linkov
56ee679c7f * lisp/progmodes/compile.el (compilation-mode-font-lock-keywords):
Revert regexp that highlights output switches to its old
pre-2010-10-28 value and remove one `?' from it (bug#9319).
2011-08-22 15:46:45 +03:00
Juri Linkov
262a14396d * lisp/progmodes/grep.el (grep-process-setup): Use `buffer-modified-p'
to check for empty output.

Fixes: debbugs:9226
2011-08-22 12:54:38 +03:00
Chong Yidong
f13f86fbf2 Fix some word/symbol classifications in scheme-mode's syntax table.
* lisp/progmodes/scheme.el (scheme-mode-syntax-table): Don't use
symbol-constituent as the default, as that stops font-lock from
working properly.

Fixes: debbugs:8843
2011-08-21 23:38:30 -04:00
Chong Yidong
02e5c89e67 Fix to `ant' compile regexp.
* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist):
  Fix 2011-05-09 change to `ant' regexp.
2011-08-20 22:24:07 -04:00
Chong Yidong
ee31aabc4e Fix error in compilation-error-properties.
* lisp/progmodes/compile.el (compilation-error-properties): Fix
confusion between file struct and message struct (Bug#9319).
2011-08-20 22:07:00 -04:00
Alan Mackenzie
e371503373 Resolve invalid use of a regexp in regexp-opt.
cc-fonts.el (c-complex-decl-matchers): Add in special detection for a
java annotation.

cc-engine.el (c-forward-decl-or-cast-1): Add in special detection for a
java annotation.

cc-langs.el (c-prefix-spec-kwds-re): Remove the special handling for
java.
(c-modifier-kwds): Remove the regexp "@[A-za-z0-9]+".
2011-08-20 22:02:25 +00:00
Alan Mackenzie
b128268e44 Fontify CPP expressions correctly when starting in the middle of such a
construct.  Mainly for when jit-lock etc. starts a chunk here.

cc-fonts.el (c-font-lock-context): new buffer local variable.
(c-make-font-lock-search-form): new function, extracted from
c-make-font-lock-search-function.
(c-make-font-lock-search-function): Use the above function.
(c-make-font-lock-context-search-function): New function.
(c-cpp-matchers): Enhance the preprocessor expression case with the above
function
(c-font-lock-complex-decl-prepare):  Test for being in a CPP form which
takes an expression.

cc-langs.el (c-cpp-expr-intro-re): New lang-variable.
2011-08-20 14:43:33 +00:00
Juri Linkov
bc987f8b80 * lisp/faces.el (error, warning, success): New faces with definitions
copied from old default values of `font-lock-warning-face',
`compilation-warning', `compilation-info'.

* lisp/font-lock.el (font-lock-warning-face): Inherit from `error'.

* lisp/progmodes/compile.el (compilation-error): Inherit from `error'.
(compilation-warning): Inherit from `warning'.
(compilation-info): Inherit from `success'.

* lisp/dired.el (dired-marked): Inherit from `warning'.
(dired-flagged): Inherit from `error'.

Fixes: debbugs:6117
2011-08-18 14:36:19 +03:00
Juri Linkov
02b404de99 * lisp/progmodes/grep.el (rgrep): Handle the case when `grep-find-command'
is a cons cell.

Fixes: debbugs:9278
2011-08-17 20:11:49 +03:00
Alan Mackenzie
9c4aeabf55 progmodes/cc-engine.el (c-state-cache-non-literal-place): Correct to
avoid the insides of macros.
2011-08-16 20:10:40 +00:00
Stefan Monnier
6cd18349b8 * lisp/progmodes/js.el (js-syntax-propertize, js-syntax-propertize-regexp):
New function.
(js--regexp-literal, js-syntax-propertize-function): Remove.
(js-mode): Use js-syntax-propertize to handle multilines.
(js-mode-map): Don't rebind electric keys.
(js-insert-and-indent): Remove.
(js-mode): Setup electric-layout and electric-indent instead.

Fixes: debbugs:9183
2011-08-12 11:32:39 -04:00
Juri Linkov
ac8cf6e698 * lisp/progmodes/grep.el (rgrep): Don't bind `process-connection-type'.
This finishes incomplete reversion of 2011-06-30T01:09:13Z!larsi@gnus.org (2011-06-30)
intended by 2011-07-06T15:49:19Z!larsi@gnus.org (2011-07-06).
2011-08-10 21:29:31 +03:00
Stefan Monnier
4640dd881c * lisp/progmodes/js.el (js--regexp-literal): Accept regexps at the beginning
of statements and in a few more cases.

Fixes: debbugs:9183
2011-08-05 15:53:46 -04:00
Stefan Monnier
b796c9b7f9 * lisp/progmodes/sh-script.el (sh-font-lock-paren): "main" is not "in".
Fixes: debbugs:9190
2011-08-02 22:00:22 -04:00
Alan Mackenzie
b248a85d10 Fontify bitfield declarations properly.
cc-langs.el (c-has-bitfields): New lang variable.
(c-symbol-chars): Now exported as a lang variable.
(c-not-primitive-type-keywords): New lang variable.

cc-fonts.el (c-font-lock-declarations): Jump over the QT keyword "more"
to prevent "more slots: ...." being spuriously parsed as a bitfield
declaraion.

cc-engine.el (c-beginning-of-statement-1): Refactor and enhance to handle
bitfield declarations.
(c-punctuation-in): New function.
(c-forward-decl-or-cast-1): Enhance CASE 3 to handle bitfield
declarations properly.
2011-07-26 19:18:40 +00:00
Alan Mackenzie
a9901f61c7 Prevent cc-langs.elc being loaded at run time.
cc-mode.el: Remove two autoload forms which loaded cc-langs.

cc-langs.el (c-make-init-lang-vars-fun): Don't emit "(require 'cc-langs)".
Quote a form so it will evaluate at (cc-mode's) compilation time.
2011-07-22 12:53:46 +00:00
Sam Steingold
bfa4f1909c * lisp/progmodes/etags.el (etags-file-of-tag, etags-tags-table-files)
(etags-tags-included-tables): Call `convert-standard-filename' on
the file names contained in TAGS so that windows Emacs can handle
TAGS files created by cygwin ctags.
2011-07-20 12:45:00 -04:00
Alan Mackenzie
bf2c1571f4 CC Mode: Fontify declarators properly when, e.g., a jit-lock chunk begins
inside a declaration.  Changed cc-engine.el, cc-langs.el, cc-fonts.el.
2011-07-18 17:15:24 +00:00
Lars Magne Ingebrigtsen
a762e96652 (tags-search): Doc typo fix. 2011-07-17 04:21:43 +02:00
Lars Magne Ingebrigtsen
3af98a7b7d Doc string fix.
* progmodes/cperl-mode.el (cperl-syntaxify-by-font-lock): Rewrite
to avoid awkward possessive "s".

Fixes: debbugs:5986
2011-07-13 19:47:17 +02:00
Lars Magne Ingebrigtsen
343c3b5a4e (tags-search): Document `file-list-form' 2011-07-13 16:20:45 +02:00
Lars Magne Ingebrigtsen
536f3d362f * progmodes/cc-vars.el: Remove (probably) misleading comment 2011-07-13 01:19:33 +02:00
Johan Bockgård
c79598ef31 * progmodes/compile.el (compilation-error-regexp-alist-alist):
Fix previous fix.

Fixes: debbugs:2490
2011-07-12 16:40:56 +02:00
Lars Magne Ingebrigtsen
f5242a022f Fontise bytecomp Error lines more correctly
Fix suggested by Johan Bockgård.

Fixes: debbugs:2490
2011-07-12 14:28:35 +02:00
Lars Magne Ingebrigtsen
12b167347f * progmodes/grep.el (rgrep): Don't bind `process-connection-type', because that makes the colours go away. 2011-07-06 17:49:19 +02:00
Michael Mauger
fbcc67e2aa * progmodes/sql.el: Version 3.0
(sql-product-alist): Added product :completion-object,
	:completion-column, and :statement attributes.
	(sql-mode-menu, sql-interactive-mode-map): Fixed List entries.
	(sql-mode-syntax-table): Mark all punctuation.
	(sql-font-lock-keywords-builder): Temporarily removed fallback on
	ansi keywords.
	(sql-regexp-abbrev, sql-regexp-abbrev-list): New functions.
	(sql-mode-oracle-font-lock-keywords): Improved.
	(sql-oracle-show-reserved-words): New function for development.
	(sql-product-font-lock): Simplify for source code buffers.
	(sql-product-syntax-table, sql-product-font-lock-syntax-alist):
	New functions.
	(sql-highlight-product): Set product specific syntax table.
	(sql-mode-map): Added statement movement functions.
	(sql-ansi-statement-starters, sql-oracle-statement-starters): New
	variable.
	(sql-statement-regexp, sql-beginning-of-statement)
	(sql-end-of-statement, sql-signum): New functions.
	(sql-buffer-live-p, sql=find-sqli-buffer): Added CONNECTION
	parameter.
	(sql-show-sqli-buffer): Bug fix.
	(sql-interactive-mode): Store connection data as buffer local.
	(sql-connect): Added NEW-NAME parameter.  Redesigned interaction
	with sql-interactive-mode.
	(sql-save-connection): Save buffer local settings.
	(sql-connection-menu-filter): Changed menu entry name.
	(sql-product-interactive): Bug fix.
	(sql-preoutput-hold): New variable.
	(sql-interactive-remove-continuation-prompt): Bug fixes.
	(sql-debug-redirect): New variable.
	(sql-str-literal): New function.
	(sql-redirect, sql-redirect-one, sql-redirect-value, sql-execute):
	Redesigned.
	(sql-oracle-save-settings, sql-oracle-restore-settings)
	(sql-oracle-list-all, sql-oracle-list-table): New functions.
	(sql-completion-object, sql-completion-column)
	(sql-completion-sqlbuf): New variables.
	(sql-build-completions-1, sql-build-completions)
	(sql-try-completion): New functions.
	(sql-read-table-name): Use them.
	(sql-contains-names): New buffer local variable.
	(sql-list-all, sql-list-table): Use it.
	(sql-oracle-completion-types): New variable.
	(sql-oracle-completion-object, sql-sqlite-completion-object)
	(sql-postgres-completion-object): New functions.
2011-07-05 23:51:48 -04:00
Glenn Morris
322b7dab59 Merge from emacs-23; up to 2010-06-16T23:27:20Z!jay.p.belanger@gmail.com. 2011-07-05 19:42:10 -07:00
Stefan Monnier
3db614b0e4 * lisp/progmodes/gdb-mi.el: Fit in 80 columns.
(gdb-setup-windows, gdb-restore-windows): Avoid other-window and
switch-to-buffer.
2011-07-05 14:58:33 -04:00
Stefan Monnier
7dbfa7197c * lisp/progmodes/which-func.el (which-func-ff-hook): Don't output a message
if imenu is simply not configured.

Fixes: debbugs:8941
2011-07-05 14:56:31 -04:00
Stefan Monnier
2dcdbdd97d Fix some uses of switch-to-buffer.
* lisp/progmodes/compile.el (compilation-goto-locus):
* lisp/net/tramp-cmds.el (tramp-append-tramp-buffers):
* lisp/bs.el (bs-cycle-next, bs-cycle-previous):
* lisp/bookmark.el (bookmark-bmenu-list, bookmark-bmenu-2-window):
* lisp/bindings.el (mode-line-other-buffer):
* lisp/autoinsert.el (auto-insert):
* lisp/arc-mode.el (archive-extract):
* lisp/abbrev.el (edit-abbrevs): Fix some uses of switch-to-buffer.
2011-07-05 11:31:22 -04:00
Wang Diancheng
f932a34784 * lisp/progmodes/gdb-mi.el (gdb): Use completion-at-point. 2011-07-04 13:50:55 -04:00
Kevin Ryde
6cbbc20c42 * progmodes/compile.el (compilation-error-regexp-alist-alist):
`perl-Test2' extend to match possible "fail #N" rep count
(bug#8377).
2011-07-03 23:39:49 +02:00
Lars Magne Ingebrigtsen
83319045a4 * progmodes/flymake.el (flymake-mode): If the buffer isn't
associated with a file, refuse to run instead of erroring out
(bug#6084).
2011-07-03 00:55:41 +02:00
Lars Magne Ingebrigtsen
5bd3590262 * progmodes/flymake.el (flymake-find-file-hook): Add an `autoload'
cookie, since the manual says that it should be possible to add
this function to `find-file-hook'.
2011-07-01 12:33:50 +02:00
Ted Zlatanov
0da3f8bcf5 * progmodes/cfengine.el: Minor update to docs. 2011-07-01 05:12:47 -05:00
Ted Zlatanov
eee8207a7e Moved `cfengine3-mode' to cfengine.el. Removed cfengine3.el.
* progmodes/cfengine.el: Moved all cfengine3.el functionality
here.  Noted Ted Zlatanov as the maintainer.
(cfengine-common-settings, cfengine-common-syntax): New functions
to set up common things between `cfengine-mode' and
`cfengine3-mode'.
(cfengine3-mode): New mode.
(cfengine3-defuns cfengine3-defuns-regex
(cfengine3-class-selector-regex cfengine3-category-regex)
(cfengine3-vartypes cfengine3-font-lock-keywords)
(cfengine3-beginning-of-defun, cfengine3-end-of-defun)
(cfengine3-indent-line): Added from cfengine3.el.
2011-07-01 05:09:52 -05:00
Glenn Morris
eda98f58e9 Fix license and copyright years. 2011-06-30 23:30:13 -07:00
Ted Zlatanov
055f492351 * progmodes/cfengine3.el: New file to support CFEngine 3.x. 2011-06-30 22:29:50 -05:00
Alan Mackenzie
b14c0c5545 progmodes/cc-guess.el: New file.
progmodes/cc-langs.el (c-mode-menu): Added "Style..." submenu.
progmodes/cc-styles.el (cc-choose-style-for-mode): New function derived
from `c-basic-common-init'.
progmodes/cc-mode.el (top-level): Require cc-guess.
(c-basic-common-init): Use `cc-choose-style-for-mode'.
2011-06-30 20:45:12 +00:00
Lawrence Mitchell
1fa280a3de * lisp/progmodes/js.el (js-mode): Don't stomp on global settings.
Fixes: debbugs:8933
2011-06-30 12:22:33 -04:00
Alan Mackenzie
e6597158c0 progmodes/cc-engine.el (c-guess-continued-construct): Correct the
handling of template-args-cont, particularly for when font lock is
disabled.  Name this case as "CASE G".
2011-06-30 15:12:59 +00:00
Lars Magne Ingebrigtsen
bb6177177b (rgrep): Bind `process-connection-type' to nil, because using a pty is apparently too slow (bug #895). 2011-06-30 03:09:13 +02:00
Chong Yidong
a1d3a912e7 * lisp/progmodes/gud.el (gud-pdb-marker-regexp): Accept \r char (Bug#5653). 2011-06-27 17:38:14 -04:00
Glenn Morris
819a6054c7 flymake.el fix for bug#8866.
* lisp/progmodes/flymake.el (flymake-err-line-patterns):
Allow for column numbers in the ant/javac pattern.
2011-06-27 00:23:27 -07:00
Chong Yidong
5fdd4046b9 * lisp/progmodes/cperl-mode.el (cperl-mode): Derive from prog-mode. 2011-06-25 23:42:22 -04:00
Glenn Morris
ee584d02dd * lisp/progmodes/f90.el (f90-looking-at-critical): Doc fix. 2011-06-25 18:37:36 -07:00
Glenn Morris
e93db24a10 Add support for block and critical blocks to f90.el.
* lisp/progmodes/f90.el (f90-critical-indent): New option.
(f90-font-lock-keywords-2, f90-blocks-re, f90-end-block-re)
(f90-start-block-re, f90-mode-abbrev-table): Add block, critical.
(f90-mode): Doc fix.
(f90-looking-at-critical, f90-looking-at-end-critical): New funcs.
(f90-no-block-limit, f90-calculate-indent, f90-end-of-block)
(f90-beginning-of-block, f90-next-block, f90-indent-region)
(f90-match-end): Handle block, critical.
2011-06-25 18:22:45 -07:00