From b68769f25a438e5a49d448c40c3c624cccae7f76 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 25 Oct 2007 04:02:50 +0000 Subject: [PATCH] (conf-space-keywords): Mark this regexp as safe if a string. --- etc/NEWS | 10 +++++++--- lisp/ChangeLog | 34 ++++++++++++++++++++++++++++++++++ lisp/textmodes/conf-mode.el | 1 + 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 8230088d92c..d3cb029e6a5 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -195,13 +195,17 @@ It's used automatically as you move through hunks, see diff-auto-refine. ** compilation-auto-jump-to-first-error tells `compile' to jump to the first error encountered during compilations. -** In the `copyright' package, you can specify your copyright holders's names. +** In the `copyright' package, you can specify your copyright holders' names. Only copyright lines with holders matching copyright-names-regexp will be considered for update. ** eldoc highlights the function argument under point with the face `eldoc-highlight-function-argument'. ++++ +** defcustom accepts new keyword arguments, `:safe' and `risky:', which +set a variable's `safe-local-variable' and `risky-local-variable' property. + ** VC *** Clicking on the VC mode-line entry now pops the VC menu. @@ -267,8 +271,8 @@ that either version can be used as inferior Python by python.el. *** The variable `fortran-line-length' can change the fixed-form line-length. -*** (The increasingly misnamed) F90 mode has some support for Fortran 2003. -At present, there are some problems with derived types. ++++ +*** (The increasingly misnamed) F90 mode supports Fortran 2003 syntax. ** Miscellaneous diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f0e82180a8b..5d934b38d2a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,37 @@ +2007-10-25 Chris Moore + + * comint.el (comint-password-prompt-regexp): + Handle `[sudo] password'-style prompt. + +2007-10-25 Glenn Morris + + * 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 * 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 9eae2f54e5f..51dca954c74 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) -- 2.39.2