comparison lisp/progmodes/cperl-mode.el @ 91239:2fcaae6177a5

Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300
author Miles Bader <miles@gnu.org>
date Sun, 16 Dec 2007 05:08:49 +0000
parents 53108e6cea98 1d6e3255f024
children 606f2d163a64
comparison
equal deleted inserted replaced
91238:5cf14a2107b5 91239:2fcaae6177a5
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)
4579 (and (not (eq (char-after (- (point) 2)) 4585 (and (not (eq (char-after (- (point) 2))
4580 ?\} )) 4586 ?\} ))
4581 (setq qtag "Can't find })"))) 4587 (setq qtag "Can't find })")))
4582 (progn 4588 (progn
4583 (goto-char (1- e)) 4589 (goto-char (1- e))
4584 (message qtag)) 4590 (message "%s" qtag))
4585 (cperl-postpone-fontification 4591 (cperl-postpone-fontification
4586 (1- tag) (1- (point)) 4592 (1- tag) (1- (point))
4587 'face font-lock-variable-name-face) 4593 'face font-lock-variable-name-face)
4588 (cperl-postpone-fontification 4594 (cperl-postpone-fontification
4589 REx-subgr-start (1- tag) 4595 REx-subgr-start (1- tag)