aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorDan Nicolaescu2007-12-09 19:19:46 +0000
committerDan Nicolaescu2007-12-09 19:19:46 +0000
commit2d5590e0a3357b155d0483316c1d8ac8aafb03db (patch)
tree5b61e30574cce00616ea56537e6c1263c2d0ab6e /lisp/progmodes
parent819ee2f42a760ed0d7835826d04218990462346e (diff)
downloademacs-2d5590e0a3357b155d0483316c1d8ac8aafb03db.tar.gz
emacs-2d5590e0a3357b155d0483316c1d8ac8aafb03db.zip
* progmodes/perl-mode.el (perl-continued-statement-offset)
(perl-continued-brace-offset, perl-brace-offset) (perl-brace-imaginary-offset, perl-label-offset): * progmodes/cperl-mode.el (cperl-brace-offset) (cperl-continued-brace-offset, cperl-label-offset) (cperl-continued-statement-offset) (cperl-extra-newline-before-brace, cperl-merge-trailing-else): Add safe-local-variable properties.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/cperl-mode.el10
-rw-r--r--lisp/progmodes/perl-mode.el9
2 files changed, 15 insertions, 4 deletions
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 4de1a845ab4..58781578a4e 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -234,12 +234,18 @@ for constructs with multiline if/unless/while/until/for/foreach condition."
234 :type 'integer 234 :type 'integer
235 :group 'cperl-indentation-details) 235 :group 'cperl-indentation-details)
236 236
237;; Is is not unusual to put both perl-indent-level and 237;; Is is not unusual to put both things like perl-indent-level and
238;; cperl-indent-level in the local variable section of a file. If only 238;; cperl-indent-level in the local variable section of a file. If only
239;; one of perl-mode and cperl-mode is in use, a warning will be issued 239;; one of perl-mode and cperl-mode is in use, a warning will be issued
240;; about the variable. Autoload this here, so that no warning is 240;; about the variable. Autoload these here, so that no warning is
241;; issued when using either perl-mode or cperl-mode. 241;; issued when using either perl-mode or cperl-mode.
242;;;###autoload(put 'cperl-indent-level 'safe-local-variable 'integerp) 242;;;###autoload(put 'cperl-indent-level 'safe-local-variable 'integerp)
243;;;###autoload(put 'cperl-brace-offset 'safe-local-variable 'integerp)
244;;;###autoload(put 'cperl-continued-brace-offset 'safe-local-variable 'integerp)
245;;;###autoload(put 'cperl-label-offset 'safe-local-variable 'integerp)
246;;;###autoload(put 'cperl-continued-statement-offset 'safe-local-variable 'integerp)
247;;;###autoload(put 'cperl-extra-newline-before-brace 'safe-local-variable 'booleanp)
248;;;###autoload(put 'cperl-merge-trailing-else 'safe-local-variable 'booleanp)
243 249
244(defcustom cperl-lineup-step nil 250(defcustom cperl-lineup-step nil
245 "*`cperl-lineup' will always lineup at multiple of this number. 251 "*`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 ee14100f56d..0ccb643bc75 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -402,12 +402,17 @@ The expansion is entirely correct because it uses the C preprocessor."
402 :type 'integer 402 :type 'integer
403 :group 'perl) 403 :group 'perl)
404 404
405;; Is is not unusual to put both perl-indent-level and 405;; Is is not unusual to put both things like perl-indent-level and
406;; cperl-indent-level in the local variable section of a file. If only 406;; cperl-indent-level in the local variable section of a file. If only
407;; one of perl-mode and cperl-mode is in use, a warning will be issued 407;; one of perl-mode and cperl-mode is in use, a warning will be issued
408;; about the variable. Autoload this here, so that no warning is 408;; about the variable. Autoload these here, so that no warning is
409;; issued when using either perl-mode or cperl-mode. 409;; issued when using either perl-mode or cperl-mode.
410;;;###autoload(put 'perl-indent-level 'safe-local-variable 'integerp) 410;;;###autoload(put 'perl-indent-level 'safe-local-variable 'integerp)
411;;;###autoload(put 'perl-continued-statement-offset 'safe-local-variable 'integerp)
412;;;###autoload(put 'perl-continued-brace-offset 'safe-local-variable 'integerp)
413;;;###autoload(put 'perl-brace-offset 'safe-local-variable 'integerp)
414;;;###autoload(put 'perl-brace-imaginary-offset 'safe-local-variable 'integerp)
415;;;###autoload(put 'perl-label-offset 'safe-local-variable 'integerp)
411 416
412(defcustom perl-continued-statement-offset 4 417(defcustom perl-continued-statement-offset 4
413 "*Extra indent for lines not starting new statements." 418 "*Extra indent for lines not starting new statements."