Просмотр исходного кода

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.
Bastien Guerry 13 лет назад
Родитель
Сommit
7024560981
1 измененных файлов с 4 добавлено и 2 удалено
  1. 4 2
      lisp/org.el

+ 4 - 2
lisp/org.el

@@ -206,7 +206,9 @@ identifier."
 ;;;###autoload
 ;;;###autoload
 (defun org-version (&optional here full message)
 (defun org-version (&optional here full message)
   "Show the org-mode version in the echo area.
   "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")
   (interactive "P")
   (let* ((org-dir         (ignore-errors (org-find-library-dir "org")))
   (let* ((org-dir         (ignore-errors (org-find-library-dir "org")))
 	 (org-install-dir (ignore-errors (org-find-library-dir "org-install.el")))
 	 (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" t)
 	  (const :tag "on, optimized" optimized)))
 	  (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.
   "Non-nil means cluster self-insert commands for undo when possible.
 If this is set, then, like in the Emacs command loop, 20 consecutive
 If this is set, then, like in the Emacs command loop, 20 consecutive
 characters will be undone together.
 characters will be undone together.