mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-23 07:48:34 +00:00
Code Releases Activity

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Browse source
This commit is contained in:
Carsten Dominik 2010-05-25 11:38:55 +02:00
parent d7e15f0c88 67b5a92c78
commit 31c14d58b6
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2010-05-24 Bastien Guerry <bzg@altern.org>
* org-timer.el (org-timer-set-timer): Fix bug about cancelling
timers.
2010-05-21 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-emph-re): Document the match groups.

7
lisp/org-src.el
View file

@ -644,8 +644,11 @@ the language, a switch telling if the content should be in a single line."
(setq buffer-file-name
(concat (buffer-file-name (marker-buffer org-edit-src-beg-marker))
"[" (buffer-name) "]"))
(set (if (featurep 'xemacs) 'write-contents-hooks 'write-contents-functions)
'(org-edit-src-save)))
(if (featurep 'xemacs)
(progn
(make-variable-buffer-local 'write-contents-hooks) ; needed only for 21.4
(setq write-contents-hooks '(org-edit-src-save)))
(setq write-contents-functions '(org-edit-src-save))))
(setq buffer-read-only t))))
(org-add-hook 'org-src-mode-hook 'org-src-mode-configure-edit-buffer)

3
lisp/org-timer.el
View file

@ -338,7 +338,8 @@ VALUE can be `on', `off', or `pause'."
(y-or-n-p "Replace current timer? "))
(not org-timer-current-timer))
(progn
(cancel-timer org-timer-current-timer)
(when org-timer-current-timer
(cancel-timer org-timer-current-timer))
(setq org-timer-current-timer
(run-with-timer
secs nil `(lambda ()