[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/perl-mode.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/perl-mode.el |
Date: |
Fri, 04 Apr 2003 01:22:54 -0500 |
Index: emacs/lisp/progmodes/perl-mode.el
diff -c emacs/lisp/progmodes/perl-mode.el:1.45
emacs/lisp/progmodes/perl-mode.el:1.46
*** emacs/lisp/progmodes/perl-mode.el:1.45 Tue Nov 12 16:03:37 2002
--- emacs/lisp/progmodes/perl-mode.el Tue Feb 4 08:24:35 2003
***************
*** 96,102 ****
;; /{/; while (<${glob_me}>)
;; but a simpler solution is to add a space between the $ and the {:
;; while (<$ {glob_me}>)
! ;;
;; Problem 7 is even worse, but this 'fix' does work :-(
;; $DB'stop#'
;; [$DB'line#'
--- 96,102 ----
;; /{/; while (<${glob_me}>)
;; but a simpler solution is to add a space between the $ and the {:
;; while (<$ {glob_me}>)
! ;;
;; Problem 7 is even worse, but this 'fix' does work :-(
;; $DB'stop#'
;; [$DB'line#'
***************
*** 337,343 ****
(put-text-property
(point) (progn (forward-comment (point-max)) (point))
'font-lock-multiline t)
! ;;
(unless
(save-excursion
(let* ((char2 (char-after))
--- 337,343 ----
(put-text-property
(point) (progn (forward-comment (point-max)) (point))
'font-lock-multiline t)
! ;;
(unless
(save-excursion
(let* ((char2 (char-after))
***************
*** 365,371 ****
;; ;; FIXME: `end' is accessed via dyn-scoping.
;; pos (min end (1- (point))) nil '(nil))
;; nil)))))))
!
(defcustom perl-indent-level 4
"*Indentation of Perl statements with respect to containing block."
--- 365,371 ----
;; ;; FIXME: `end' is accessed via dyn-scoping.
;; pos (min end (1- (point))) nil '(nil))
;; nil)))))))
!
(defcustom perl-indent-level 4
"*Indentation of Perl statements with respect to containing block."
***************
*** 435,441 ****
regardless of where in the line point is when the TAB command is used.
`perl-tab-to-comment'
Non-nil means that for lines which don't need indenting, TAB will
! either delete an empty comment, indent an existing comment, move
to end-of-line, or if at end-of-line already, create a new comment.
`perl-nochange'
Lines starting with this regular expression are not auto-indented.
--- 435,441 ----
regardless of where in the line point is when the TAB command is used.
`perl-tab-to-comment'
Non-nil means that for lines which don't need indenting, TAB will
! either delete an empty comment, indent an existing comment, move
to end-of-line, or if at end-of-line already, create a new comment.
`perl-nochange'
Lines starting with this regular expression are not auto-indented.
***************
*** 535,541 ****
(or (/= last-command-char ?:)
;; Colon is special only after a label ....
(looking-at "\\s-*\\(\\w\\|\\s_\\)+$"))
! (let ((pps (parse-partial-sexp
(perl-beginning-of-function) insertpos)))
(not (or (nth 3 pps) (nth 4 pps) (nth 5 pps))))))
(progn ; must insert, indent, delete
--- 535,541 ----
(or (/= last-command-char ?:)
;; Colon is special only after a label ....
(looking-at "\\s-*\\(\\w\\|\\s_\\)+$"))
! (let ((pps (parse-partial-sexp
(perl-beginning-of-function) insertpos)))
(not (or (nth 3 pps) (nth 4 pps) (nth 5 pps))))))
(progn ; must insert, indent, delete
***************
*** 622,628 ****
(defun perl-indent-line (&optional nochange parse-start)
"Indent current line as Perl code.
! Return the amount the indentation
changed by, or (parse-state) if line starts in a quoted string."
(let ((case-fold-search nil)
(pos (- (point-max) (point)))
--- 622,628 ----
(defun perl-indent-line (&optional nochange parse-start)
"Indent current line as Perl code.
! Return the amount the indentation
changed by, or (parse-state) if line starts in a quoted string."
(let ((case-fold-search nil)
(pos (- (point-max) (point)))
***************
*** 850,856 ****
(while (< (point) (marker-position last-mark))
(setq delta (perl-indent-line nil (marker-position bof-mark)))
(if (numberp delta) ; unquoted start-of-line?
! (progn
(if (eolp)
(delete-horizontal-space))
(setq lsexp-mark (point-marker))))
--- 850,856 ----
(while (< (point) (marker-position last-mark))
(setq delta (perl-indent-line nil (marker-position bof-mark)))
(if (numberp delta) ; unquoted start-of-line?
! (progn
(if (eolp)
(delete-horizontal-space))
(setq lsexp-mark (point-marker))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/progmodes/perl-mode.el,
Miles Bader <=