diff options
| author | Miles Bader <miles@gnu.org> | 2007-04-24 21:56:25 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-04-24 21:56:25 +0000 |
| commit | 9d989e2f0e613cb0802489eac8e52babdb7ca179 (patch) | |
| tree | 0af4b34ec40ca8efbde60a8940d59f2c04897296 /lisp/progmodes/perl-mode.el | |
| parent | b6cb499791717c7026dfee3ee3c0adb6338635a3 (diff) | |
| parent | 553674da06302c3d5c7f74e57012ced311b44e74 (diff) | |
| download | emacs-9d989e2f0e613cb0802489eac8e52babdb7ca179.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 698-710)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 216)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196
Diffstat (limited to 'lisp/progmodes/perl-mode.el')
| -rw-r--r-- | lisp/progmodes/perl-mode.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index 8b6bc4462d6..35ae6b80901 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@ -391,6 +391,7 @@ 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) (defcustom perl-continued-statement-offset 4 "*Extra indent for lines not starting new statements." :type 'integer @@ -646,10 +647,10 @@ possible action from the following list: (if (and comment-start-skip (re-search-forward comment-start-skip eol 'move)) (if (eolp) - (progn ; kill existing comment + (progn ; delete existing comment (goto-char (match-beginning 0)) (skip-chars-backward " \t") - (kill-region (point) eol)) + (delete-region (point) eol)) (if (or (< oldpnt (point)) (= oldpnt eol)) (indent-for-comment) ; indent existing comment (end-of-line))) |