[Emacs-diffs] Changes to emacs/lisp/progmodes/perl-mode.el

[Juanma Barranquero]

Index: emacs/lisp/progmodes/perl-mode.el
diff -c emacs/lisp/progmodes/perl-mode.el:1.56 
emacs/lisp/progmodes/perl-mode.el:1.57
*** emacs/lisp/progmodes/perl-mode.el:1.56      Tue Mar 22 19:43:13 2005
--- emacs/lisp/progmodes/perl-mode.el   Thu May 19 19:06:19 2005
***************
*** 376,408 ****
  
  (defcustom perl-indent-level 4
    "*Indentation of Perl statements with respect to containing block."
!   :type 'integer)
  (defcustom perl-continued-statement-offset 4
    "*Extra indent for lines not starting new statements."
!   :type 'integer)
  (defcustom perl-continued-brace-offset -4
    "*Extra indent for substatements that start with open-braces.
  This is in addition to `perl-continued-statement-offset'."
!   :type 'integer)
  (defcustom perl-brace-offset 0
    "*Extra indentation for braces, compared with other text in same context."
!   :type 'integer)
  (defcustom perl-brace-imaginary-offset 0
    "*Imagined indentation of an open brace that actually follows a statement."
!   :type 'integer)
  (defcustom perl-label-offset -2
    "*Offset of Perl label lines relative to usual indentation."
!   :type 'integer)
  (defcustom perl-indent-continued-arguments nil
    "*If non-nil offset of argument lines relative to usual indentation.
  If nil, continued arguments are aligned with the first argument."
!   :type '(choice integer (const nil)))
  
  (defcustom perl-tab-always-indent tab-always-indent
    "Non-nil means TAB in Perl mode always indents the current line.
  Otherwise it inserts a tab character if you type it past the first
  nonwhite character on the line."
!   :type 'boolean)
  
  ;; I changed the default to nil for consistency with general Emacs
  ;; conventions -- rms.
--- 376,416 ----
  
  (defcustom perl-indent-level 4
    "*Indentation of Perl statements with respect to containing block."
!   :type 'integer
!   :group 'perl)
  (defcustom perl-continued-statement-offset 4
    "*Extra indent for lines not starting new statements."
!   :type 'integer
!   :group 'perl)
  (defcustom perl-continued-brace-offset -4
    "*Extra indent for substatements that start with open-braces.
  This is in addition to `perl-continued-statement-offset'."
!   :type 'integer
!   :group 'perl)
  (defcustom perl-brace-offset 0
    "*Extra indentation for braces, compared with other text in same context."
!   :type 'integer
!   :group 'perl)
  (defcustom perl-brace-imaginary-offset 0
    "*Imagined indentation of an open brace that actually follows a statement."
!   :type 'integer
!   :group 'perl)
  (defcustom perl-label-offset -2
    "*Offset of Perl label lines relative to usual indentation."
!   :type 'integer
!   :group 'perl)
  (defcustom perl-indent-continued-arguments nil
    "*If non-nil offset of argument lines relative to usual indentation.
  If nil, continued arguments are aligned with the first argument."
!   :type '(choice integer (const nil))
!   :group 'perl)
  
  (defcustom perl-tab-always-indent tab-always-indent
    "Non-nil means TAB in Perl mode always indents the current line.
  Otherwise it inserts a tab character if you type it past the first
  nonwhite character on the line."
!   :type 'boolean
!   :group 'perl)
  
  ;; I changed the default to nil for consistency with general Emacs
  ;; conventions -- rms.
***************
*** 411,421 ****
  For lines which don't need indenting, TAB either indents an
  existing comment, moves to end-of-line, or if at end-of-line already,
  create a new comment."
!   :type 'boolean)
  
  (defcustom perl-nochange ";?#\\|\f\\|\\s(\\|\\(\\w\\|\\s_\\)+:[^:]"
    "*Lines starting with this regular expression are not auto-indented."
!   :type 'regexp)
  
  ;; Outline support
  
--- 419,431 ----
  For lines which don't need indenting, TAB either indents an
  existing comment, moves to end-of-line, or if at end-of-line already,
  create a new comment."
!   :type 'boolean
!   :group 'perl)
  
  (defcustom perl-nochange ";?#\\|\f\\|\\s(\\|\\(\\w\\|\\s_\\)+:[^:]"
    "*Lines starting with this regular expression are not auto-indented."
!   :type 'regexp
!   :group 'perl)
  
  ;; Outline support