From f152a8982d18caf558a53019134ba899ecb73c4f Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sat, 25 Aug 2007 21:29:48 +0000 Subject: [PATCH] * progmodes/cperl-mode.el (cperl-indent-level): Autoload the safe-local-variable setting. * progmodes/perl-mode.el (perl-indent-level): Likewise. --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/cperl-mode.el | 8 +++++++- lisp/progmodes/perl-mode.el | 9 ++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 69b5c69533e..6fddb589cf7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-08-25 Dan Nicolaescu + + * progmodes/cperl-mode.el (cperl-indent-level): Autoload the + safe-local-variable setting. + * progmodes/perl-mode.el (perl-indent-level): Likewise. + 2007-08-25 Stefan Monnier * uniquify.el (uniquify-rationalize-file-buffer-names): Check liveness diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 7995c9e02e3..cdfb8870138 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -233,7 +233,13 @@ for constructs with multiline if/unless/while/until/for/foreach condition." "*Indentation of CPerl statements with respect to containing block." :type 'integer :group 'cperl-indentation-details) -(put 'cperl-indent-level 'safe-local-variable 'integerp) + +;; Is is not unusual to put both perl-indent-level and +;; cperl-indent-level in the local variable section of a file. If only +;; one of perl-mode and cperl-mode is in use, a warning will be issued +;; about the variable. Autoload this here, so that no warning is +;; issued when using either perl-mode or cperl-mode. +;;;###autoload(put 'cperl-indent-level 'safe-local-variable 'integerp) (defcustom cperl-lineup-step nil "*`cperl-lineup' will always lineup at multiple of this number. diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index f2feff595bb..809ed7a9f36 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@ -399,7 +399,14 @@ The expansion is entirely correct because it uses the C preprocessor." "*Indentation of Perl statements with respect to containing block." :type 'integer :group 'perl) -(put 'perl-indent-level 'safe-local-variable 'integerp) + +;; Is is not unusual to put both perl-indent-level and +;; cperl-indent-level in the local variable section of a file. If only +;; one of perl-mode and cperl-mode is in use, a warning will be issued +;; about the variable. Autoload this here, so that no warning is +;; issued when using either perl-mode or cperl-mode. +;;;###autoload(put 'perl-indent-level 'safe-local-variable 'integerp) + (defcustom perl-continued-statement-offset 4 "*Extra indent for lines not starting new statements." :type 'integer -- 2.39.2