Permalink
Browse files

Add support for filetype-specific indentation settings

Closes #3339420 and #3390435.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5902 ea778897-0a13-0410-b9d1-a72fbfd435f5
  • Loading branch information...
b4n committed Aug 25, 2011
1 parent 4685112 commit 18388077e666ac506da03df1a431e3e420cdcc1b
Showing with 469 additions and 136 deletions.
  1. +8 −0 ChangeLog
  2. +5 −0 data/filetypes.actionscript
  3. +5 −0 data/filetypes.ada
  4. +5 −0 data/filetypes.asm
  5. +5 −0 data/filetypes.c
  6. +5 −0 data/filetypes.caml
  7. +5 −0 data/filetypes.cmake
  8. +5 −0 data/filetypes.cobol
  9. +5 −0 data/filetypes.conf
  10. +5 −0 data/filetypes.cpp
  11. +5 −0 data/filetypes.cs
  12. +5 −0 data/filetypes.css
  13. +5 −0 data/filetypes.d
  14. +5 −0 data/filetypes.diff
  15. +5 −0 data/filetypes.docbook
  16. +5 −0 data/filetypes.erlang
  17. +4 −0 data/filetypes.f77
  18. +5 −0 data/filetypes.ferite
  19. +5 −0 data/filetypes.forth
  20. +5 −0 data/filetypes.fortran
  21. +5 −0 data/filetypes.freebasic
  22. +5 −0 data/filetypes.glsl
  23. +5 −0 data/filetypes.haskell
  24. +5 −0 data/filetypes.haxe
  25. +5 −0 data/filetypes.html
  26. +5 −0 data/filetypes.java
  27. +5 −0 data/filetypes.javascript
  28. +5 −0 data/filetypes.latex
  29. +5 −0 data/filetypes.lisp
  30. +5 −0 data/filetypes.lua
  31. +5 −0 data/filetypes.makefile
  32. +5 −0 data/filetypes.matlab
  33. +5 −0 data/filetypes.nsis
  34. +5 −0 data/filetypes.pascal
  35. +5 −0 data/filetypes.perl
  36. +5 −0 data/filetypes.php
  37. +5 −0 data/filetypes.po
  38. +5 −0 data/filetypes.python
  39. +5 −0 data/filetypes.r
  40. +5 −0 data/filetypes.restructuredtext
  41. +5 −0 data/filetypes.ruby
  42. +5 −0 data/filetypes.sh
  43. +5 −0 data/filetypes.sql
  44. +5 −0 data/filetypes.tcl
  45. +5 −0 data/filetypes.vala
  46. +5 −0 data/filetypes.verilog
  47. +5 −0 data/filetypes.vhdl
  48. +5 −0 data/filetypes.xml
  49. +5 −0 data/filetypes.yaml
  50. +130 −93 doc/geany.html
  51. +23 −0 doc/geany.txt
  52. +40 −43 src/document.c
  53. +26 −0 src/filetypes.c
  54. +3 −0 src/filetypes.h
View
@@ -1,3 +1,11 @@
+2011-08-25 Colomban Wendling <colomban(at)geany(dot)org>
+
+ * src/document.c, src/filetypes.c, src/filetypes.h, doc/geany.txt,
+ doc/geany.html, data/filetypes.*:
+ Add support for filetype-specific indentation settings (closes
+ #3339420 and #3390435).
+
+
2011-08-24 Colomban Wendling <colomban(at)geany(dot)org>
* src/editor.c:
@@ -54,6 +54,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -43,6 +43,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
View
@@ -49,6 +49,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -63,6 +63,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -46,6 +46,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -47,3 +47,8 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
View
@@ -41,3 +41,8 @@ comment_use_indent=false
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
View
@@ -36,3 +36,8 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
View
@@ -65,6 +65,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -65,6 +65,11 @@
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -61,3 +61,8 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
View
@@ -55,6 +55,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -26,3 +26,8 @@ extension=diff
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
View
@@ -67,3 +67,8 @@ context_action_cmd=
# if this setting is set to true, a new line after a line ending with an
# unclosed tag will be automatically indented
xml_indent_tags=true
+
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
View
@@ -65,6 +65,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -50,6 +50,10 @@ primary=access action advance allocatable allocate apostrophe assign assignment
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+type=0
[build_settings]
# %f will be replaced by the complete filename
View
@@ -54,6 +54,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -45,3 +45,8 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
View
@@ -50,6 +50,11 @@ comment_use_indent=false
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
View
@@ -54,6 +54,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -68,6 +68,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -48,6 +48,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -55,6 +55,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -38,6 +38,11 @@
# unclosed tag will be automatically indented
xml_indent_tags=true
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -56,6 +56,11 @@
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
@@ -53,6 +53,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -36,6 +36,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -46,6 +46,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -61,6 +61,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -35,3 +35,8 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+type=1
View
@@ -39,6 +39,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -57,6 +57,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -50,6 +50,11 @@ comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
View
@@ -69,6 +69,11 @@
# context action command (please see Geany's main documentation for details)
context_action_cmd=
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
+
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
Oops, something went wrong.

0 comments on commit 1838807

Please sign in to comment.