Mercurial > emacs
diff lisp/progmodes/cperl-mode.el @ 87301:1d6e3255f024
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-956
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 16 Dec 2007 04:31:49 +0000 |
| parents | e50a2e215441 f81c00b9c0ff |
| children | 107ccd98fa12 2fcaae6177a5 |
line wrap: on
line diff
--- a/lisp/progmodes/cperl-mode.el Sun Dec 16 04:31:33 2007 +0000 +++ b/lisp/progmodes/cperl-mode.el Sun Dec 16 04:31:49 2007 +0000 @@ -231,12 +231,18 @@ :type 'integer :group 'cperl-indentation-details) -;; Is is not unusual to put both perl-indent-level and +;; Is is not unusual to put both things like 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 +;; about the variable. Autoload these here, so that no warning is ;; issued when using either perl-mode or cperl-mode. ;;;###autoload(put 'cperl-indent-level 'safe-local-variable 'integerp) +;;;###autoload(put 'cperl-brace-offset 'safe-local-variable 'integerp) +;;;###autoload(put 'cperl-continued-brace-offset 'safe-local-variable 'integerp) +;;;###autoload(put 'cperl-label-offset 'safe-local-variable 'integerp) +;;;###autoload(put 'cperl-continued-statement-offset 'safe-local-variable 'integerp) +;;;###autoload(put 'cperl-extra-newline-before-brace 'safe-local-variable 'booleanp) +;;;###autoload(put 'cperl-merge-trailing-else 'safe-local-variable 'booleanp) (defcustom cperl-lineup-step nil "*`cperl-lineup' will always lineup at multiple of this number.