[Emacs-diffs] Changes to emacs/lisp/indent.el

[Stefan Monnier]

Index: emacs/lisp/indent.el
diff -c emacs/lisp/indent.el:1.53 emacs/lisp/indent.el:1.54
*** emacs/lisp/indent.el:1.53   Tue Feb  4 06:30:05 2003
--- emacs/lisp/indent.el        Fri Mar 14 18:11:20 2003
***************
*** 49,55 ****
    "*Controls the operation of the TAB key.
  If t, hitting TAB always just indents the current line.
  If nil, hitting TAB indents the current line if point is at the left margin
!   or in the line's indentation, otherwise it insert a `real' tab character."
    :group 'indent
    :type '(choice (const nil) (const t) (const always)))
  
--- 49,55 ----
    "*Controls the operation of the TAB key.
  If t, hitting TAB always just indents the current line.
  If nil, hitting TAB indents the current line if point is at the left margin
!   or in the line's indentation, otherwise it insert a \"real\" tab character."
    :group 'indent
    :type '(choice (const nil) (const t) (const always)))
  
***************
*** 87,93 ****
        ;; so we force it to always insert a tab here.
        (eq indent-line-function 'indent-to-left-margin)
        (and (not tab-always-indent)
!            (> (current-column) (current-indentation))))
      (insert-tab arg))
     ;; Those functions are meant specifically for tabbing and not for
     ;; indenting, so we can't pass them to indent-according-to-mode.
--- 87,94 ----
        ;; so we force it to always insert a tab here.
        (eq indent-line-function 'indent-to-left-margin)
        (and (not tab-always-indent)
!            (or (> (current-column) (current-indentation))
!                (eq this-command last-command))))
      (insert-tab arg))
     ;; Those functions are meant specifically for tabbing and not for
     ;; indenting, so we can't pass them to indent-according-to-mode.
***************
*** 172,178 ****
          ((and force (< cc lm))
           (indent-to-left-margin)))))
  
! ;; This is the default indent-line-function,
  ;; used in Fundamental Mode, Text Mode, etc.
  (defun indent-to-left-margin ()
    "Indent current line to the column given by `current-left-margin'."
--- 173,179 ----
          ((and force (< cc lm))
           (indent-to-left-margin)))))
  
! ;; This used to be the default indent-line-function,
  ;; used in Fundamental Mode, Text Mode, etc.
  (defun indent-to-left-margin ()
    "Indent current line to the column given by `current-left-margin'."