changeset 106913:eeda0c6e1f2f

(tab-always-indent): Fix custom-type.
author Glenn Morris <rgm@gnu.org>
date Tue, 19 Jan 2010 19:46:23 -0800
parents 6881eb43ae95
children 9da21e7d5995
files lisp/ChangeLog lisp/indent.el
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Jan 19 22:27:24 2010 +0000
+++ b/lisp/ChangeLog	Tue Jan 19 19:46:23 2010 -0800
@@ -1,3 +1,7 @@
+2010-01-20  Glenn Morris  <rgm@gnu.org>
+
+	* indent.el (tab-always-indent): Fix custom-type.
+
 2010-01-19  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-defs.el: Fix bug#5395: typing '#' in an empty
--- a/lisp/indent.el	Tue Jan 19 22:27:24 2010 +0000
+++ b/lisp/indent.el	Tue Jan 19 19:46:23 2010 -0800
@@ -1,7 +1,7 @@
 ;;; indent.el --- indentation commands for Emacs
 
-;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -55,7 +55,11 @@
 Some programming language modes have their own variable to control this,
 e.g., `c-tab-always-indent', and do not respect this variable."
   :group 'indent
-  :type '(choice (const nil) (const t) (const always)))
+  :type '(choice
+	  (const :tag "Always indent" t)
+	  (const :tag "Indent if inside indentation, else TAB" nil)
+	  (const :tag "Indent, or if already indented complete" complete)))
+
 
 (defun indent-according-to-mode ()
   "Indent line in proper way for current major mode.