comparison lisp/indent.el @ 91040:14c4a6aac623

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 866-879) - Merge multi-tty branch - Update from CVS - Merge from emacs--rel--22 Revision: [e-mail]/emacs--unicode--0--patch-257

91039:eefadc1e1d5e

	  (save-excursion (indent-line-to column))))
    ;; The normal case.
    (funcall indent-line-function)))

(defun indent-for-tab-command (&optional arg)
  "Indent line in proper way for current major mode or insert a tab.
Depending on `tab-always-indent', either insert a tab or indent.
If initial point was within line's indentation, position after
the indentation.  Else stay at same point in text.
The function actually called to indent is determined by the value of
`indent-line-function'."
  (interactive "P")
  (cond
   ((or ;; indent-to-left-margin is only meant for indenting,
	;; 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))

    (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.
   ((memq indent-line-function '(indent-relative indent-relative-maybe))
    (funcall indent-line-function))
   (t ;; The normal case.
    (indent-according-to-mode))))

(defun insert-tab (&optional arg)
  (let ((count (prefix-numeric-value arg)))
    (if (and abbrev-mode

91040:14c4a6aac623

	  (save-excursion (indent-line-to column))))
    ;; The normal case.
    (funcall indent-line-function)))

(defun indent-for-tab-command (&optional arg)
  "Indent line or region in proper way for current major mode or insert a tab.
Depending on `tab-always-indent', either insert a tab or indent.
If initial point was within line's indentation, position after
the indentation.  Else stay at same point in text.
If `transient-mark-mode' is turned on the region is active,
indent the region.
The function actually called to indent the line is determined by the value of
`indent-line-function'."
  (interactive "P")
  (cond
   ;; The region is active, indent it.
   ((and transient-mark-mode mark-active
	 (not (eq (region-beginning) (region-end))))
    (indent-region (region-beginning) (region-end)))
   ((or ;; indent-to-left-margin is only meant for indenting,
	;; 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))

    (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.
   ((memq indent-line-function '(indent-relative indent-relative-maybe))
    (funcall indent-line-function))
   ;; Indent the line.
   (t
    (indent-according-to-mode))))

(defun insert-tab (&optional arg)
  (let ((count (prefix-numeric-value arg)))
    (if (and abbrev-mode