Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 87300:b968c7f9a8b4 | 87301:1d6e3255f024 |
|---|---|
| 229 (defcustom cperl-indent-level 2 | 229 (defcustom cperl-indent-level 2 |
| 230 "*Indentation of CPerl statements with respect to containing block." | 230 "*Indentation of CPerl statements with respect to containing block." |
| 231 :type 'integer | 231 :type 'integer |
| 232 :group 'cperl-indentation-details) | 232 :group 'cperl-indentation-details) |
| 233 | 233 |
| 234 ;; Is is not unusual to put both perl-indent-level and | 234 ;; Is is not unusual to put both things like perl-indent-level and |
| 235 ;; cperl-indent-level in the local variable section of a file. If only | 235 ;; cperl-indent-level in the local variable section of a file. If only |
| 236 ;; one of perl-mode and cperl-mode is in use, a warning will be issued | 236 ;; one of perl-mode and cperl-mode is in use, a warning will be issued |
| 237 ;; about the variable. Autoload this here, so that no warning is | 237 ;; about the variable. Autoload these here, so that no warning is |
| 238 ;; issued when using either perl-mode or cperl-mode. | 238 ;; issued when using either perl-mode or cperl-mode. |
| 239 ;;;###autoload(put 'cperl-indent-level 'safe-local-variable 'integerp) | 239 ;;;###autoload(put 'cperl-indent-level 'safe-local-variable 'integerp) |
| 240 ;;;###autoload(put 'cperl-brace-offset 'safe-local-variable 'integerp) | |
| 241 ;;;###autoload(put 'cperl-continued-brace-offset 'safe-local-variable 'integerp) | |
| 242 ;;;###autoload(put 'cperl-label-offset 'safe-local-variable 'integerp) | |
| 243 ;;;###autoload(put 'cperl-continued-statement-offset 'safe-local-variable 'integerp) | |
| 244 ;;;###autoload(put 'cperl-extra-newline-before-brace 'safe-local-variable 'booleanp) | |
| 245 ;;;###autoload(put 'cperl-merge-trailing-else 'safe-local-variable 'booleanp) | |
| 240 | 246 |
| 241 (defcustom cperl-lineup-step nil | 247 (defcustom cperl-lineup-step nil |
| 242 "*`cperl-lineup' will always lineup at multiple of this number. | 248 "*`cperl-lineup' will always lineup at multiple of this number. |
| 243 If nil, the value of `cperl-indent-level' will be used." | 249 If nil, the value of `cperl-indent-level' will be used." |
| 244 :type '(choice (const nil) integer) | 250 :type '(choice (const nil) integer) |