aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2001-11-02 04:57:54 +0000
committerStefan Monnier2001-11-02 04:57:54 +0000
commitfe552b4c0d54b84b3048a08b2fc19518cafe6f1d (patch)
treeceb9c7000cf35a72d7e63833db06be64596c9276
parented97db13590b125e592f2dae39d45b75f5007362 (diff)
downloademacs-fe552b4c0d54b84b3048a08b2fc19518cafe6f1d.tar.gz
emacs-fe552b4c0d54b84b3048a08b2fc19518cafe6f1d.zip
(tab-always-indent, indent-for-tab-command):
Remove redundant `never' setting.
-rw-r--r--lisp/indent.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/indent.el b/lisp/indent.el
index e772b69de52..5ecd1e5b860 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -48,11 +48,10 @@ Don't rebind TAB unless you really need to.")
48(defcustom tab-always-indent t 48(defcustom tab-always-indent t
49 "*Controls the operation of the TAB key. 49 "*Controls the operation of the TAB key.
50If t, hitting TAB always just indents the current line. 50If t, hitting TAB always just indents the current line.
51If `never', hitting TAB just inserts a tab.
52If nil, hitting TAB indents the current line if point is at the left margin 51If nil, hitting TAB indents the current line if point is at the left margin
53 or in the line's indentation, otherwise it insert a `real' tab character." 52 or in the line's indentation, otherwise it insert a `real' tab character."
54 :group 'indent 53 :group 'indent
55 :type '(choice (const nil) (const t) (const never) (const always))) 54 :type '(choice (const nil) (const t) (const always)))
56 55
57(defun indent-according-to-mode () 56(defun indent-according-to-mode ()
58 "Indent line in proper way for current major mode." 57 "Indent line in proper way for current major mode."
@@ -81,8 +80,7 @@ The function actually called to indent is determined by the value of
81`indent-line-function'." 80`indent-line-function'."
82 (interactive "P") 81 (interactive "P")
83 (cond 82 (cond
84 ((or (eq tab-always-indent 'never) 83 ((or ;; indent-to-left-margin is only meant for indenting,
85 ;; indent-to-left-margin is only meant for indenting,
86 ;; so we force it to always insert a tab here. 84 ;; so we force it to always insert a tab here.
87 (eq indent-line-function 'indent-to-left-margin) 85 (eq indent-line-function 'indent-to-left-margin)
88 (and (not tab-always-indent) 86 (and (not tab-always-indent)