diff options
| author | Glenn Morris <[email protected]> | 2007-10-25 04:02:50 +0000 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2007-10-25 04:02:50 +0000 |
| commit | b68769f25a438e5a49d448c40c3c624cccae7f76 (patch) | |
| tree | 7713a48425efdc82cc7fa35c61e2a4e3e454125f /lisp | |
| parent | f28af2ae4f5ac23021ee0acff8bdf2e4d442addf (diff) | |
(conf-space-keywords): Mark this regexp as safe if a string.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 34 | ||||
| -rw-r--r-- | lisp/textmodes/conf-mode.el | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f0e82180a8..5d934b38d2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,37 @@ +2007-10-25 Chris Moore <[email protected]> + + * comint.el (comint-password-prompt-regexp): + Handle `[sudo] password'-style prompt. + +2007-10-25 Glenn Morris <[email protected]> + + * custom.el (custom-declare-variable): Add :risky and :safe keywords. + (defcustom): Doc fix. + + * progmodes/f90.el (f90-keywords-re, f90-keywords-level-3-re): + Add `non_intrinsic'. + (f90-constants-re): Add ieee modules. + (f90-typedef-matcher, f90-typedec-matcher) + (f90-imenu-type-matcher): New functions. + (f90-font-lock-keywords-1): Give module procedures function-name face. + Use `f90-typedef-matcher' for derived types. Fix `abstract interface'. + Add `use, intrinsic'. + (f90-font-lock-keywords-2): Use `f90-typedec-matcher' for derived types. + Move start of `enum' blocks to separate entry. + (f90-start-block-re): Fix `type', `abstract interface'. + (f90-imenu-generic-expression): Use `f90-imenu-type-matcher' for + derived types. + (f90-mode-abbrev-table): Add `abstract interface', `asynchronous', + `elemental', change `enumerator'. + (f90-no-block-limit): Fix `abstract interface'. + + * progmodes/f90.el (f90-indented-comment-re) + (f90-directive-comment-re, f90-break-delimiters): + * progmodes/fortran.el (fortran-comment-line-start-skip) + (fortran-directive-re): + * textmodes/conf-mode.el (conf-space-keywords): Mark these regexps + as safe if they are strings. + 2007-10-25 Stefan Monnier <[email protected]> * startup.el (window-system): Remove. Don't make it frame-local. diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el index 9eae2f54e5..51dca954c7 100644 --- a/lisp/textmodes/conf-mode.el +++ b/lisp/textmodes/conf-mode.el @@ -176,6 +176,7 @@ This allows constructs such as keyword var value This variable is best set in the file local variables, or through `conf-space-keywords-alist'.") +(put 'conf-space-keywords 'safe-local-variable 'stringp) (defvar conf-space-font-lock-keywords `(;; [section] (do this first because it may look like a parameter) |