Commits

Anonymous committed e219233

2005-09-14 Jari Aalto <jari aalto A T cante net>

* folding.el
(top level): Updated Copyright years and its information.
(folding-package-url-location): Updated URL
to point to XEmacs CVS server.

  • Participants
  • Parent commits c4250f0

Comments (0)

Files changed (2)

+2005-09-14  Jari Aalto  <jari aalto A T cante net>
+
+	* folding.el 
+	(top level): Updated Copyright years and its information.
+	(folding-package-url-location): Updated URL
+	to point to XEmacs CVS server.
+
 2005-05-10  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.88 released.
 2005-03-25  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* whitespace.el (whitespace-cleanup): Integrate this change from
-	the FSF: 
+	the FSF:
 
-	2003-06-10  Rajesh Vaidheeswarran  <rv@gnu.org> 
- 
+	2003-06-10  Rajesh Vaidheeswarran  <rv@gnu.org>
+
 		* whitespace.el (whitespace-cleanup): Respect user
 		preference for silence.
 
 	Import whitespace.el from FSF 21.3.  Same idea as existing
 	whitespace-mode but does more: Corrects problems as well as just
 	highlighting them.
-	
+
 	* whitespace-mode.el:
 	* whitespace-mode.el (whitespace): Removed.
 	* whitespace-mode.el (old-whitespace): New.
 
 2004-09-10  Jari Aalto <jari aalto A T poboxes dot com>
 
-	* folding.el 
+	* folding.el
 	(whole file): Extra empty newlines removed.
 	Protected all email addresses by removing AT-signs.
 	(Version): Changed version scheme to date based YYYY.MMDD, because
 	it is independent of upstream's version control software.
 	The old upstream version number was 2.117.
-	(Copyright): Removed unnecessary 'all rights reserved'. 
+	(Copyright): Removed unnecessary 'all rights reserved'.
 	The code is GPL.
 	(folding-fold-region): auctex:latex-mode's
 	`indent-according-to-mode' causes bottom fold to indent 50
 	characters forward. Added check to prevent that. Bug reported
 	by Uwe Brauer; oub A T mat dot ucm dot es.
-        (folding-check-folded): Added check for \r character, which
+	(folding-check-folded): Added check for \r character, which
 	signifies collapsed folds. This fixes bug (C-x s) where buffer's folds
 	were forced to closed state if folding mode was active in some other
  	buffer. Function `folding-mode-write-file' did that, but the
 
 2003-09-14  Jari Aalto  <jari aalto A T poboxes dot com>
 
-        * other/folding.el
-        (DOCUMENTATION): Added 'Uninstall' and 'To read the manual'
+	* other/folding.el
+	(DOCUMENTATION): Added 'Uninstall' and 'To read the manual'
 	sections.
 	(folding-install): 2.109 Removed 'folding installed' message.
-        (folding-install): 2.109 Removed 'folding uninstalled' message.
-        (folding-add-to-marks-list): 2.109 Added support to `php-mode'.
-        (folding-add-to-marks-list): 2.109 Added support to 
+	(folding-install): 2.109 Removed 'folding uninstalled' message.
+	(folding-add-to-marks-list): 2.109 Added support to `php-mode'.
+	(folding-add-to-marks-list): 2.109 Added support to
 	`change-log-mode'.
-        (folding-add-to-marks-list): 2.109 Added support to
-        `finder-mode'
-	(folding-add-to-marks-list): 2.109 Added support to 
+	(folding-add-to-marks-list): 2.109 Added support to
+	`finder-mode'
+	(folding-add-to-marks-list): 2.109 Added support to
 	`javascript-mode'.
-        (folding-uninstall-keymaps): 2.109 New.
-        (folding-install-keymaps): 2.109 New.
-        (folding-install): 2.109 Cmpletely rewritten.
-        (folding-mode): 2.109 Added (assq 'folding-mode minor-mode-alist) 
+	(folding-uninstall-keymaps): 2.109 New.
+	(folding-install-keymaps): 2.109 New.
+	(folding-install): 2.109 Cmpletely rewritten.
+	(folding-mode): 2.109 Added (assq 'folding-mode minor-mode-alist)
 	check if not there, call `folding-install'.
 	(folding-skip-folds): Removed variable `search' and
 	`funcall'. It's faster to call `search-backward' and
 
 2003-02-05  Jari Aalto  <jari aalto A T poboxes dot com>
 
-        * folding.el (folding-uninstall): Folding was removed
-        from all hooks, but the buffers stayed in folding mode. Now
-        calling uninstall will terminate folding-mode in every Emacs
-        buffer; calls `turn-off-folding-mode'.
+	* folding.el (folding-uninstall): Folding was removed
+	from all hooks, but the buffers stayed in folding mode. Now
+	calling uninstall will terminate folding-mode in every Emacs
+	buffer; calls `turn-off-folding-mode'.
 
 2003-01-26  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.58 released.
+	* Makefile (VERSION): XEmacs package 1.58 released.
 
 2003-01-23  Jari Aalto  <jari aalto A T poboxes dot com>
 
-        * folding.el: Applied patch from plasma
-        <plasmaball@pchome.com.tw>. The folding markers
-        do no longer require starting name: '{{{ MARKER', but can be
-        started with plain '{{{'. Files generated this way are compatible
-        with `vim' editor setting `set fdm=marker'.
+	* folding.el: Applied patch from plasma
+	<plasmaball@pchome.com.tw>. The folding markers
+	do no longer require starting name: '{{{ MARKER', but can be
+	started with plain '{{{'. Files generated this way are compatible
+	with `vim' editor setting `set fdm=marker'.
 
 2003-01-18  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.57 released.
+	* Makefile (VERSION): XEmacs package 1.57 released.
 
 2003-01-13  Vasily Korytov  <deskpot@myrealbox.com>
 
-        * css-mode.el (cssm-indent-line): Use `indent-to' for indenting.
+	* css-mode.el (cssm-indent-line): Use `indent-to' for indenting.
 
 2003-01-13  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.56 released.
+	* Makefile (VERSION): XEmacs package 1.56 released.
 
 2003-01-06  Ville Skytt�  <scop@xemacs.org>
 
-        * xrdb-mode.el: Make auto-mode-alist modifications autoload-only.
-        * xpm-mode.el: Ditto.
-        * scribe.el: Ditto.
-        * nroff-mode.el: Ditto.
-        * winmgr-mode.el: Ditto.
-        * css-mode.el: Ditto.
+	* xrdb-mode.el: Make auto-mode-alist modifications autoload-only.
+	* xpm-mode.el: Ditto.
+	* scribe.el: Ditto.
+	* nroff-mode.el: Ditto.
+	* winmgr-mode.el: Ditto.
+	* css-mode.el: Ditto.
 
 2003-01-02  Michael Shields  <shields@msrl.com>
 
-        * flyspell.el (mail-mode-flyspell-verify):  More robust handling
-        of `mail-header-separator'.  More efficient signature detection.
-        Allow for regexp metacharacters in message-header-separator.
+	* flyspell.el (mail-mode-flyspell-verify):  More robust handling
+	of `mail-header-separator'.  More efficient signature detection.
+	Allow for regexp metacharacters in message-header-separator.
 
 2002-11-29  Ben Wing  <ben@xemacs.org>
 
-        * .cvsignore: Remove files now handled automatically by CVS.
-        * Makefile: Use `compile' instead of hard-coded `all'.
+	* .cvsignore: Remove files now handled automatically by CVS.
+	* Makefile: Use `compile' instead of hard-coded `all'.
 
 2002-11-01  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.55 released.
+	* Makefile (VERSION): XEmacs package 1.55 released.
 
 2002-09-13  Stephen J. Turnbull  <stephen@xemacs.org>
 
-        * filladapt.el (fill-region): Ensure beg <= end.
-        RFE from David Panariti <davep.xemacs@meduseld.net>.
+	* filladapt.el (fill-region): Ensure beg <= end.
+	RFE from David Panariti <davep.xemacs@meduseld.net>.
 
 2002-10-29  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.54 released.
+	* Makefile (VERSION): XEmacs package 1.54 released.
 
 2002-10-18  Glynn Clements  <glynn.clements@virgin.net>
 
-        * image-mode.el: Substantially re-written to avoid use of
-        format-alist.
+	* image-mode.el: Substantially re-written to avoid use of
+	format-alist.
 
 2002-10-15  Ville Skytt�  <scop@xemacs.org>
 
-        * Makefile (srckit): Remove.
+	* Makefile (srckit): Remove.
 
 2002-10-07  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.53 released.
+	* Makefile (VERSION): XEmacs package 1.53 released.
 
 2002-09-30  Ville Skytt�  <scop@xemacs.org>
 
-        * image-mode.el: Add autoloaded auto-mode-alist associations.
-        * nroff-mode.el: Ditto.
-        * scribe.el: Ditto.
-        * winmgr-mode.el: Ditto.
-        * xrdb-mode.el: Ditto, plus add .ad to extensions.
+	* image-mode.el: Add autoloaded auto-mode-alist associations.
+	* nroff-mode.el: Ditto.
+	* scribe.el: Ditto.
+	* winmgr-mode.el: Ditto.
+	* xrdb-mode.el: Ditto, plus add .ad to extensions.
 
 2002-09-06  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.52 released.
+	* Makefile (VERSION): XEmacs package 1.52 released.
 
 2002-08-29  Ville Skytt�  <scop@xemacs.org>
 
-        * flyspell.el: Sync with upstream.
-        (flyspell-auto-correct-binding): New.
-        (flyspell-mouse-map): Use flyspell-auto-correct-binding.
+	* flyspell.el: Sync with upstream.
+	(flyspell-auto-correct-binding): New.
+	(flyspell-mouse-map): Use flyspell-auto-correct-binding.
 
 2002-08-23  Jari Aalto  <jari aalto A T poboxes dot com>
 
-        * folding.el: 1.10 (folding-uninstall-hooks): 2.105
-        Removed `interactive' status.
-        (folding-install-hooks): 2.105
-        Removed `interactive' status.
-        (folding-uninstall): New user function.
+	* folding.el: 1.10 (folding-uninstall-hooks): 2.105
+	Removed `interactive' status.
+	(folding-install-hooks): 2.105
+	Removed `interactive' status.
+	(folding-uninstall): New user function.
 
 2002-08-05  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.51 released.
+	* Makefile (VERSION): XEmacs package 1.51 released.
 
 2002-08-03  Ville Skytt�  <scop@xemacs.org>
 
-        * po-mode.el: Sync with gettext 0.11.4.  No autoloads
-        because of previously reported problems with keybindings.
+	* po-mode.el: Sync with gettext 0.11.4.  No autoloads
+	because of previously reported problems with keybindings.
 
-        * po-compat.el: New, from gettext 0.11.4.
+	* po-compat.el: New, from gettext 0.11.4.
 
-        * Makefile (ELCS): Add po-compat.elc.
+	* Makefile (ELCS): Add po-compat.elc.
 
-        * package-info.in (provides): Add po-compat.
+	* package-info.in (provides): Add po-compat.
 
 2002-08-03 Sat  Jari Aalto  <jari aalto A T poboxes dot com>
 
-        * folding.el:
-        New feature - added font-lock support.
-        Removed LCD entry, because OHIO archive hasn't
-        been functional in years. Documentation typos cleaned a bit.
-        (folding-mode): Added call to`folding-font-lock-support'
-        (folding-font-lock-keywords): New function.
-        (folding-font-lock-support-instantiate): New function.
-        (folding-font-lock-support): New function.
-        (folding-package-url-location): Added note that folding is
-        included in XEmacs.
-        (folding-font-lock-begin-mark): New user variable.
-        (folding-font-lock-end-mark): New user variable..
+	* folding.el:
+	New feature - added font-lock support.
+	Removed LCD entry, because OHIO archive hasn't
+	been functional in years. Documentation typos cleaned a bit.
+	(folding-mode): Added call to`folding-font-lock-support'
+	(folding-font-lock-keywords): New function.
+	(folding-font-lock-support-instantiate): New function.
+	(folding-font-lock-support): New function.
+	(folding-package-url-location): Added note that folding is
+	included in XEmacs.
+	(folding-font-lock-begin-mark): New user variable.
+	(folding-font-lock-end-mark): New user variable..
 
 2002-08-02  Ville Skytt�  <scop@xemacs.org>
 
-        * xrdb-mode.el: Sync with author version 2.27.
+	* xrdb-mode.el: Sync with author version 2.27.
 
 2002-08-02  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.50 released.
+	* Makefile (VERSION): XEmacs package 1.50 released.
 
 2002-08-01  Ville Skytt�  <scop@xemacs.org>
 
-        * flyspell.el: Sync with author version 1.6h, with a change:
-        (flyspell-mouse-map): Use C-; instead of C-/ for
-        flyspell-auto-correct-previous-word (C-/ is bound to undo).
+	* flyspell.el: Sync with author version 1.6h, with a change:
+	(flyspell-mouse-map): Use C-; instead of C-/ for
+	flyspell-auto-correct-previous-word (C-/ is bound to undo).
 
 2002-07-31  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.49 released.
+	* Makefile (VERSION): XEmacs package 1.49 released.
 
 2002-07-26  Jari Aalto  <jari aalto A T poboxes dot com>
 
-        * folding.el (folding-install): The unistall choice was
-        missing. Added.
-        (folding-uninstall-hooks): added
-        `turn-off-folding-mode'
-        (folding-mode): Moved `folding-keep-hooked' to the
-        point where folding is turned on. It should not be called
-        if folding is turned off.
+	* folding.el (folding-install): The unistall choice was
+	missing. Added.
+	(folding-uninstall-hooks): added
+	`turn-off-folding-mode'
+	(folding-mode): Moved `folding-keep-hooked' to the
+	point where folding is turned on. It should not be called
+	if folding is turned off.
 
 2002-07-15  Adrian Aichner  <adrian@xemacs.org>
 
-        * folding.el: It's XEmacs, not Xemacs.
+	* folding.el: It's XEmacs, not Xemacs.
 
 2002-06-27  Steve Youngs  <youngs@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.48 released.
+	* Makefile (VERSION): XEmacs package 1.48 released.
 
 2002-06-26  Steve Youngs  <youngs@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.47 released.
+	* Makefile (VERSION): XEmacs package 1.47 released.
 
 2002-06-13  Ville Skytt�  <scop@xemacs.org>
 
-        * Makefile (ELCS): Add css-mode.elc.
-        * package-info.in (provides): Add css-mode.
-        * css-mode.el, css-mode.el.upstream: New files.
+	* Makefile (ELCS): Add css-mode.elc.
+	* package-info.in (provides): Add css-mode.
+	* css-mode.el, css-mode.el.upstream: New files.
 
 2002-06-13  Ville Skytt�  <scop@xemacs.org>
 
-        * package-info.in (provides): Add po-mode.
+	* package-info.in (provides): Add po-mode.
 
 2002-06-11  Steve Youngs  <youngs@xemacs.org>
 
-        * Makefile (ELCS): Add po-mode.elc.
+	* Makefile (ELCS): Add po-mode.elc.
 
-        * po-mode.el: New file.
+	* po-mode.el: New file.
 
 2002-06-09  Stephen J. Turnbull  <stephen@xemacs.org>
 
-        * xpm-mode.el (xpm-init): Toolbar specs go with buffer, not frame.
+	* xpm-mode.el (xpm-init): Toolbar specs go with buffer, not frame.
 
 2002-06-04  Steve Youngs  <youngs@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.46 released.
+	* Makefile (VERSION): XEmacs package 1.46 released.
 
 2002-06-02  Steve Youngs  <youngs@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.45 released.
+	* Makefile (VERSION): XEmacs package 1.45 released.
 
 2002-05-31  Steve Youngs  <youngs@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.44 released.
+	* Makefile (VERSION): XEmacs package 1.44 released.
 
 2002-05-25  Ville Skytt�  <scop@xemacs.org>
 
-        * apache-mode.el (apache-font-lock-keywords):
-        Add some missing keywords and values for apache-ssl, mod_ssl
-        and mod_perl.
+	* apache-mode.el (apache-font-lock-keywords):
+	Add some missing keywords and values for apache-ssl, mod_ssl
+	and mod_perl.
 
 2002-05-15  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * apache-mode.el (apache-font-lock-keywords): added new keywords
-        from apache-2.0.36
+	* apache-mode.el (apache-font-lock-keywords): added new keywords
+	from apache-2.0.36
 
 2002-05-10  Steve Youngs  <youngs@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.43 released.
+	* Makefile (VERSION): XEmacs package 1.43 released.
 
 2002-05-09  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * apache-mode.el: separated apache directives into sections
-        for easier updating
-        * apache-mode.el (apache-font-lock-keywords):
+	* apache-mode.el: separated apache directives into sections
+	for easier updating
+	* apache-mode.el (apache-font-lock-keywords):
 
 2002-04-24  Steve Youngs  <youngs@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.42 released.
+	* Makefile (VERSION): XEmacs package 1.42 released.
 
 2002-04-24  Ville Skytt�  <scop@xemacs.org>
 
-        * apache-mode.el (apache-font-lock-keywords):
-        Use string equality test in delete-duplicates.
+	* apache-mode.el (apache-font-lock-keywords):
+	Use string equality test in delete-duplicates.
 
 2002-04-24  Steve Youngs  <youngs@xemacs.org>
 
-        * Makefile (VERSION): XEmacs package 1.41 released.
+	* Makefile (VERSION): XEmacs package 1.41 released.
 
 2002-04-24  Hrvoje Niksic  <hniksic@xemacs.org>
 
-        * htmlize.el: Sync to upstream version 0.67
+	* htmlize.el: Sync to upstream version 0.67
 
 2002-04-23  Ville Skytt�  <scop@xemacs.org>
 
-        * apache-mode.el: Docstring updates.
-        (apache-font-lock-keywords):
-        Add keywords for mod_ssl, Apache-SSL and mod_perl.
-        Use delete-duplicates in regexp-opt lists.
-        Fix typo (ProxyReceiveBufferSize).
+	* apache-mode.el: Docstring updates.
+	(apache-font-lock-keywords):
+	Add keywords for mod_ssl, Apache-SSL and mod_perl.
+	Use delete-duplicates in regexp-opt lists.
+	Fix typo (ProxyReceiveBufferSize).
 
 2002-04-20  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
-        * apache-mode.el: New file.
+	* apache-mode.el: New file.
 
-        * Makefile (ELCS): Added apache-mode.elc.
+	* Makefile (ELCS): Added apache-mode.elc.
 
-        * package-info.in (provides): Add apache-mode.
+	* package-info.in (provides): Add apache-mode.
 
 2002-04-07  Alastair J. Houghton  <ajhoughton@lineone.net>
 
-        * rtf-support.el (rtf-spool-region): Fixed extraction of font
-          information [name, size etc...] on X11.
+	* rtf-support.el (rtf-spool-region): Fixed extraction of font
+	  information [name, size etc...] on X11.
 
 2002-04-06  Hrvoje Niksic  <hniksic@xemacs.org>
 
-        * htmlize.el: Sync to upstream version 0.65
+	* htmlize.el: Sync to upstream version 0.65
 
 2002-03-25  Steve Youngs  <youngs@xemacs.org>
 
-        * Makefile (VERSION): 1.40 released.
+	* Makefile (VERSION): 1.40 released.
 
 2002-03-24  Hrvoje Niksic  <hniksic@xemacs.org>
 
-        * htmlize.el: Sync to upstream version 0.64
+	* htmlize.el: Sync to upstream version 0.64
 
 2002-03-13  Adrian Aichner  <adrian@xemacs.org>
 
-        * package-info.in: Fix typo for rtf-support.
+	* package-info.in: Fix typo for rtf-support.
 
 2002-03-08  Volker Franz  <volker.franz@tuebingen.mpg.de>
 
-        * whitespace-mode.el (whitespace-incremental-mode): Autoload it.
+	* whitespace-mode.el (whitespace-incremental-mode): Autoload it.
 
 2002-03-02  Jeff Mincy  <mincy@rcn.com>
 
-        * xpm-mode.el: (xpm-init) fix infinite loop,
-        (xpm-toolbar-select-colour) null button
+	* xpm-mode.el: (xpm-init) fix infinite loop,
+	(xpm-toolbar-select-colour) null button
 
 2002-02-28  Volker Franz  <volker.franz@tuebingen.mpg.de>
 
-        * whitespace-mode.el: If add-minor-mode is bound, then uses
-        add-minor-mode instead of directly changing minor-mode-alist.
-        Added autoload-cookies for this.
-        (whitespace-mode-line-string): newly defined with
-        autoload-cookies.
-        (whitespace-incremental-mode-line-string): likewise.
+	* whitespace-mode.el: If add-minor-mode is bound, then uses
+	add-minor-mode instead of directly changing minor-mode-alist.
+	Added autoload-cookies for this.
+	(whitespace-mode-line-string): newly defined with
+	autoload-cookies.
+	(whitespace-incremental-mode-line-string): likewise.
 
 2002-02-13  Steve Youngs  <youngs@xemacs.org>
 
-        * flyspell.el: Sync to upstream version 1.6g
+	* flyspell.el: Sync to upstream version 1.6g
 
 2002-02-01  Jeff Mincy  <jeff@delphioutpost.com>
 
-        * xpm-mode.el:  Add xpm-mode to auto-mode-alist.
+	* xpm-mode.el:  Add xpm-mode to auto-mode-alist.
 
 2002-01-24 Thu  Jari Aalto  <jari aalto A T poboxes dot com>
 
-        * folding.el:
-        (folding-bind-default-keys): Added
-        C-x . to run `folding-context-next-action'. Code by
-        Scott Evans <gse@antisleep.com> during mail exchange.
-        (folding-easy-menu-define): Added
-        `folding-context-next-action'
-        (folding-mouse-call-original): Added `car-safe' to read
-        EVENT, which may be nil.
-        (folding-next-visible-heading): Better variable
-        name `bm' => `begin-mark'
-        (folding-bind-backward-compatible-keys):
-        Used `let' to locally set `folding-mode-prefix-key', but that
-        did not accept a thing, because `folding-install' instantiated
-        the keymap using `folding-mode-prefix-key', which retained the
-        original value. Now sets permanently `folding-mode-prefix-key'
-        to C-c.
+	* folding.el:
+	(folding-bind-default-keys): Added
+	C-x . to run `folding-context-next-action'. Code by
+	Scott Evans <gse@antisleep.com> during mail exchange.
+	(folding-easy-menu-define): Added
+	`folding-context-next-action'
+	(folding-mouse-call-original): Added `car-safe' to read
+	EVENT, which may be nil.
+	(folding-next-visible-heading): Better variable
+	name `bm' => `begin-mark'
+	(folding-bind-backward-compatible-keys):
+	Used `let' to locally set `folding-mode-prefix-key', but that
+	did not accept a thing, because `folding-install' instantiated
+	the keymap using `folding-mode-prefix-key', which retained the
+	original value. Now sets permanently `folding-mode-prefix-key'
+	to C-c.
 
 2002-01-10  John Paul Wallington  <jpw@shootybangbang.com>
 
-        * flyspell.el (flyspell-mode-line-string): fix custom type.
+	* flyspell.el (flyspell-mode-line-string): fix custom type.
 
 2001-12-30  Gleb Arshinov  <gleb@barsook.com>
 
-        * folding.el: remove comment about (now fixed) XEmacs isearch
-        support bug
-        (folding-isearch-hook-function): for XEmacs use
-        overriding-local-map or to fiddle with minor-mode-map-alist as
-        appropriate.  This supports both 21.2+ and older XEmacs isearch
-        code.
-        (folding-isearch-general): execute isearch-abort and isearch-quit
-        like any other function for clarity and to make sure any
-        side-effects of underlying implementation take effect.  cond
-        clause is no longer necessary, but is left in place to make patch
-        more clear.
-        (folding-isearch-general): always goto position returned by
-        underlying isearch function.  This makes C-g work as expected
-        (go back to original position where isearch was started)
-        (folding-isearch-general): fully mimic exit signal of isearch
+	* folding.el: remove comment about (now fixed) XEmacs isearch
+	support bug
+	(folding-isearch-hook-function): for XEmacs use
+	overriding-local-map or to fiddle with minor-mode-map-alist as
+	appropriate.  This supports both 21.2+ and older XEmacs isearch
+	code.
+	(folding-isearch-general): execute isearch-abort and isearch-quit
+	like any other function for clarity and to make sure any
+	side-effects of underlying implementation take effect.  cond
+	clause is no longer necessary, but is left in place to make patch
+	more clear.
+	(folding-isearch-general): always goto position returned by
+	underlying isearch function.  This makes C-g work as expected
+	(go back to original position where isearch was started)
+	(folding-isearch-general): fully mimic exit signal of isearch
 
 2001-12-30 Sun  Jari Aalto  <jari aalto A T poboxes dot com>
 
-        * folding.el: Synched with the latest folding: 2.97.
-        All function now have uniforma naming `folding-' where the
-        previous version used both `fold-' and `folding-'.
-        Isearch support is still broken in XEmacs, works in Emacs.
-        See complete list of changes in folding itself (history
-        section)
+	* folding.el: Synched with the latest folding: 2.97.
+	All function now have uniforma naming `folding-' where the
+	previous version used both `fold-' and `folding-'.
+	Isearch support is still broken in XEmacs, works in Emacs.
+	See complete list of changes in folding itself (history
+	section)
 
 2001-12-29  Steve Youngs  <youngs@xemacs.org>
 
-        * package-info.in: (provides): Update to include all provides.
+	* package-info.in: (provides): Update to include all provides.
 
 2001-12-28  Steve Youngs  <youngs@xemacs.org>
 
-        * rtf-support.el: New file.
+	* rtf-support.el: New file.
 
-        * Makefile (ELCS): Add rtf-support.elc
+	* Makefile (ELCS): Add rtf-support.elc
 
 2001-07-18  Charles G Waldman  <cgw@xemacs.org>
 
-        * hexl.el (hexlify-buffer):
-        * hexl.el (dehexlify-buffer): Check whether buffer-file-system
-        is bound.
+	* hexl.el (hexlify-buffer):
+	* hexl.el (dehexlify-buffer): Check whether buffer-file-system
+	is bound.
 
 2001-06-18  Ben Wing  <ben@xemacs.org>
 
-        * hexl.el:
-        * hexl.el (hexl): New.
-        * hexl.el (hexl-iso):
-        * hexl.el (hexl-follow-ascii): New.
-        * hexl.el (hexl-ascii-extent): New.
-        * hexl.el (hexl-mode):
-        * hexl.el (hexl-after-revert-hook):
-        * hexl.el (hexl-save-buffer):
-        * hexl.el (hexl-mode-exit):
-        * hexl.el (hexl-current-address):
-        * hexl.el (hexl-address-to-marker):
-        * hexl.el (hexl-goto-address):
-        * hexl.el (hexl-scroll-up):
-        * hexl.el (hexlify-buffer):
-        * hexl.el (dehexlify-buffer):
-        * hexl.el (hexl-hex-char-to-integer):
-        * hexl.el (hexl-oct-char-to-integer):
-        * hexl.el (hexl-insert-hex-char):
-        * hexl.el (hexl-insert-hex-string): New.
-        * hexl.el (hexl-insert-octal-char):
-        * hexl.el (hexl-follow-ascii-find): New.
-        * hexl.el (hexl-mode-map):
-        Sync with FSF 21.0.103.  Now works on MS Windows.
+	* hexl.el:
+	* hexl.el (hexl): New.
+	* hexl.el (hexl-iso):
+	* hexl.el (hexl-follow-ascii): New.
+	* hexl.el (hexl-ascii-extent): New.
+	* hexl.el (hexl-mode):
+	* hexl.el (hexl-after-revert-hook):
+	* hexl.el (hexl-save-buffer):
+	* hexl.el (hexl-mode-exit):
+	* hexl.el (hexl-current-address):
+	* hexl.el (hexl-address-to-marker):
+	* hexl.el (hexl-goto-address):
+	* hexl.el (hexl-scroll-up):
+	* hexl.el (hexlify-buffer):
+	* hexl.el (dehexlify-buffer):
+	* hexl.el (hexl-hex-char-to-integer):
+	* hexl.el (hexl-oct-char-to-integer):
+	* hexl.el (hexl-insert-hex-char):
+	* hexl.el (hexl-insert-hex-string): New.
+	* hexl.el (hexl-insert-octal-char):
+	* hexl.el (hexl-follow-ascii-find): New.
+	* hexl.el (hexl-mode-map):
+	Sync with FSF 21.0.103.  Now works on MS Windows.
 
 2001-04-02  Glynn Clements  <glynn.clements@virgin.net>
 
-        * hexl.el (hexl-find-file): force use of 'binary coding-system
+	* hexl.el (hexl-find-file): force use of 'binary coding-system
 
 2001-01-25  Steve Youngs  <youngs@xemacs.org>
 
-        * ansi-color.el: Sync with author version 3.4.3.
+	* ansi-color.el: Sync with author version 3.4.3.
 
 2001-01-19  Steve Youngs  <youngs@xemacs.org>
 
-        * ansi-color.el: New file.
+	* ansi-color.el: New file.
 
 2000-11-16  Steve Youngs  <youngs@xemacs.org>
 
-        * filladapt.el: Sync with author version 2.12.
+	* filladapt.el: Sync with author version 2.12.
 
 2000-11-01  Hrvoje Niksic <hniksic@arsdigita.com>
 
-        * htmlize.el: Update to author version 0.55.
+	* htmlize.el: Update to author version 0.55.
 
 2000-10-05  Martin Buchholz  <martin@xemacs.org>
 
-        * *: Mega typo fix.
+	* *: Mega typo fix.
 
 2000-07-27  Ben Wing  <ben@xemacs.org>
 
-        * flyspell.el (setq ispell-library-path nil): hack so that this
-        will still compile when ispell executable non-existent.
-        (later that same day): revert.  fixed ispell itself.
+	* flyspell.el (setq ispell-library-path nil): hack so that this
+	will still compile when ispell executable non-existent.
+	(later that same day): revert.  fixed ispell itself.
 
 2000-05-16  Andreas Jaeger  <aj@suse.de>
 
-        * htmlize.el: Version 0.50 from Hrvoje Niksic.
+	* htmlize.el: Version 0.50 from Hrvoje Niksic.
 
 2000-02-14  Stephen J. Turnbull  <stephen@xemacs.org>
 
-        * image-mode.el (image-external-viewer): Remove variable.
-        (image-external-viewer-list): New variable.
-        (image-start-external-viewer): Search `image-external-viewer-list'
-        at run-time, rather than set `image-external-viewer' at load-time.
+	* image-mode.el (image-external-viewer): Remove variable.
+	(image-external-viewer-list): New variable.
+	(image-start-external-viewer): Search `image-external-viewer-list'
+	at run-time, rather than set `image-external-viewer' at load-time.
 
 2000-01-15  Andreas Jaeger <aj@xemacs.org>
 
-        * flyspell.el (global-flyspell-mode): Reverted last patch for now
-        since it lead to some new unresolved problems.
+	* flyspell.el (global-flyspell-mode): Reverted last patch for now
+	since it lead to some new unresolved problems.
 
 2000-01-11  Didier Verna  <didier@xemacs.org>
 
-        * flyspell.el (global-flyspell-mode): add missing autoload.
+	* flyspell.el (global-flyspell-mode): add missing autoload.
 
 1999-11-11  Andreas Jaeger  <aj@suse.de>
 
-        * htmlize.el: Version 0.49 from Hrvoje Niksic <hniksic@srce.hr>.
+	* htmlize.el: Version 0.49 from Hrvoje Niksic <hniksic@srce.hr>.
 
 1999-07-06  SL Baur  <steve@miho.m17n.org>
 
-        * filladapt.el (fill-paragraph): Quote leading parenthesis.
-        (lisp-fill-paragraph): Ditto.
-        (fill-region-as-paragraph): Ditto.
-        (fill-region): Ditto.
-        From Bob Weiner <weiner@altrasoft.com>
+	* filladapt.el (fill-paragraph): Quote leading parenthesis.
+	(lisp-fill-paragraph): Ditto.
+	(fill-region-as-paragraph): Ditto.
+	(fill-region): Ditto.
+	From Bob Weiner <weiner@altrasoft.com>
 
 1999-04-22  John H Palmieri  <palmieri@member.ams.org>
 
-        * xpm-mode.el (xpm-parse-color):
-        Handle s and m fields correctly if before the c field.
-        Read color correctly from c field if before s and/or m fields.
+	* xpm-mode.el (xpm-parse-color):
+	Handle s and m fields correctly if before the c field.
+	Read color correctly from c field if before s and/or m fields.
 
 1999-04-08  Sam Mikes  <smikes@alumni.hmc.edu>
 
-        * folding.el: (fold-mouse-call-original) use `int-to-string' in `concat'
+	* folding.el: (fold-mouse-call-original) use `int-to-string' in `concat'
 
 1999-02-15  SL Baur  <steve@xemacs.org>
 
-        * Makefile (ELCS): Add htmlize.elc.
+	* Makefile (ELCS): Add htmlize.elc.
 
 1998-12-30  Martin Buchholz  <martin@xemacs.org>
 
-        * xrdb-mode.el: Upgrade from version 2.11 -> 2.24
-        Snarfed from http://www.python.org/emacs/xrdb-mode.el
+	* xrdb-mode.el: Upgrade from version 2.11 -> 2.24
+	Snarfed from http://www.python.org/emacs/xrdb-mode.el
 
 1998-10-27  SL Baur  <steve@altair.xemacs.org>
 
-        * flyspell.el (flyspell-mode): Autoload.
-        Remove # in add-minor-mode call (it isn't needed).
-        Move add-minor-mode setup to end of file.
+	* flyspell.el (flyspell-mode): Autoload.
+	Remove # in add-minor-mode call (it isn't needed).
+	Move add-minor-mode setup to end of file.
 
 1998-10-21  Greg Klanderman  <greg@alphatech.com>
 
-        * flyspell.el (flyspell-mode-map): add autoload cookie.
-        (top level): pass the function flyspell-mode as the fifth
-        argument to add-minor-mode, not the value of the variable.
+	* flyspell.el (flyspell-mode-map): add autoload cookie.
+	(top level): pass the function flyspell-mode as the fifth
+	argument to add-minor-mode, not the value of the variable.
 
 1998-10-21  Greg Klanderman  <greg@alphatech.com>
 
-        * flyspell.el: synch to author version 1.4d.
+	* flyspell.el: synch to author version 1.4d.
 
 1998-09-24  SL Baur  <steve@altair.xemacs.org>
 
-        * flyspell.el (flyspell-mode-line-string): New variable.
-        Use `add-minor-mode' to add the minor mode to XEmacs.
-        (flyspell-mode): Autoload.
-        (flyspell-mode-map): Autoload.
-        (flyspell-mode-line-string): Autoload.
+	* flyspell.el (flyspell-mode-line-string): New variable.
+	Use `add-minor-mode' to add the minor mode to XEmacs.
+	(flyspell-mode): Autoload.
+	(flyspell-mode-map): Autoload.
+	(flyspell-mode-line-string): Autoload.
 
 1998-08-29  Jeff Miller  <jmiller@smart.net>
 
-        * whitespace-mode.el:  added autoload cookie for whitespace-mode
-        updated toolbar icon to use foregroundToolBarColor.
+	* whitespace-mode.el:  added autoload cookie for whitespace-mode
+	updated toolbar icon to use foregroundToolBarColor.
 
 1998-07-03  Charles G Waldman  <cgw@pgt.com>
 
-        * image-mode.el: Fixed image-decode to handle start and end args.
+	* image-mode.el: Fixed image-decode to handle start and end args.
 
 1998-03-25  SL Baur  <steve@altair.xemacs.org>
 
-        * folding.el: New file.
+	* folding.el: New file.
 
 1998-03-16  SL Baur  <steve@altair.xemacs.org>
 
-        * iso-acc.el: Update maintainer: field.
+	* iso-acc.el: Update maintainer: field.
 
 1998-02-26  SL Baur  <steve@altair.xemacs.org>
 
-        * filladapt.el: Version 2.12 courtesy of Kyle Jones.
+	* filladapt.el: Version 2.12 courtesy of Kyle Jones.
 
 1998-02-25  SL Baur  <steve@altair.xemacs.org>
 
-        * xrdb-mode.el (xrdb-submit-bug-report): Require reporter here
-        since we don't need it for bytecompiling.
+	* xrdb-mode.el (xrdb-submit-bug-report): Require reporter here
+	since we don't need it for bytecompiling.
 
 1998-01-25  SL Baur  <steve@altair.xemacs.org>
 
-        * Makefile (VERSION): Update to package standard 1.0.
-        * package-info.in: Ditto.
+	* Makefile (VERSION): Update to package standard 1.0.
+	* package-info.in: Ditto.
 
 1998-01-12  SL Baur  <steve@altair.xemacs.org>
 
-        * Makefile: Update to newer package interface.
-        (ELCS): Add nroff-mode, scribe and ws-mode.
+	* Makefile: Update to newer package interface.
+	(ELCS): Add nroff-mode, scribe and ws-mode.
 
 1998-01-03  SL Baur  <steve@altair.xemacs.org>
 
-        * Makefile: Update to newer package interface.
+	* Makefile: Update to newer package interface.
 
 1997-12-24  SL Baur  <steve@altair.xemacs.org>
 
-        * whitespace-mode.el: Strip usage of adapt.el.
+	* whitespace-mode.el: Strip usage of adapt.el.
 
-        * xrdb-mode.el: Don't require 'reporter at bytecompile time.
+	* xrdb-mode.el: Don't require 'reporter at bytecompile time.
 
-        * Makefile: Created.
+	* Makefile: Created.
 ;;; folding.el --- A folding-editor-like minor mode.
 
-;; Copyright (C) 1994-2004
+;; Copyright (C) 2002-2006
+;;	     Jari Aalto
+;; Copyright (C) 1994-2001
 ;;           Jari Aalto, Anders Lindgren.
 ;; Copyright (C) 1992, 1993
 ;;           Jamie Lokier, All rights reserved.
 (require 'easymenu)
 
 (defvar folding-package-url-location
-  "http://www.csd.uu.se/~andersl/emacs.shtml - Latest included in XEmacs"
+  "Latest folding is available at XEmacs CVS server
+  cvs -d :pserver:cvs@cvs.xemacs.org:/pack/xemacscvs \
+      co -d xemacs-text-modes \
+      XEmacs/packages/xemacs-packages/text-modes"
   "Location where to get folding.
   `folding-insert-advertise-folding-mode'.")
 
 (eval-and-compile
   (require 'advice)
   (defvar folding-xemacs-p (or (boundp 'xemacs-logo)
-                               (featurep 'xemacs))
+			       (featurep 'xemacs))
     "Folding determines which emacs version it is running. t if Xemacs.")
   ;;  loading overlay.el package removes some byte compiler whinings.
   ;;  By default folding does not use overlay code.
   (if folding-xemacs-p
       (or (fboundp 'overlay-start)  ;; Already loaded
-          (load "overlay" 'noerr)   ;; No? Try loading it.
-          (message "\
+	  (load "overlay" 'noerr)   ;; No? Try loading it.
+	  (message "\
 ** folding.el: XEmacs 19.15+ has package overlay.el, try to get it.
-               This is only warning. Folding does not use overlays by
-               default.  You can safely ignore possible overlay byte
-               compilation error
-               messages."))))
+	       This is only warning. Folding does not use overlays by
+	       default.  You can safely ignore possible overlay byte
+	       compilation error
+	       messages."))))
 
 (eval-when-compile
 
   (when nil ;; Disabled 2000-01-05
     ;; While byte compiling
     (if (string= (buffer-name) " *Compiler Input*")
-        (progn
-          (message "** folding.el:\
+	(progn
+	  (message "** folding.el:\
  Info, Ignore [X]Emacs's missing motion/event/posn functions calls"))))
 
   ;; ARGS: (symbol variable-p library)
     "Set folding flag for `find-file-noselect' to open all folds."
     (let ((file (ad-get-arg 2)))
       (when file
-        (message "FILE %s" file)
-        (put 'find-file-noselect 'folding file)))
+	(message "FILE %s" file)
+	(put 'find-file-noselect 'folding file)))
     ad-do-it
     (put 'find-file-noselect 'folding nil))
 
   (defun folding-find-file-noselect ()
     (let* ((file   (get 'find-file-noselect 'folding))
-           (buffer (and file
-                        ;; It may be absolute path name, file.el,
-                        ;; or just "file".
-                        (or (find-buffer-visiting file)
-                            (get-buffer file)
-                            (get-buffer (concat file ".el"))))))
+	   (buffer (and file
+			;; It may be absolute path name, file.el,
+			;; or just "file".
+			(or (find-buffer-visiting file)
+			    (get-buffer file)
+			    (get-buffer (concat file ".el"))))))
       (when buffer
-        (with-current-buffer buffer
-          (when (symbol-value 'folding-mode) ;; Byte compiler silencer
-            (turn-off-folding-mode))))))
+	(with-current-buffer buffer
+	  (when (symbol-value 'folding-mode) ;; Byte compiler silencer
+	    (turn-off-folding-mode))))))
 
   ;;  See find.func.el  find-function-search-for-symbol
   ;;  Make C-h f  and mouse-click work to jump to a file. Folding mode
 
 (eval-and-compile
   (when (and (not folding-xemacs-p)
-             (memq (symbol-value 'window-system) '(win32 w32)) ; NT Emacs
-             (string< emacs-version "20.4")) ;at least in 19.34 .. 20.3.1
+	     (memq (symbol-value 'window-system) '(win32 w32)) ; NT Emacs
+	     (string< emacs-version "20.4")) ;at least in 19.34 .. 20.3.1
 
   (unless (fboundp 'char-equal)
     (defalias 'char-equal  'equal))
     (defun subst-char (str char to-char)
       "Replace in STR every CHAR with TO-CHAR."
       (let ((len   (length str))
-            (ret   (copy-sequence str)))     ;because 'aset' is destructive
-        (while (> len 0)
-          (if (char-equal (aref str (1- len)) char)
-              (aset ret (1- len) to-char))
-          (decf len))
-        ret)))
+	    (ret   (copy-sequence str)))     ;because 'aset' is destructive
+	(while (> len 0)
+	  (if (char-equal (aref str (1- len)) char)
+	      (aset ret (1- len) to-char))
+	  (decf len))
+	ret)))
 
   (defadvice kill-new (around folding-win32-fix-selective-display act)
     "In selective display, convert each C-m to C-a. See `current-kill'."
     (let* ((string (ad-get-arg 0)))
       (when (and selective-display (string-match "\C-m" (or string "")))
-        (setq string (subst-char string ?\C-m ?\C-a)))
+	(setq string (subst-char string ?\C-m ?\C-a)))
       ad-do-it))
 
   (defadvice current-kill (around folding-win32-fix-selective-display act)
     ad-do-it
     (let* ((string ad-return-value))
       (when (and selective-display (string-match "\C-a" (or string "")))
-        (setq string (subst-char string ?\C-a ?\C-m))
-        (setq ad-return-value string))))))
+	(setq string (subst-char string ?\C-a ?\C-m))
+	(setq ad-return-value string))))))
 
 (defvar folding-mode)  ;; Byte Compiler silencer
 
        (symbol-function 'mode-motion-highlight-internal)
        event
        (function
-        (lambda ()
-          (beginning-of-line)
-          (if (folding-mark-look-at)
-              (search-forward-regexp "^[ \t]*"))))
+	(lambda ()
+	  (beginning-of-line)
+	  (if (folding-mark-look-at)
+	      (search-forward-regexp "^[ \t]*"))))
        (function
-        (lambda ()
-          (if (folding-mark-look-at)
-              (end-of-line)))))))
+	(lambda ()
+	  (if (folding-mark-look-at)
+	      (end-of-line)))))))
   (require 'mode-motion)
   (add-hook 'mode-motion-hook 'folding-mode-motion-highlight-fold 'at-end))
 
 (defun folding-bind-terminal-keys ()
   "In non-window system, rebind C - f and C - b as folding-{forward,backward}-char."
   (unless (or (and (boundp 'window-system)       ;; Emacs
-                 (symbol-value 'window-system))  ;; Byte compiler silencer
-            (and (fboundp 'console-type)         ;; XEmacs
-                 (let ((val (fboundp 'console-type)))
-                   (not (eq 'tty val)))))
+		 (symbol-value 'window-system))  ;; Byte compiler silencer
+	    (and (fboundp 'console-type)         ;; XEmacs
+		 (let ((val (fboundp 'console-type)))
+		   (not (eq 'tty val)))))
     (define-key folding-mode-map "\C-f" 'folding-forward-char)
     (define-key folding-mode-map "\C-b" 'folding-backward-char)))
 
     (let ()       ;; (oldposn (point))
       ad-do-it
       (if (and folding-mode
-               (or (folding-point-folded-p (point))
-                   (<= (point) (point-min-marker))
-                   (>= (point) (point-max-marker))))
-          (let ((line (ad-get-arg 0)))
-            (if folding-shift-in-on-goto
-                (progn
-                  (folding-show-all)
-                  (goto-char 1)
-                  (and (< 1 line)
-                       (not (folding-use-overlays-p))
-                       (re-search-forward "[\n\C-m]" nil 0 (1- line)))
-                  (let ((goal (point)))
-                    (while (prog2 (beginning-of-line)
-                               (if (eq folding-shift-in-on-goto 'show)
-                                   (progn
-                                     (folding-show-current-entry t t)
-                                     (folding-point-folded-p goal))
-                                 (folding-shift-in t))
-                             (goto-char goal)))
-                    (folding-narrow-to-region (point-min) (point-max) t)))
-              (if (or folding-stack (folding-point-folded-p (point)))
-                  (folding-open-buffer))))))))
+	       (or (folding-point-folded-p (point))
+		   (<= (point) (point-min-marker))
+		   (>= (point) (point-max-marker))))
+	  (let ((line (ad-get-arg 0)))
+	    (if folding-shift-in-on-goto
+		(progn
+		  (folding-show-all)
+		  (goto-char 1)
+		  (and (< 1 line)
+		       (not (folding-use-overlays-p))
+		       (re-search-forward "[\n\C-m]" nil 0 (1- line)))
+		  (let ((goal (point)))
+		    (while (prog2 (beginning-of-line)
+			       (if (eq folding-shift-in-on-goto 'show)
+				   (progn
+				     (folding-show-current-entry t t)
+				     (folding-point-folded-p goal))
+				 (folding-shift-in t))
+			     (goto-char goal)))
+		    (folding-narrow-to-region (point-min) (point-max) t)))
+	      (if (or folding-stack (folding-point-folded-p (point)))
+		  (folding-open-buffer))))))))
 
 ;;}}}
 
   "*Function or list of functions used to define keys for Folding mode.
 Possible values are:
   folding-bind-default-key
-        The standard keymap.
+	The standard keymap.
 
   `folding-bind-backward-compatible-keys'
-        Keys used by older versions of Folding mode. This function
-        does not conform to Emacs 19.29 style conversions concerning
-        key bindings. The prefix key is C - c
+	Keys used by older versions of Folding mode. This function
+	does not conform to Emacs 19.29 style conversions concerning
+	key bindings. The prefix key is C - c
 
   `folding-bind-outline-compatible-keys'
-        Define keys compatible with Outline mode.
+	Define keys compatible with Outline mode.
 
   `folding-bind-foldout-compatible-keys'
-        Define some extra keys compatible with Foldout.
+	Define some extra keys compatible with Foldout.
 
 All except `folding-bind-backward-compatible-keys' used the value of
 the variable `folding-mode-prefix-key' as prefix the key.
 Table form:
   '( (LOGICAL-ACTION  CMD) (..) ..)"
   :type '(repeat
-          (symbol   :tag "logical action")
-          (function :tag "callback"))
+	  (symbol   :tag "logical action")
+	  (function :tag "callback"))
   :group 'folding)
 
 ;;; ... ... ... ... ... ... ... ... ... ... ... ... ... ..... &v-marks ...
   (let ((elt (assq 'folding-mode minor-mode-map-alist)))
     ;;  Always remove old map before adding new definitions.
     (if elt
-        (setq minor-mode-map-alist
-              (delete elt minor-mode-map-alist)))
+	(setq minor-mode-map-alist
+	      (delete elt minor-mode-map-alist)))
     (push (cons 'folding-mode folding-mode-map) minor-mode-map-alist))
   ;;  Update minor-mode-alist
   (or (assq 'folding-mode minor-mode-alist)
   "Uninstall keymaps."
   (let ((elt (assq 'folding-mode minor-mode-map-alist)))
     (if elt
-        (setq minor-mode-map-alist
-              (delete elt minor-mode-map-alist)))
+	(setq minor-mode-map-alist
+	      (delete elt minor-mode-map-alist)))
     (if (setq elt (assq 'folding-mode minor-mode-alist))
-        (setq minor-mode-alist
-              (delete elt minor-mode-alist)))
+	(setq minor-mode-alist
+	      (delete elt minor-mode-alist)))
     (folding-uninstall-hooks)))
 
 (defun folding-install (&optional uninstall)
     (with-current-buffer buffer
       (goto-char (point-min))
       (when (or folding-mode
-                ;;  To be sure, check this at the same time
-                ;;  Somebody may have just done
-                ;;  (setq folding-mode nil), which is bad thing.
-                ;;  Setting variable won't restore the buffer.
-                (re-search-forward "{{{" nil t))
-        (turn-off-folding-mode)))))
+		;;  To be sure, check this at the same time
+		;;  Somebody may have just done
+		;;  (setq folding-mode nil), which is bad thing.
+		;;  Setting variable won't restore the buffer.
+		(re-search-forward "{{{" nil t))
+	(turn-off-folding-mode)))))
 
 ;;}}}
 ;;{{{ code: misc
   (interactive)
   (let* (elt)
     (unless (setq elt (assq (or mode major-mode)
-                            folding-mode-marks-alist))
+			    folding-mode-marks-alist))
       (error "Folding error: mode is not in `folding-mode-marks-alist'"))
     (list (nth 1 elt) (nth 2 elt) (nth 3 elt))))
 
 Return:
 
   0 1       numberp, line has fold begin mark
-            0 = closed, 1 = open,
-            11 = open, we're inside fold, and this is top marker
+	    0 = closed, 1 = open,
+	    11 = open, we're inside fold, and this is top marker
 
   'end      end mark
 
 
   nil       no fold marks .."
   (let* (case-fold-search
-         (marks  (folding-get-mode-marks))
-         (stack  folding-stack)
-         (bm     (regexp-quote (nth 0 marks))) ;begin mark
-         (em     (concat "^[ \t\n]*" (regexp-quote  (nth 1 marks))))
-         (bm-re  (concat
-                  (concat "^[ \t\n]*" bm)
-                  (if (and nil
-                           (string=
-                            " " (substring (nth 0 marks)
-                                           (length (nth 1 marks)))))
-                      ;; Like "}}} *"
-                      "*"
-                    "")))
-         ret
-         point)
+	 (marks  (folding-get-mode-marks))
+	 (stack  folding-stack)
+	 (bm     (regexp-quote (nth 0 marks))) ;begin mark
+	 (em     (concat "^[ \t\n]*" (regexp-quote  (nth 1 marks))))
+	 (bm-re  (concat
+		  (concat "^[ \t\n]*" bm)
+		  (if (and nil
+			   (string=
+			    " " (substring (nth 0 marks)
+					   (length (nth 1 marks)))))
+		      ;; Like "}}} *"
+		      "*"
+		    "")))
+	 ret
+	 point)
     (save-excursion
       (beginning-of-line)
       (cond
        ((looking-at bm-re)
-        (setq point (point))
-        (cond
-         ((looking-at (concat "^[ \t\n]*" bm "[^\r\n]*\r"))  ;; closed
-          (setq ret 0))
-         (t                                          ;; open fold marker
-          (goto-char (point-min))
-          (cond
-           ((and stack                               ;; we're inside fold
-                 ;;  allow spaces
-                 (looking-at (concat "[ \t\n]*" bm)))
-            (setq ret 11))
-           (t
-            (setq ret 1))))))
+	(setq point (point))
+	(cond
+	 ((looking-at (concat "^[ \t\n]*" bm "[^\r\n]*\r"))  ;; closed
+	  (setq ret 0))
+	 (t                                          ;; open fold marker
+	  (goto-char (point-min))
+	  (cond
+	   ((and stack                               ;; we're inside fold
+		 ;;  allow spaces
+		 (looking-at (concat "[ \t\n]*" bm)))
+	    (setq ret 11))
+	   (t
+	    (setq ret 1))))))
        ((looking-at em)
-        (setq point (point))
-        ;; - The stack is a list if we've entered inside fold. There
-        ;;   is no text after fold END mark
-        ;; - At bol  ".*\n[^\n]*" doesn't work but "\n[^\n]*" at eol does??
-        (cond
-         ((progn
-            (end-of-line)
-            (or (and stack (eobp))      ;normal ending
-                (and stack              ;empty newlines only, no text ?
-                     (not (looking-at "\n[^ \t\n]*")))))
-          (setq ret 'end-in))
-         (t                             ;all rest are newlines
-          (setq ret 'end))))))
+	(setq point (point))
+	;; - The stack is a list if we've entered inside fold. There
+	;;   is no text after fold END mark
+	;; - At bol  ".*\n[^\n]*" doesn't work but "\n[^\n]*" at eol does??
+	(cond
+	 ((progn
+	    (end-of-line)
+	    (or (and stack (eobp))      ;normal ending
+		(and stack              ;empty newlines only, no text ?
+		     (not (looking-at "\n[^ \t\n]*")))))
+	  (setq ret 'end-in))
+	 (t                             ;all rest are newlines
+	  (setq ret 'end))))))
     (cond
      ((and mode point)
       (goto-char point)
   `folding-behave-table'"
   (let* ((elt (assoc action folding-behave-table)))
     (if elt
-        (funcall (nth 1 elt) event)
+	(funcall (nth 1 elt) event)
       (error "Folding mode (folding-act): Unknown action %s" action))))
 
 (defun folding-region-open-close (beg end &optional close)
   "Open all folds inside region BEG END. Close if optional CLOSE is non-nil."
   (interactive "r\nP")
   (let* ((func (if (null close)
-                   'folding-show-current-entry
-                 'folding-hide-current-entry))
-         tmp)
+		   'folding-show-current-entry
+		 'folding-hide-current-entry))
+	 tmp)
     (save-excursion
       ;;   make sure the beg is first.
       (if (> beg end)                  ;swap order
-          (setq  tmp beg  beg end   end tmp))
+	  (setq  tmp beg  beg end   end tmp))
       (goto-char beg)
       (while (and
-              ;;   the folding-show-current-entry/hide will move point
-              ;;   to beg-of-line So we must move to the end of
-              ;;   line to continue search.
-              (if (and close
-                       (eq 0 (folding-mark-look-at))) ;already closed ?
-                  t
-                (funcall func)
-                (end-of-line)
-                t)
-              (folding-next-visible-heading)
-              (< (point) end))))))
+	      ;;   the folding-show-current-entry/hide will move point
+	      ;;   to beg-of-line So we must move to the end of
+	      ;;   line to continue search.
+	      (if (and close
+		       (eq 0 (folding-mark-look-at))) ;already closed ?
+		  t
+		(funcall func)
+		(end-of-line)
+		t)
+	      (folding-next-visible-heading)
+	      (< (point) end))))))
 
 (defun fold-marks-kill ()
   "If over fold, open fold and kill beginning and end fold marker.
   (interactive)
   (if (not (folding-mark-look-at))
       (when (interactive-p)
-        (message "Folding: Cursor not over fold. Can't removed fold marks.")
-        nil)
+	(message "Folding: Cursor not over fold. Can't removed fold marks.")
+	nil)
     (multiple-value-bind (beg end)
-        (folding-show-current-entry)
+	(folding-show-current-entry)
       (let* ((kill-whole-line t))
-        ;;  must be done in this order, because point moves after kill.
-        (goto-char end)
-        (beginning-of-line)
-        (kill-line)
-        (goto-char beg)
-        (beginning-of-line)
-        (kill-line)
-        ;; Return status
-        t))))
+	;;  must be done in this order, because point moves after kill.
+	(goto-char end)
+	(beginning-of-line)
+	(kill-line)
+	(goto-char beg)
+	(beginning-of-line)
+	(kill-line)
+	;; Return status
+	t))))
 
 (defun folding-hide-current-subtree ()
   "Call `folding-show-current-subtree' with argument 'hide."
 Point must be over beginning fold mark."
   (interactive "P")
   (let* ((stat  (folding-mark-look-at 'move))
-         (beg   (point))
-         end)
+	 (beg   (point))
+	 end)
     (cond
      ((memq stat '(0 1 11))             ;It's BEG fold
       (when (eq 0 stat)                 ;it was closed
-        (folding-show-current-entry)
-        (goto-char beg))                ;folding-pick-move needs point at fold
+	(folding-show-current-entry)
+	(goto-char beg))                ;folding-pick-move needs point at fold
       (save-excursion
-        (if (folding-pick-move)
-            (setq end (point))))
+	(if (folding-pick-move)
+	    (setq end (point))))
       (if (and beg end)
-          (folding-region-open-close beg end hide)))
+	  (folding-region-open-close beg end hide)))
      (t
       (if (interactive-p)
-          (message "point is not at fold beginning."))))))
+	  (message "point is not at fold beginning."))))))
 
 (defun folding-display-name ()
   "Show current active fold name."
   (interactive)
   (let* ((pos    (folding-find-folding-mark))
-         name)
+	 name)
     (when pos
       (save-excursion
-        (goto-char pos)
-        (if (looking-at ".*[{]+")       ;Drop "{" mark away.
-            (setq pos (match-end 0)))
-        (setq name (buffer-substring
-                    pos
-                    (progn
-                      (end-of-line)
-                      (point))))))
+	(goto-char pos)
+	(if (looking-at ".*[{]+")       ;Drop "{" mark away.
+	    (setq pos (match-end 0)))
+	(setq name (buffer-substring
+		    pos
+		    (progn
+		      (end-of-line)
+		      (point))))))
     (if name
-        (message (format "fold:%s" name)))))
+	(message (format "fold:%s" name)))))
 
 ;;}}}
 ;;{{{ code: events
     (let* ((el (funcall (symbol-function 'event-start) event)))
       (cond
        ((eq act 'mouse-point)
-        (nth 1 el))                     ;is there macro for this ?
+	(nth 1 el))                     ;is there macro for this ?
        ((eq act 'window)
-        (funcall (symbol-function 'posn-window) el))
+	(funcall (symbol-function 'posn-window) el))
        ((eq act 'col-row)
-        (funcall (symbol-function 'posn-col-row) el))
+	(funcall (symbol-function 'posn-col-row) el))
        (t
-        (error "Unknown request" act)))))
+	(error "Unknown request" act)))))
 
    (folding-xemacs-p
     (cond
      ;; Must be tested! (However, it's not used...)
      ((eq act 'col-row)
       (list (funcall (symbol-function 'event-x) event)
-            (funcall (symbol-function 'event-y) event)))
+	    (funcall (symbol-function 'event-y) event)))
      (t
       (error "Unknown request" act))))
    (t
   "Return mouse's working point. Optional EVENT is mouse click.
 When used on XEmacs, return nil if no character was under the mouse."
   (if (or (folding-mouse-yank-at-p)
-          (null event))
+	  (null event))
       (point)
     (folding-event-posn 'mouse-point event)))
 
     ;; `folding-calling-original' is global
     (setq folding-calling-original t)
     (unwind-protect
-        (progn
-          (or event
-              (setq event last-input-event))
-          (let (mouse-key)
-            (cond
-             ((not folding-xemacs-p)
-              (setq mouse-key (make-vector 1 (car-safe event))))
-             (folding-xemacs-p
-              (setq mouse-key
-                    (vector
-                     (append
-                      (event-modifiers event)
-                      (list (intern
-                             (format "button%d"
-                                     (funcall
-                                      (symbol-function 'event-button)
-                                      event))))))))
-             (t
-              (error "This version of Emacs can't handle events.")))
-            ;; Test string: http://www.csd.uu.se/~andersl
-            ;;              andersl A T csd uu se
-            ;; (I have `ark-goto-url' bound to the same key as
-            ;; this function.)
-            ;;
-            ;; turn off folding, so that we can see the real
-            ;; function behind it.
-            ;;
-            ;; We have to restore the current buffer, otherwise the
-            ;; let* won't be able to restore the old value of
-            ;; folding-mode. In my environment, I have bound a
-            ;; function which starts mail when I click on an e-mail
-            ;; address. When returning, the current buffer has
-            ;; changed.
-            (let* ((folding-mode nil)
-                   (orig-buf (current-buffer))
-                   (orig-func (key-binding mouse-key)))
-              ;; call only if exist
-              (when orig-func
-                ;; Check if the original function has arguments. If
-                ;; it does, call it with the event as argument.
-                (unwind-protect
-                    (progn
-                      (setq this-command orig-func)
-                      (call-interactively orig-func)
+	(progn
+	  (or event
+	      (setq event last-input-event))
+	  (let (mouse-key)
+	    (cond
+	     ((not folding-xemacs-p)
+	      (setq mouse-key (make-vector 1 (car-safe event))))
+	     (folding-xemacs-p
+	      (setq mouse-key
+		    (vector
+		     (append
+		      (event-modifiers event)
+		      (list (intern
+			     (format "button%d"
+				     (funcall
+				      (symbol-function 'event-button)
+				      event))))))))
+	     (t
+	      (error "This version of Emacs can't handle events.")))
+	    ;; Test string: http://www.csd.uu.se/~andersl
+	    ;;              andersl A T csd uu se
+	    ;; (I have `ark-goto-url' bound to the same key as
+	    ;; this function.)
+	    ;;
+	    ;; turn off folding, so that we can see the real
+	    ;; function behind it.
+	    ;;
+	    ;; We have to restore the current buffer, otherwise the
+	    ;; let* won't be able to restore the old value of
+	    ;; folding-mode. In my environment, I have bound a
+	    ;; function which starts mail when I click on an e-mail
+	    ;; address. When returning, the current buffer has
+	    ;; changed.
+	    (let* ((folding-mode nil)
+		   (orig-buf (current-buffer))
+		   (orig-func (key-binding mouse-key)))
+	      ;; call only if exist
+	      (when orig-func
+		;; Check if the original function has arguments. If
+		;; it does, call it with the event as argument.
+		(unwind-protect
+		    (progn
+		      (setq this-command orig-func)
+		      (call-interactively orig-func)
 ;;; #untested, but included here for further reference
 ;;;                 (cond
 ;;;                  ((not (string-match "mouse" (symbol-name orig-func)))
 ;;;                      (funcall orig-func event)
 ;;;                      ))
 ;;;
-                      )
-                  (set-buffer orig-buf))))))
+		      )
+		  (set-buffer orig-buf))))))
       ;; This is always executed, even if the above generates an error.
       (setq folding-calling-original nil))))
 
 `folding-mouse-yank-at-point'."
   (interactive "e")
   (let* (;;  - Get mouse cursor point, or point
-         (point (folding-mouse-point event))
-         state)
+	 (point (folding-mouse-point event))
+	 state)
     (if (null point)
-        ;; The user didn't click on any text.
-        (folding-act 'other event)
+	;; The user didn't click on any text.
+	(folding-act 'other event)
       (save-excursion
-        (goto-char point)
-        (setq state (folding-mark-look-at)))
+	(goto-char point)
+	(setq state (folding-mark-look-at)))
       (cond
        ((eq state 0)
-        (folding-act 'open event))
+	(folding-act 'open event))
        ((eq state 1)
-        (folding-act 'close event))
+	(folding-act 'close event))
        ((eq state 11)
-        (folding-act 'up event))
+	(folding-act 'up event))
        ((eq 'end state)
-        (folding-act 'close))
+	(folding-act 'close))
        ((eq state 'end-in)
-        (folding-act 'up event))
+	(folding-act 'up event))
        (t
-        (folding-act 'other event))))))
+	(folding-act 'other event))))))
 
 ;;; FIXME: #not used, the pick move handles this too
 (defun folding-mouse-move (event)
 taken."
   (interactive "e")
   (let* (;;  - Get mouse cursor point, or point
-         (point (folding-mouse-point event))
-         state)
+	 (point (folding-mouse-point event))
+	 state)
     (save-excursion
       (goto-char point)
       (beginning-of-line)
 taken."
   (interactive "e")
   (let* (;;  - Get mouse cursor point, or point
-         (point (folding-mouse-point event))
-         state)
+	 (point (folding-mouse-point event))
+	 state)
     (save-excursion
       (goto-char point)
       (setq state (folding-mark-look-at)))
      ((not (null state))
       (goto-char point)
       (if (= point
-             (save-excursion (beginning-of-line) (point)))
-          (folding-previous-visible-heading)
-        (folding-pick-move)))
+	     (save-excursion (beginning-of-line) (point)))
+	  (folding-previous-visible-heading)
+	(folding-pick-move)))
      (t
       (folding-mouse-call-original event)))))
 
       (kill-local-variable 'folding-mode-string)
     (make-local-variable 'folding-mode-string)
     (setq folding-mode-string
-          (if (eq 'folded (car folding-stack))
-              (concat
-               folding-inside-string "1" folding-inside-mode-name)
-            (concat
-             folding-inside-string
-             (int-to-string (length folding-stack))
-             folding-inside-mode-name)))))
+	  (if (eq 'folded (car folding-stack))
+	      (concat
+	       folding-inside-string "1" folding-inside-mode-name)
+	    (concat
+	     folding-inside-string
+	     (int-to-string (length folding-stack))
+	     folding-inside-mode-name)))))
 
 (defun folding-clear-stack ()
   "Clear the fold stack, and release all the markers it refers to."
 function. Change the variable to use your own scheme."
 
   (or (let ((file (get 'find-file-noselect 'folding)))
-        ;;  When a file reference is "pushed" is a C-h v buffer that says:
-        ;;  test is a Lisp function in `~/foo/tmp/test.el' A flag gets set
-        ;;  (see adviced code) and we must not fold this buffer, because
-        ;;  it will be immediately searched.
-        (and file
-             (not (string-match (regexp-quote file)
-                                (or buffer-file-name "")))))
+	;;  When a file reference is "pushed" is a C-h v buffer that says:
+	;;  test is a Lisp function in `~/foo/tmp/test.el' A flag gets set
+	;;  (see adviced code) and we must not fold this buffer, because
+	;;  it will be immediately searched.
+	(and file
+	     (not (string-match (regexp-quote file)
+				(or buffer-file-name "")))))
       ;;  Do not fold these files
       (null (string-match folding-mode-hook-no-regexp (buffer-name)))))
 
 
 See also `folding-mode-add-find-file-hook'."
    (let* ((check-fold folding-check-folded-file-function)
-          (allow-fold folding-check-allow-folding-function))
+	  (allow-fold folding-check-allow-folding-function))
      ;;  Turn mode on only if it's allowed
      (if (funcall allow-fold)
-         (or (and (and check-fold (funcall check-fold))
-                  (folding-mode 1))
-             (and (assq 'folded-file (buffer-local-variables))
-                  folded-file
-                  (folding-mode 1)
-                  (kill-local-variable 'folded-file)))
+	 (or (and (and check-fold (funcall check-fold))
+		  (folding-mode 1))
+	     (and (assq 'folded-file (buffer-local-variables))
+		  folded-file
+		  (folding-mode 1)
+		  (kill-local-variable 'folded-file)))
        ;; In all other cases, unfold buffer.
        (if folding-mode
-           (folding-mode -1)))))
+	   (folding-mode -1)))))
 
 ;;;###autoload
 (defun folding-mode-add-find-file-hook ()
 This function turns on the folding mode if it is not activated.
 It prevents 'binary pollution' upon save."
   (let* ((check-func  folding-check-folded-file-function)
-          (no-re      folding-mode-hook-no-regexp)
-          (bn         (or (buffer-name) "")))
+	  (no-re      folding-mode-hook-no-regexp)
+	  (bn         (or (buffer-name) "")))
     (if (and (not       (string-match no-re bn))
-             (boundp    'folding-mode)
-             (null      folding-mode)
-             (and check-func (funcall check-func)))
-        (progn
-          ;;  When folding mode is turned on it also 'folds' whole
-          ;;  buffer... can't avoid that, since it's more important
-          ;;  to save safely
-          (folding-mode 1)))
+	     (boundp    'folding-mode)
+	     (null      folding-mode)
+	     (and check-func (funcall check-func)))
+	(progn
+	  ;;  When folding mode is turned on it also 'folds' whole
+	  ;;  buffer... can't avoid that, since it's more important
+	  ;;  to save safely
+	  (folding-mode 1)))
     ;; hook returns nil, good habit
     nil))
 
 (defun folding-check-folded ()
   "Function to determine if this file is in folded form."
   (let* (;;  Could use folding-top-regexp , folding-bottom-regexp ,
-         ;;  folding-regexp But they are not available at load time.
-         (folding-re1 "^.?.?.?{{{")
-         (folding-re2 "[\r\n].*}}}"))
+	 ;;  folding-regexp But they are not available at load time.
+	 (folding-re1 "^.?.?.?{{{")
+	 (folding-re2 "[\r\n].*}}}"))
     (save-excursion
       (goto-char (point-min))
       ;;  If we found both, we assume file is folded
       (and (re-search-forward folding-re1 nil t)
-           ;; if file is folded, there are \r's
-           (search-forward "\r" nil t)
-           (re-search-forward folding-re2 nil t)))))
+	   ;; if file is folded, there are \r's
+	   (search-forward "\r" nil t)
+	   (re-search-forward folding-re2 nil t)))))
 
 ;;}}}
 
   (let* ((function 'font-lock-add-keywords))
     (when (fboundp function)
       (funcall function
-               mode
-               (folding-font-lock-keywords mode))
+	       mode
+	       (folding-font-lock-keywords mode))
       ;; In order to see new keywords font lock must be restarted.
       (dolist (buffer (buffer-list))
-        (with-current-buffer buffer
-          (when (and (eq major-mode mode)
-                     (or font-lock-mode
-                         ;;  Hide variable from byte compiler.
-                         (let ((sym 'global-font-lock-mode))
-                           (and (boundp sym)
-                                (symbol-value sym)))))
-            ;; #todo: should we use font-lock-fontify-buffer instead?
-            (font-lock-mode -1)
-            (font-lock-mode 1)))))))
+	(with-current-buffer buffer
+	  (when (and (eq major-mode mode)
+		     (or font-lock-mode
+			 ;;  Hide variable from byte compiler.
+			 (let ((sym 'global-font-lock-mode))
+			   (and (boundp sym)
+				(symbol-value sym)))))
+	    ;; #todo: should we use font-lock-fontify-buffer instead?
+	    (font-lock-mode -1)
+	    (font-lock-mode 1)))))))
 
 
 (defun folding-font-lock-support ()
   (make-local-variable 'folding-bottom-regexp)
   (make-local-variable 'folding-regexp)
   (or (and (boundp 'folding-top-regexp)
-           folding-top-regexp
-           (boundp 'folding-bottom-regexp)
-           folding-bottom-regexp)
+	   folding-top-regexp
+	   (boundp 'folding-bottom-regexp)
+	   folding-bottom-regexp)
       (let ((folding-marks (assq major-mode
-                                 folding-mode-marks-alist)))
-        (if folding-marks
-            (setq folding-marks (cdr folding-marks))
-          (setq folding-marks '("{{{" "}}}")))
-        (apply 'folding-set-marks folding-marks))))
+				 folding-mode-marks-alist)))
+	(if folding-marks
+	    (setq folding-marks (cdr folding-marks))
+	  (setq folding-marks '("{{{" "}}}")))
+	(apply 'folding-set-marks folding-marks))))
 
 ;;;###autoload
 (defun turn-off-folding-mode ()
   (interactive)
 
   (let ((new-folding-mode
-         (if (not arg)
-             (not folding-mode)
-           (> (prefix-numeric-value arg) 0))))
+	 (if (not arg)
+	     (not folding-mode)
+	   (> (prefix-numeric-value arg) 0))))
     (or (eq new-folding-mode
-            folding-mode)
-        (if folding-mode
-            (progn
-              ;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ progn ^^^
-              ;; turn off folding
-              (if (null (folding-use-overlays-p))
-                  (setq selective-display nil))
-              (folding-clear-stack)
-              (folding-narrow-to-region nil nil)
-              (folding-subst-regions (list 1 (point-max)) ?\r ?\n)
-
-              ;; Restore "%n" (Narrow) in the mode line
-              (setq mode-line-format
-                    (mapcar
-                     (function
-                      (lambda (item)
-                        (if (equal item 'folding-narrow-placeholder)
-                            "%n" item)))
-                     mode-line-format)))
-          ;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ else ^^^
-          (cond
-           ((folding-use-overlays-p)
-            ;;  This may be Emacs specific; how about XEmacs?
-            ;;
-            ;; make line-move-ignore-invisible buffer local, matches
-            ;; outline.el, and the 21 pre-release gets upset if this is
-            ;; defined globally in shell buffer...
-            (make-local-variable 'line-move-ignore-invisible)
-            (setq  line-move-ignore-invisible t
-                   buffer-invisibility-spec   '((t . t))))
-           (t
-            (setq selective-display t)
-            (setq selective-display-ellipses t)))
-          (unless (assq 'folding-mode minor-mode-alist)
-            ;;  User has not run folding-install or he did call
-            ;;  folding-uninstall which completely wiped package out.
-            ;;  => anyway now he calls us, so be there for him
-            (folding-install))
-          (folding-keep-hooked) ;set hooks if not there
-          (widen)
-          (setq folding-narrow-overlays nil)
-          (folding-set-local-variables)
-          (folding-font-lock-support)
-          (unwind-protect
-              (let ((hook-symbol (intern-soft
-                                  (concat
-                                   (symbol-name major-mode)
-                                   "-folding-hook"))))
-                (run-hooks 'folding-mode-hook)
-                (and hook-symbol
-                     (run-hooks hook-symbol)))
-            (folding-set-mode-line))
-          (and folding-folding-on-startup
-               (if (or (interactive-p)
-                       arg
-                       inter)
-                   (folding-whole-buffer)
-                 (save-excursion
-                   (folding-whole-buffer))))
-          (folding-narrow-to-region nil nil t)
-          ;; Remove "%n" (Narrow) from the mode line
-          (setq mode-line-format
-                (mapcar
-                 (function
-                  (lambda (item)
-                    (if (equal item "%n")
-                        'folding-narrow-placeholder item)))
-                 mode-line-format))))
+	    folding-mode)
+	(if folding-mode
+	    (progn
+	      ;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ progn ^^^
+	      ;; turn off folding
+	      (if (null (folding-use-overlays-p))
+		  (setq selective-display nil))
+	      (folding-clear-stack)
+	      (folding-narrow-to-region nil nil)
+	      (folding-subst-regions (list 1 (point-max)) ?\r ?\n)
+
+	      ;; Restore "%n" (Narrow) in the mode line
+	      (setq mode-line-format
+		    (mapcar
+		     (function
+		      (lambda (item)
+			(if (equal item 'folding-narrow-placeholder)
+			    "%n" item)))
+		     mode-line-format)))
+	  ;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ else ^^^
+	  (cond
+	   ((folding-use-overlays-p)
+	    ;;  This may be Emacs specific; how about XEmacs?
+	    ;;
+	    ;; make line-move-ignore-invisible buffer local, matches
+	    ;; outline.el, and the 21 pre-release gets upset if this is
+	    ;; defined globally in shell buffer...
+	    (make-local-variable 'line-move-ignore-invisible)
+	    (setq  line-move-ignore-invisible t
+		   buffer-invisibility-spec   '((t . t))))
+	   (t
+	    (setq selective-display t)
+	    (setq selective-display-ellipses t)))
+	  (unless (assq 'folding-mode minor-mode-alist)
+	    ;;  User has not run folding-install or he did call
+	    ;;  folding-uninstall which completely wiped package out.
+	    ;;  => anyway now he calls us, so be there for him
+	    (folding-install))
+	  (folding-keep-hooked) ;set hooks if not there
+	  (widen)
+	  (setq folding-narrow-overlays nil)
+	  (folding-set-local-variables)
+	  (folding-font-lock-support)
+	  (unwind-protect
+	      (let ((hook-symbol (intern-soft
+				  (concat
+				   (symbol-name major-mode)
+				   "-folding-hook"))))
+		(run-hooks 'folding-mode-hook)
+		(and hook-symbol
+		     (run-hooks hook-symbol)))
+	    (folding-set-mode-line))
+	  (and folding-folding-on-startup
+	       (if (or (interactive-p)
+		       arg
+		       inter)
+		   (folding-whole-buffer)
+		 (save-excursion
+		   (folding-whole-buffer))))
+	  (folding-narrow-to-region nil nil t)
+	  ;; Remove "%n" (Narrow) from the mode line
+	  (setq mode-line-format
+		(mapcar
+		 (function
+		  (lambda (item)
+		    (if (equal item "%n")
+			'folding-narrow-placeholder item)))
+		 mode-line-format))))
     (setq folding-mode new-folding-mode)
     (if folding-mode
-        (easy-menu-add folding-mode-menu)
+	(easy-menu-add folding-mode-menu)
       (easy-menu-remove folding-mode-menu))))
 
 ;;}}}
   TOP           The topmost fold mark. Comment start + fold begin string.
   BOTTOM        The bottom fold mark Comment end + fold end string.
   SECONDARY     Usually the comment end indicator for the mode. This
-                is inserted by `folding-fold-region' after the fold top mark,
-                and is presumed to be put after the title of the fold.
+		is inserted by `folding-fold-region' after the fold top mark,
+		and is presumed to be put after the title of the fold.
 
 Example:
 
        secondary)
   (set (make-local-variable 'folding-top-regexp)
        (concat "\\(^\\|\r+\\)[ \t]*"
-               (regexp-quote folding-top-mark)))
+	       (regexp-quote folding-top-mark)))
   (set (make-local-variable 'folding-bottom-regexp)
        (concat "\\(^\\|\r+\\)[ \t]*"
-               (regexp-quote folding-bottom-mark)))
+	       (regexp-quote folding-bottom-mark)))
   (set (make-local-variable 'folding-regexp)
        (concat "\\(^\\|\r\\)\\([ \t]*\\)\\(\\("
-               (regexp-quote folding-top-mark)
-               "\\)\\|\\("
-               (regexp-quote folding-bottom-mark)
-               "[ \t]*\\(\\)\\($\\|\r\\)\\)\\)")))
+	       (regexp-quote folding-top-mark)
+	       "\\)\\|\\("
+	       (regexp-quote folding-bottom-mark)
+	       "[ \t]*\\(\\)\\($\\|\r\\)\\)\\)")))
 
 ;;}}}
 ;;{{{ code: movement
 Backward if DIRECTION is non-nil returns nil if not moved = no next marker."
   (interactive)
   (let* ((begin-mark (nth 0 (folding-get-mode-marks)))
-         case-fold-search)
+	 case-fold-search)
      (if direction
-         (re-search-backward (concat "^" (regexp-quote begin-mark)) nil t)
+	 (re-search-backward (concat "^" (regexp-quote begin-mark)) nil t)
        (re-search-forward  (concat "^" (regexp-quote begin-mark)) nil t))))
 
 (defun folding-previous-visible-heading ()
   nil
   point     position of fold mark"
   (let* (case-fold-search
-         (elt   (folding-get-mode-marks))
-         (bm    (regexp-quote (nth 0 elt))) ; markers defined for mode
-         (em    (regexp-quote (nth 1 elt))) ; markers defined for mode
-         (re    (concat "^" bm "\\|^" em ))
-         (count 0)
-         stat
-         moved)
+	 (elt   (folding-get-mode-marks))
+	 (bm    (regexp-quote (nth 0 elt))) ; markers defined for mode
+	 (em    (regexp-quote (nth 1 elt))) ; markers defined for mode
+	 (re    (concat "^" bm "\\|^" em ))
+	 (count 0)
+	 stat
+	 moved)
     (save-excursion
       (cond
        (end-fold
-        (folding-end-of-line)
-        ;; We must skip over inner folds
-        (while (and (null moved)
-                    (re-search-forward re nil t))
-          (setq stat (folding-mark-look-at))
-          (cond
-           ((symbolp stat)
-            (setq count (1- count))
-            (if (< count 0)             ;0 or less means no middle folds
-                (setq moved t)))
-           ((memq stat '(1 11))                 ;BEG fold
-            (setq count (1+ count))))) ;; end while
-        (when moved
-          (forward-char -3)
-          (setq moved (point))))
+	(folding-end-of-line)
+	;; We must skip over inner folds
+	(while (and (null moved)
+		    (re-search-forward re nil t))
+	  (setq stat (folding-mark-look-at))
+	  (cond
+	   ((symbolp stat)
+	    (setq count (1- count))
+	    (if (< count 0)             ;0 or less means no middle folds
+		(setq moved t)))
+	   ((memq stat '(1 11))                 ;BEG fold
+	    (setq count (1+ count))))) ;; end while
+	(when moved
+	  (forward-char -3)
+	  (setq moved (point))))
        (t
-        (while (and (null moved)
-                    (re-search-backward  re nil t))
-          (setq stat (folding-mark-look-at))
-          (cond
-           ((memq stat '(1 11))
-            (setq count (1- count))
-            (if (< count 0)             ;0 or less means no middle folds
-                (setq moved (point))))
-           ((symbolp stat)
-            (setq count (1+ count)))))
-        (when moved ;What's the result
-          (forward-char 3)
-          (setq moved (point))))))
+	(while (and (null moved)
+		    (re-search-backward  re nil t))
+	  (setq stat (folding-mark-look-at))
+	  (cond
+	   ((memq stat '(1 11))
+	    (setq count (1- count))
+	    (if (< count 0)             ;0 or less means no middle folds
+		(setq moved (point))))
+	   ((symbolp stat)
+	    (setq count (1+ count)))))
+	(when moved ;What's the result
+	  (forward-char 3)
+	  (setq moved (point))))))
     moved))
 
 (defun folding-pick-move ()
  t      if moved"
   (interactive)
   (let* (case-fold-search
-         (elt   (folding-get-mode-marks))
-         (bm    (nth 0 elt))              ; markers defined for mode
-         (stat  (folding-mark-look-at))
-         moved)
+	 (elt   (folding-get-mode-marks))
+	 (bm    (nth 0 elt))              ; markers defined for mode
+	 (stat  (folding-mark-look-at))
+	 moved)
     (cond
      ((eq 0 stat)                       ;closed fold
       (when (re-search-forward  (concat "^" (regexp-quote bm)) nil t)
-        (setq moved t)
-        (forward-char 3)))
+	(setq moved t)
+	(forward-char 3)))
      ((symbolp stat)                    ;End fold
       (setq moved (folding-find-folding-mark)))
      ((integerp stat)                   ;Beg fold
       (setq moved (folding-find-folding-mark 'end-fold))))
     (if (integerp moved)
-        (goto-char moved))
+	(goto-char moved))
     moved))
 
 ;;; Idea by Scott Evans <gse A T antisleep com>
   (if (eq arg 1)
       ;; Do it a faster way for arg = 1.
       (if (eq (following-char) ?\r)
-          (let ((saved (point))
-                (inhibit-quit t))
-            (end-of-line)
-            (if (not (eobp))
-                (forward-char)
-              (goto-char saved)
-              (error "End of buffer")))
-        ;; `forward-char' here will do its own error if (eobp).
-        (forward-char))
+	  (let ((saved (point))
+		(inhibit-quit t))
+	    (end-of-line)
+	    (if (not (eobp))
+		(forward-char)
+	      (goto-char saved)
+	      (error "End of buffer")))
+	;; `forward-char' here will do its own error if (eobp).
+	(forward-char))
     (if (> 0 (or arg (setq arg 1)))
-        (folding-backward-char (- arg))
+	(folding-backward-char (- arg))
       (let (goal saved)
-        (while (< 0 arg)
-          (skip-chars-forward "^\r" (setq goal (+ (point) arg)))
-          (if (eq goal (point))
-              (setq arg 0)
-            (if (eobp)
-                (error "End of buffer")
-              (setq arg (- goal 1 (point))
-                    saved (point))
-              (let ((inhibit-quit t))
-                (end-of-line)
-                (if (not (eobp))
-                    (forward-char)
-                  (goto-char saved)
-                  (error "End of buffer"))))))))))
+	(while (< 0 arg)
+	  (skip-chars-forward "^\r" (setq goal (+ (point) arg)))
+	  (if (eq goal (point))
+	      (setq arg 0)
+	    (if (eobp)
+		(error "End of buffer")
+	      (setq arg (- goal 1 (point))
+		    saved (point))
+	      (let ((inhibit-quit t))
+		(end-of-line)
+		(if (not (eobp))
+		    (forward-char)
+		  (goto-char saved)
+		  (error "End of buffer"))))))))))