diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-06-05 06:30:25 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-06-05 06:30:25 +0200 |
| commit | d46e94f23fbbd522f2a017444b29f9f18203b4bc (patch) | |
| tree | 606ec60566bda5eebbdea6bc5aee835fcafdef2f /lisp/org | |
| parent | ddfb91c0a7e46f0332caf82237cabc736ddfd276 (diff) | |
| parent | 1b8719835a200a2be17da226e82030f691caba80 (diff) | |
| download | emacs-d46e94f23fbbd522f2a017444b29f9f18203b4bc.tar.gz emacs-d46e94f23fbbd522f2a017444b29f9f18203b4bc.tar.bz2 emacs-d46e94f23fbbd522f2a017444b29f9f18203b4bc.zip | |
Merge from origin/emacs-28
1b8719835a Update to Org 9.5.4
92c5faafd7 Clarify documentation of 'string-to-unibyte'
2848512654 ; * lisp/files.el (find-file): Avoid too short lines in do...
672f9f787f Improve keystrokes in doc strings in some find-file functions
ef5651cc77 Fix segfaults when starting on 80x26 TTY frames
bfa647972f ; Fix doc string of 'delete-selection-repeat-replace-region'
a95d46e00f Make it explicit that a couple of _s in lispref are unders...
5c74c25123 Remove from FAQ the MS-Windows info about BDF fonts
edb48646f2 Fix Display Property manual example
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org-clock.el | 4 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 4 | ||||
| -rw-r--r-- | lisp/org/org.el | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index 67cda1b7464..fdc9818a5a8 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -1104,7 +1104,7 @@ to be CLOCKED OUT.")))) 60)) (keep (or (and (memq ch '(?k ?K)) - (read-number "Keep how many minutes? " default)) + (read-number "Keep how many minutes: " default)) (and (memq ch '(?t ?T)) (floor (/ (float-time @@ -1112,7 +1112,7 @@ to be CLOCKED OUT.")))) 60))))) (gotback (and (memq ch '(?g ?G)) - (read-number "Got back how many minutes ago? " default))) + (read-number "Got back how many minutes ago: " default))) (subtractp (memq ch '(?s ?S))) (barely-started-p (org-time-less-p (org-time-subtract last-valid (cdr clock)) diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 6bafb6fc378..6bdcb0afff5 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -5,13 +5,13 @@ (defun org-release () "The release version of Org. Inserted by installing Org mode or when a release is made." - (let ((org-release "9.5.3")) + (let ((org-release "9.5.4")) org-release)) ;;;###autoload (defun org-git-version () "The Git version of Org mode. Inserted by installing Org or when a release is made." - (let ((org-git-version "release_9.5.3-6-gef41f3")) + (let ((org-git-version "release_9.5.4")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/org.el b/lisp/org/org.el index 0dfd53a3a72..008230500d7 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -9,7 +9,7 @@ ;; Homepage: https://orgmode.org ;; Package-Requires: ((emacs "25.1")) -;; Version: 9.5.3 +;; Version: 9.5.4 ;; This file is part of GNU Emacs. ;; |