From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sat, 25 Aug 2007 20:14:54 +0000 (+0000)
Subject: * progmodes/cperl-mode.el (cperl-indent-level): Autoload the
X-Git-Tag: emacs-pretest-23.0.90~11309
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee0fb2286f78bb0500d7b10821a0824f35d26002;p=emacs.git

* progmodes/cperl-mode.el (cperl-indent-level): Autoload the
safe-local-variable setting.
* progmodes/perl-mode.el (perl-indent-level): Likewise.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb8fe202793..b5ff85c47ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-25  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* progmodes/cperl-mode.el (cperl-indent-level): Autoload the
+	safe-local-variable setting.
+	* progmodes/perl-mode.el (perl-indent-level): Likewise.
+
 	* log-view.el (log-view-marked-list): Delete variable.
 	(log-view-mode): Don't use it.
 	(log-view-toggle-mark-entry): Likewise, simplify.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 5a91141db6c..60c2a926cb2 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