mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-27 08:32:52 +00:00
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
Conflicts: lisp/ChangeLog
This commit is contained in:
commit
cca8003c4d
|
@ -11,6 +11,11 @@
|
|||
(org-clock-in): Use `org-clock-auto-clock-resolution' to determine
|
||||
whether or not to resolve Org buffers on clock in.
|
||||
|
||||
2009-10-26 Bastien Guerry <bzg@altern.org>
|
||||
|
||||
* org.el (org-mode-hook): Turn `org-mode-hook' into a customizable
|
||||
variable.
|
||||
|
||||
2009-10-25 Carsten Dominik <carsten.dominik@gmail.com>
|
||||
|
||||
* org-clock.el (org-clock-has-been-used): New variable.
|
||||
|
|
|
@ -137,6 +137,11 @@ With prefix arg HERE, insert it at point."
|
|||
:group 'hypermedia
|
||||
:group 'calendar)
|
||||
|
||||
(defcustom org-mode-hook nil
|
||||
"Mode hook for Org-mode, run after the mode was turned on."
|
||||
:group 'org
|
||||
:type 'hook)
|
||||
|
||||
(defcustom org-load-hook nil
|
||||
"Hook that is run after org.el has been loaded."
|
||||
:group 'org
|
||||
|
@ -3974,8 +3979,6 @@ This variable is set by `org-before-change-function'.
|
|||
"Every change indicates that a table might need an update."
|
||||
(setq org-table-may-need-update t))
|
||||
(defvar org-mode-map)
|
||||
(defvar org-mode-hook nil
|
||||
"Mode hook for Org-mode, run after the mode was turned on.")
|
||||
(defvar org-inhibit-startup nil) ; Dynamically-scoped param.
|
||||
(defvar org-agenda-keep-modes nil) ; Dynamically-scoped param.
|
||||
(defvar org-inhibit-logging nil) ; Dynamically-scoped param.
|
||||
|
|
Loading…
Reference in a new issue