mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-11-21 06:55:35 +00:00
Clean up spacing to pass Emacs's pre-commit check
Avoid trailing spaces and spaces before tabs.
This commit is contained in:
parent
0450cf0e85
commit
464d668ead
@ -143,7 +143,7 @@ This function is called by `org-babel-execute-src-block'."
|
||||
;; if using an alternate loader, :cmdline overwrites default
|
||||
cmdline))
|
||||
(in-file (org-babel-temp-file "maxima-" ".max"))
|
||||
(cmd (format "%s -r %s %s"
|
||||
(cmd (format "%s -r %s %s"
|
||||
org-babel-maxima-command
|
||||
(shell-quote-argument
|
||||
;; bind linenum to 0 so the first line
|
||||
|
@ -52,7 +52,7 @@ $VAR instances are replaced by VAR values defined in PARAMS."
|
||||
(regexp-quote (format "$%s" (car var)))
|
||||
(format "%s" (cdr var))
|
||||
body 'fixedcase 'literal)))
|
||||
|
||||
|
||||
(let ((prologue (cdr (assq :prologue params)))
|
||||
(epilogue (cdr (assq :epilogue params))))
|
||||
(concat
|
||||
|
@ -5935,7 +5935,7 @@ displayed in agenda view."
|
||||
level category tags timestamp org-ts-regexp habit?)))
|
||||
(org-add-props item props
|
||||
'urgency (if habit?
|
||||
(org-habit-get-urgency (org-habit-parse-todo))
|
||||
(org-habit-get-urgency (org-habit-parse-todo))
|
||||
(org-get-priority item))
|
||||
'priority (org-get-priority item)
|
||||
'org-marker (org-agenda-new-marker pos)
|
||||
|
@ -42,7 +42,7 @@
|
||||
;; `org-persist-load' will read the data with side effects. For
|
||||
;; example, loading `elisp' container will assign the values to
|
||||
;; variables.
|
||||
;;
|
||||
;;
|
||||
;; Example usage:
|
||||
;;
|
||||
;; 1. Temporarily cache Elisp symbol value to disk. Remove upon
|
||||
|
34
lisp/org.el
34
lisp/org.el
@ -9898,22 +9898,22 @@ statistics everywhere."
|
||||
(save-match-data
|
||||
(unless (outline-next-heading) (throw 'exit nil))
|
||||
(while (and (looking-at org-complex-heading-regexp)
|
||||
(> (setq l1 (length (match-string 1))) level))
|
||||
(setq kwd (and (or recursive (= l1 ltoggle))
|
||||
(match-string 2)))
|
||||
(if (or (eq org-provide-todo-statistics 'all-headlines)
|
||||
(and (eq org-provide-todo-statistics t)
|
||||
(> (setq l1 (length (match-string 1))) level))
|
||||
(setq kwd (and (or recursive (= l1 ltoggle))
|
||||
(match-string 2)))
|
||||
(if (or (eq org-provide-todo-statistics 'all-headlines)
|
||||
(and (eq org-provide-todo-statistics t)
|
||||
(or (member kwd org-done-keywords)))
|
||||
(and (listp org-provide-todo-statistics)
|
||||
(and (listp org-provide-todo-statistics)
|
||||
(stringp (car org-provide-todo-statistics))
|
||||
(or (member kwd org-provide-todo-statistics)
|
||||
(or (member kwd org-provide-todo-statistics)
|
||||
(member kwd org-done-keywords)))
|
||||
(and (listp org-provide-todo-statistics)
|
||||
(listp (car org-provide-todo-statistics))
|
||||
(or (member kwd (car org-provide-todo-statistics))
|
||||
(and (member kwd org-done-keywords)
|
||||
(member kwd (cadr org-provide-todo-statistics))))))
|
||||
(setq cnt-all (1+ cnt-all))
|
||||
(setq cnt-all (1+ cnt-all))
|
||||
(and (eq org-provide-todo-statistics t)
|
||||
kwd
|
||||
(setq cnt-all (1+ cnt-all))))
|
||||
@ -9927,13 +9927,13 @@ statistics everywhere."
|
||||
(stringp (car org-provide-todo-statistics))
|
||||
(member kwd org-done-keywords)))
|
||||
(setq cnt-done (1+ cnt-done)))
|
||||
(outline-next-heading)))
|
||||
(outline-next-heading)))
|
||||
(setq new
|
||||
(if is-percent
|
||||
(format "[%d%%]" (floor (* 100.0 cnt-done)
|
||||
(if is-percent
|
||||
(format "[%d%%]" (floor (* 100.0 cnt-done)
|
||||
(max 1 cnt-all)))
|
||||
(format "[%d/%d]" cnt-done cnt-all))
|
||||
ndel (- (match-end 0) checkbox-beg))
|
||||
(format "[%d/%d]" cnt-done cnt-all))
|
||||
ndel (- (match-end 0) checkbox-beg))
|
||||
(goto-char (match-end 0))
|
||||
(unless (string-equal new (buffer-substring checkbox-beg (match-end 0)))
|
||||
(goto-char checkbox-beg)
|
||||
@ -15426,20 +15426,20 @@ INCREMENT-STEP divisor."
|
||||
(setq hour (mod hour 24))
|
||||
(setq pos-match-group 1
|
||||
new (format "-%02d:%02d" hour minute)))
|
||||
|
||||
|
||||
((org-pos-in-match-range pos 6) ;; POS on "dmwy" repeater char.
|
||||
(setq pos-match-group 6
|
||||
new (car (rassoc (+ nincrements (cdr (assoc (match-string 6 ts-string) idx))) idx))))
|
||||
|
||||
|
||||
((org-pos-in-match-range pos 5) ;; POS on X in "Xd" repeater.
|
||||
(setq pos-match-group 5
|
||||
;; Never drop below X=1.
|
||||
new (format "%d" (max 1 (+ nincrements (string-to-number (match-string 5 ts-string)))))))
|
||||
|
||||
|
||||
((org-pos-in-match-range pos 9) ;; POS on "dmwy" repeater in warning interval.
|
||||
(setq pos-match-group 9
|
||||
new (car (rassoc (+ nincrements (cdr (assoc (match-string 9 ts-string) idx))) idx))))
|
||||
|
||||
|
||||
((org-pos-in-match-range pos 8) ;; POS on X in "Xd" in warning interval.
|
||||
(setq pos-match-group 8
|
||||
;; Never drop below X=0.
|
||||
|
@ -1373,7 +1373,7 @@ original parsed data. INFO is a plist holding export options."
|
||||
(with-temp-buffer
|
||||
(when (file-exists-p styles-xml)
|
||||
(insert-file-contents styles-xml))
|
||||
|
||||
|
||||
;; Write custom styles for source blocks
|
||||
;; Save STYLES used for colorizing of source blocks.
|
||||
;; Update styles.xml with styles that were collected as part of
|
||||
@ -1400,7 +1400,7 @@ original parsed data. INFO is a plist holding export options."
|
||||
(level (string-to-number (match-string 2))))
|
||||
(if (wholenump sec-num) (<= level sec-num) sec-num))
|
||||
(replace-match replacement t nil))))
|
||||
|
||||
|
||||
;; Write back the new contents.
|
||||
(write-region nil nil styles-xml))))
|
||||
;; Update content.xml.
|
||||
|
Loading…
Reference in New Issue
Block a user