Merge branch 'maint'
This commit is contained in:
commit
5e9bdbfac6
|
@ -205,7 +205,7 @@ This function is called by `org-babel-execute-src-block'."
|
|||
"Generate a file from a pdf file using imagemagick."
|
||||
(let ((cmd (concat "convert " im-in-options " " pdffile " "
|
||||
im-out-options " " out-file)))
|
||||
(message (concat "Converting pdffile file " cmd "..."))
|
||||
(message "Converting pdffile file %s..." cmd)
|
||||
(shell-command cmd)))
|
||||
|
||||
(defun org-babel-latex-tex-to-pdf (file)
|
||||
|
|
|
@ -133,9 +133,10 @@ See `org-crypt-disable-auto-save'."
|
|||
(and
|
||||
(eq org-crypt-disable-auto-save 'ask)
|
||||
(y-or-n-p "org-decrypt: auto-save-mode may cause leakage. Disable it for current buffer? ")))
|
||||
(message (concat "org-decrypt: Disabling auto-save-mode for " (or (buffer-file-name) (current-buffer))))
|
||||
; The argument to auto-save-mode has to be "-1", since
|
||||
; giving a "nil" argument toggles instead of disabling.
|
||||
(message "org-decrypt: Disabling auto-save-mode for %s"
|
||||
(or (buffer-file-name) (current-buffer)))
|
||||
;; The argument to auto-save-mode has to be "-1", since
|
||||
;; giving a "nil" argument toggles instead of disabling.
|
||||
(auto-save-mode -1))
|
||||
((eq org-crypt-disable-auto-save nil)
|
||||
(message "org-decrypt: Decrypting entry with auto-save-mode enabled. This may cause leakage."))
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
(defvar org-timer-countdown-timer nil
|
||||
"Current countdown timer.
|
||||
This is a timer object if there is an active countdown timer,
|
||||
'paused' if there is a paused countdown timer, and nil
|
||||
`paused' if there is a paused countdown timer, and nil
|
||||
otherwise.")
|
||||
|
||||
(defvar org-timer-countdown-timer-title nil
|
||||
|
@ -163,13 +163,12 @@ With prefix arg STOP, stop it entirely."
|
|||
(let ((start-secs (org-float-time org-timer-start-time))
|
||||
(pause-secs (org-float-time org-timer-pause-time)))
|
||||
(if org-timer-countdown-timer
|
||||
(progn
|
||||
(let ((new-secs (- start-secs pause-secs)))
|
||||
(setq org-timer-countdown-timer
|
||||
(org-timer--run-countdown-timer
|
||||
new-secs org-timer-countdown-timer-title))
|
||||
(setq org-timer-start-time
|
||||
(time-add (current-time) (seconds-to-time new-secs)))))
|
||||
(let ((new-secs (- start-secs pause-secs)))
|
||||
(setq org-timer-countdown-timer
|
||||
(org-timer--run-countdown-timer
|
||||
new-secs org-timer-countdown-timer-title))
|
||||
(setq org-timer-start-time
|
||||
(time-add (current-time) (seconds-to-time new-secs))))
|
||||
(setq org-timer-start-time
|
||||
;; Pass `current-time' result to `org-float-time'
|
||||
;; (instead of calling without arguments) so that only
|
||||
|
@ -184,10 +183,10 @@ With prefix arg STOP, stop it entirely."
|
|||
;; pause timer
|
||||
(when org-timer-countdown-timer
|
||||
(cancel-timer org-timer-countdown-timer)
|
||||
(setq org-timer-countdown-timer 'pause))
|
||||
(setq org-timer-countdown-timer 'paused))
|
||||
(run-hooks 'org-timer-pause-hook)
|
||||
(setq org-timer-pause-time (current-time))
|
||||
(org-timer-set-mode-line 'pause)
|
||||
(org-timer-set-mode-line 'paused)
|
||||
(message "Timer paused at %s" (org-timer-value-string)))))
|
||||
|
||||
(defun org-timer-stop ()
|
||||
|
@ -332,7 +331,7 @@ If the integer is negative, the string will start with \"-\"."
|
|||
|
||||
(defun org-timer-set-mode-line (value)
|
||||
"Set the mode-line display for relative or countdown timer.
|
||||
VALUE can be `on', `off', or `pause'."
|
||||
VALUE can be `on', `off', or `paused'."
|
||||
(when (or (eq org-timer-display 'mode-line)
|
||||
(eq org-timer-display 'both))
|
||||
(or global-mode-string (setq global-mode-string '("")))
|
||||
|
@ -358,7 +357,7 @@ VALUE can be `on', `off', or `pause'."
|
|||
(setq frame-title-format
|
||||
(delq 'org-timer-mode-line-string frame-title-format)))
|
||||
(force-mode-line-update))
|
||||
((equal value 'pause)
|
||||
((equal value 'paused)
|
||||
(when org-timer-mode-line-timer
|
||||
(cancel-timer org-timer-mode-line-timer)
|
||||
(setq org-timer-mode-line-timer nil)))
|
||||
|
@ -450,23 +449,22 @@ using three `C-u' prefix arguments."
|
|||
(org-timer-show-remaining-time)
|
||||
(let ((secs (org-timer-hms-to-secs (org-timer-fix-incomplete minutes)))
|
||||
(hl (org-timer--get-timer-title)))
|
||||
(if (or (not org-timer-countdown-timer)
|
||||
(equal opt '(16))
|
||||
(y-or-n-p "Replace current timer? "))
|
||||
(progn
|
||||
(when (timerp org-timer-countdown-timer)
|
||||
(cancel-timer org-timer-countdown-timer))
|
||||
(setq org-timer-countdown-timer-title
|
||||
(org-timer--get-timer-title))
|
||||
(setq org-timer-countdown-timer
|
||||
(org-timer--run-countdown-timer
|
||||
secs org-timer-countdown-timer-title))
|
||||
(run-hooks 'org-timer-set-hook)
|
||||
(setq org-timer-start-time
|
||||
(time-add (current-time) (seconds-to-time secs)))
|
||||
(setq org-timer-pause-time nil)
|
||||
(org-timer-set-mode-line 'on))
|
||||
(message "No timer set"))))))
|
||||
(if (and org-timer-countdown-timer
|
||||
(not (or (equal opt '(16))
|
||||
(y-or-n-p "Replace current timer? "))))
|
||||
(message "No timer set")
|
||||
(when (timerp org-timer-countdown-timer)
|
||||
(cancel-timer org-timer-countdown-timer))
|
||||
(setq org-timer-countdown-timer-title
|
||||
(org-timer--get-timer-title))
|
||||
(setq org-timer-countdown-timer
|
||||
(org-timer--run-countdown-timer
|
||||
secs org-timer-countdown-timer-title))
|
||||
(run-hooks 'org-timer-set-hook)
|
||||
(setq org-timer-start-time
|
||||
(time-add (current-time) (seconds-to-time secs)))
|
||||
(setq org-timer-pause-time nil)
|
||||
(org-timer-set-mode-line 'on))))))
|
||||
|
||||
(defun org-timer--run-countdown-timer (secs title)
|
||||
"Start countdown timer that will last SECS.
|
||||
|
|
|
@ -1225,8 +1225,8 @@ Return PDF file name or an error if it couldn't be produced."
|
|||
;; Check for process failure. Provide collected errors if
|
||||
;; possible.
|
||||
(if (not (file-exists-p pdffile))
|
||||
(error (concat (format "PDF file %s wasn't produced" pdffile)
|
||||
(when errors (concat ": " errors))))
|
||||
(error "PDF file %s wasn't produced%s" pdffile
|
||||
(if errors (concat ": " errors) ""))
|
||||
;; Else remove log files, when specified, and signal end of
|
||||
;; process to user, along with any error encountered.
|
||||
(when org-man-remove-logfiles
|
||||
|
|
|
@ -4115,8 +4115,8 @@ contextual information."
|
|||
nil standard-output nil (cdr cmd)))))
|
||||
(or (zerop exitcode)
|
||||
(error (concat "Unable to create OpenDocument file."
|
||||
(format " Zip failed with error (%s)"
|
||||
err-string)))))
|
||||
" Zip failed with error (%s)")
|
||||
err-string)))
|
||||
cmds)))
|
||||
;; Move the zip file from temporary work directory to
|
||||
;; user-mandated location.
|
||||
|
|
|
@ -1611,8 +1611,8 @@ Return INFO file name or an error if it couldn't be produced."
|
|||
;; Check for process failure. Provide collected errors if
|
||||
;; possible.
|
||||
(if (not (file-exists-p infofile))
|
||||
(error (concat (format "INFO file %s wasn't produced" infofile)
|
||||
(when errors (concat ": " errors))))
|
||||
(error "INFO file %s wasn't produced%s" infofile
|
||||
(if errors (concat ": " errors) ""))
|
||||
;; Else remove log files, when specified, and signal end of
|
||||
;; process to user, along with any error encountered.
|
||||
(when org-texinfo-remove-logfiles
|
||||
|
|
Loading…
Reference in New Issue