summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-08-01 15:32:15 +0200
committerBastien Guerry <bzg@altern.org>2012-08-01 15:32:15 +0200
commit7024560981be658a9e2cbf0e311d7ec5543040d7 (patch)
treebbcad57b74e5239a3ee7f8edfbb98e1f3069dfd8
parent79ac009b581fd8fd83958531aa6be98d7c63e775 (diff)
downloadorg-mode-7024560981be658a9e2cbf0e311d7ec5543040d7.tar.gz
org.el: `org-self-insert-cluster-for-undo' now defaults to nil.
* org.el (org-version): Improve docstring. (org-self-insert-cluster-for-undo): The default value should be nil for Emacs >=24.1. See bug#11774. See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11774 for a discussion about this.
-rw-r--r--lisp/org.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 8c4cde7..25b9a23 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -206,7 +206,9 @@ identifier."
;;;###autoload
(defun org-version (&optional here full message)
"Show the org-mode version in the echo area.
-With prefix arg HERE, insert it at point."
+With prefix argument HERE, insert it at point.
+When FULL is non-nil, use a verbose version string.
+When MESSAGE is non-nil, display a message with the version."
(interactive "P")
(let* ((org-dir (ignore-errors (org-find-library-dir "org")))
(org-install-dir (ignore-errors (org-find-library-dir "org-install.el")))
@@ -1277,7 +1279,7 @@ See also the variable `org-table-auto-blank-field'."
(const :tag "on" t)
(const :tag "on, optimized" optimized)))
-(defcustom org-self-insert-cluster-for-undo t
+(defcustom org-self-insert-cluster-for-undo (version<= emacs-version "24.1")
"Non-nil means cluster self-insert commands for undo when possible.
If this is set, then, like in the Emacs command loop, 20 consecutive
characters will be undone together.