aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-01-19 19:46:23 -0800
committerGlenn Morris2010-01-19 19:46:23 -0800
commite073d74aaad5b5b5b1300dc62e932b68a5478bcc (patch)
tree0e53ab67b08acf0cbe9dbca4454084a318dc7b9d
parent1fdede8fa561814c5535de26f1f505e29cb38b33 (diff)
downloademacs-e073d74aaad5b5b5b1300dc62e932b68a5478bcc.tar.gz
emacs-e073d74aaad5b5b5b1300dc62e932b68a5478bcc.zip
(tab-always-indent): Fix custom-type.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/indent.el10
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b34373f2d3..800b2ad24c9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-01-20 Glenn Morris <rgm@gnu.org>
2
3 * indent.el (tab-always-indent): Fix custom-type.
4
12010-01-19 Alan Mackenzie <acm@muc.de> 52010-01-19 Alan Mackenzie <acm@muc.de>
2 6
3 * progmodes/cc-defs.el: Fix bug#5395: typing '#' in an empty 7 * progmodes/cc-defs.el: Fix bug#5395: typing '#' in an empty
diff --git a/lisp/indent.el b/lisp/indent.el
index 12cf9c9bb5d..3f8353bd90c 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -1,7 +1,7 @@
1;;; indent.el --- indentation commands for Emacs 1;;; indent.el --- indentation commands for Emacs
2 2
3;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 3;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
4;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4;; 2008, 2009, 2010 Free Software Foundation, Inc.
5 5
6;; Maintainer: FSF 6;; Maintainer: FSF
7 7
@@ -55,7 +55,11 @@ was already indented, then try to complete the thing at point.
55Some programming language modes have their own variable to control this, 55Some programming language modes have their own variable to control this,
56e.g., `c-tab-always-indent', and do not respect this variable." 56e.g., `c-tab-always-indent', and do not respect this variable."
57 :group 'indent 57 :group 'indent
58 :type '(choice (const nil) (const t) (const always))) 58 :type '(choice
59 (const :tag "Always indent" t)
60 (const :tag "Indent if inside indentation, else TAB" nil)
61 (const :tag "Indent, or if already indented complete" complete)))
62
59 63
60(defun indent-according-to-mode () 64(defun indent-according-to-mode ()
61 "Indent line in proper way for current major mode. 65 "Indent line in proper way for current major mode.