Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
14e1337f
Commit
14e1337f
authored
Jan 04, 2012
by
Bastien Guerry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix trailing whitespaces in Org files.
parent
0b41d90b
Changes
27
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
59 additions
and
67 deletions
+59
-67
lisp/org/ob-awk.el
lisp/org/ob-awk.el
+2
-2
lisp/org/ob-gnuplot.el
lisp/org/ob-gnuplot.el
+1
-1
lisp/org/ob-haskell.el
lisp/org/ob-haskell.el
+1
-1
lisp/org/ob-lilypond.el
lisp/org/ob-lilypond.el
+14
-14
lisp/org/ob-lob.el
lisp/org/ob-lob.el
+2
-2
lisp/org/ob-ocaml.el
lisp/org/ob-ocaml.el
+1
-1
lisp/org/ob-picolisp.el
lisp/org/ob-picolisp.el
+4
-4
lisp/org/ob-ref.el
lisp/org/ob-ref.el
+1
-1
lisp/org/ob-ruby.el
lisp/org/ob-ruby.el
+2
-2
lisp/org/ob-sql.el
lisp/org/ob-sql.el
+1
-1
lisp/org/org-ascii.el
lisp/org/org-ascii.el
+1
-1
lisp/org/org-capture.el
lisp/org/org-capture.el
+1
-1
lisp/org/org-clock.el
lisp/org/org-clock.el
+2
-3
lisp/org/org-crypt.el
lisp/org/org-crypt.el
+3
-3
lisp/org/org-gnus.el
lisp/org/org-gnus.el
+1
-1
lisp/org/org-id.el
lisp/org/org-id.el
+1
-5
lisp/org/org-irc.el
lisp/org/org-irc.el
+1
-1
lisp/org/org-latex.el
lisp/org/org-latex.el
+3
-3
lisp/org/org-mks.el
lisp/org/org-mks.el
+1
-1
lisp/org/org-mobile.el
lisp/org/org-mobile.el
+3
-4
lisp/org/org-pcomplete.el
lisp/org/org-pcomplete.el
+1
-1
lisp/org/org-publish.el
lisp/org/org-publish.el
+2
-2
lisp/org/org-remember.el
lisp/org/org-remember.el
+1
-2
lisp/org/org-special-blocks.el
lisp/org/org-special-blocks.el
+1
-1
lisp/org/org-src.el
lisp/org/org-src.el
+1
-1
lisp/org/org-table.el
lisp/org/org-table.el
+3
-4
lisp/org/org-taskjuggler.el
lisp/org/org-taskjuggler.el
+4
-4
No files found.
lisp/org/ob-awk.el
View file @
14e1337f
...
...
@@ -24,9 +24,9 @@
;;; Commentary:
;; Babel's awk can use special header argument:
;;
;;
;; - :in-file takes a path to a file of data to be processed by awk
;;
;;
;; - :stdin takes an Org-mode data or code block reference, the value
;; of which will be passed to the awk process through STDIN
...
...
lisp/org/ob-gnuplot.el
View file @
14e1337f
...
...
@@ -34,7 +34,7 @@
;;; Requirements:
;; - gnuplot :: http://www.gnuplot.info/
;;
;;
;; - gnuplot-mode :: http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html
;;; Code:
...
...
lisp/org/ob-haskell.el
View file @
14e1337f
...
...
@@ -79,7 +79,7 @@
(
cdr
(
member
org-babel-haskell-eoe
(
reverse
(
mapcar
#'
org-babel-trim
raw
)))))))
(
org-babel-reassemble-table
(
cond
(
cond
((
equal
result-type
'output
)
(
mapconcat
#'
identity
(
reverse
(
cdr
results
))
"\n"
))
((
equal
result-type
'value
)
...
...
lisp/org/ob-lilypond.el
View file @
14e1337f
...
...
@@ -114,7 +114,7 @@ blocks")
body
))))
vars
)
body
))
(
defun
org-babel-execute:lilypond
(
body
params
)
"This function is called by `org-babel-execute-src-block'.
Depending on whether we are in arrange mode either:
...
...
@@ -138,7 +138,7 @@ specific arguments to =org-babel-tangle="
(
defun
ly-process-basic
(
body
params
)
"Execute a lilypond block in basic mode"
(
let*
((
result-params
(
cdr
(
assoc
:result-params
params
)))
(
out-file
(
cdr
(
assoc
:file
params
)))
(
cmdline
(
or
(
cdr
(
assoc
:cmdline
params
))
...
...
@@ -147,7 +147,7 @@ specific arguments to =org-babel-tangle="
(
with-temp-file
in-file
(
insert
(
org-babel-expand-body:generic
body
params
)))
(
org-babel-eval
(
concat
(
ly-determine-ly-path
)
...
...
@@ -177,7 +177,7 @@ If error in compilation, attempt to mark the error in lilypond org file"
(
ly-temp-file
(
ly-switch-extension
(
buffer-file-name
)
".ly"
)))
(
if
(
file-exists-p
ly-tangled-file
)
(
progn
(
progn
(
when
(
file-exists-p
ly-temp-file
)
(
delete-file
ly-temp-file
))
(
rename-file
ly-tangled-file
...
...
@@ -243,7 +243,7 @@ FILE-NAME is full path to lilypond file"
"Mark the erroneous lines in the lilypond org buffer.
FILE-NAME is full path to lilypond file.
LINE is the erroneous line"
(
switch-to-buffer-other-window
(
concat
(
file-name-nondirectory
(
ly-switch-extension
file-name
".org"
))))
...
...
@@ -256,7 +256,7 @@ LINE is the erroneous line"
(
set-mark
(
point
))
(
goto-char
(
-
(
point
)
(
length
line
))))
(
goto-char
temp
))))
(
defun
ly-parse-line-num
(
&optional
buffer
)
"Extract error line number."
...
...
@@ -284,7 +284,7 @@ LINE is the erroneous line"
"Extract the erroneous line from the tangled .ly file
FILE-NAME is full path to lilypond file.
LINENO is the number of the erroneous line"
(
with-temp-buffer
(
insert-file-contents
(
ly-switch-extension
file-name
".ly"
)
nil
nil
nil
t
)
...
...
@@ -294,12 +294,12 @@ LINENO is the number of the erroneous line"
(
forward-line
(
-
lineNo
1
))
(
buffer-substring
(
point
)
(
point-at-eol
)))
nil
)))
(
defun
ly-attempt-to-open-pdf
(
file-name
&optional
test
)
"Attempt to display the generated pdf file
FILE-NAME is full path to lilypond file
If TEST is non-nil, the shell command is returned and is not run"
(
when
ly-display-pdf-post-tangle
(
let
((
pdf-file
(
ly-switch-extension
file-name
".pdf"
)))
(
if
(
file-exists-p
pdf-file
)
...
...
@@ -340,7 +340,7 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
(
defun
ly-determine-pdf-path
(
&optional
test
)
"Return correct path to pdf viewer depending on OS
If TEST is non-nil, it contains a simulation of the OS for test purposes"
(
let
((
sys-type
(
or
test
system-type
)))
(
cond
((
string=
sys-type
"darwin"
)
...
...
@@ -352,7 +352,7 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
(
defun
ly-determine-midi-path
(
&optional
test
)
"Return correct path to midi player depending on OS
If TEST is non-nil, it contains a simulation of the OS for test purposes"
(
let
((
sys-type
(
or
test
test
system-type
)))
(
cond
((
string=
sys-type
"darwin"
)
...
...
@@ -360,10 +360,10 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
((
string=
sys-type
"win32"
)
ly-win32-midi-path
)
(
t
ly-nix-midi-path
))))
(
defun
ly-toggle-midi-play
()
"Toggle whether midi will be played following a successful compilation"
(
interactive
)
(
setq
ly-play-midi-post-tangle
(
not
ly-play-midi-post-tangle
))
...
...
@@ -373,7 +373,7 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
(
defun
ly-toggle-pdf-display
()
"Toggle whether pdf will be displayed following a successful compilation"
(
interactive
)
(
setq
ly-display-pdf-post-tangle
(
not
ly-display-pdf-post-tangle
))
...
...
lisp/org/ob-lob.el
View file @
14e1337f
...
...
@@ -104,7 +104,7 @@ if so then run the appropriate source block from the Library."
(
beginning-of-line
1
)
(
when
(
looking-at
org-babel-lob-one-liner-regexp
)
(
append
(
mapcar
#'
org-babel-clean-text-properties
(
mapcar
#'
org-babel-clean-text-properties
(
list
(
format
"%s%s(%s)%s"
(
nonempty
3
12
)
...
...
@@ -115,7 +115,7 @@ if so then run the appropriate source block from the Library."
(
nonempty
9
18
)))
(
list
(
length
(
if
(
=
(
length
(
match-string
12
))
0
)
(
match-string
2
)
(
match-string
11
))))))))))
(
defun
org-babel-lob-execute
(
info
)
"Execute the lob call specified by INFO."
(
let
((
params
(
org-babel-process-params
...
...
lisp/org/ob-ocaml.el
View file @
14e1337f
...
...
@@ -98,7 +98,7 @@
(
lambda
(
pair
)
(
format
"let %s = %s;;"
(
car
pair
)
(
org-babel-ocaml-elisp-to-ocaml
(
cdr
pair
))))
(
mapcar
#'
cdr
(
org-babel-get-header
params
:var
))))
(
defun
org-babel-ocaml-elisp-to-ocaml
(
val
)
"Return a string of ocaml code which evaluates to VAL."
(
if
(
listp
val
)
...
...
lisp/org/ob-picolisp.el
View file @
14e1337f
...
...
@@ -44,10 +44,10 @@
;; PicoLisp _is_ an object-oriented database with a Prolog-based query
;; language implemented in PicoLisp (Pilog). Database objects are
;; first-class members of the language.
;; first-class members of the language.
;; PicoLisp is an extremely productive framework for the development
;; of interactive web-applications (on top of a database).
;; of interactive web-applications (on top of a database).
;;; Requirements:
...
...
@@ -95,7 +95,7 @@
(
defun
org-babel-execute:picolisp
(
body
params
)
"Execute a block of Picolisp code with org-babel. This function is
called by `org-babel-execute-src-block'"
called by `org-babel-execute-src-block'"
(
message
"executing Picolisp source code block"
)
(
let*
(
;; name of the session or "none"
...
...
@@ -118,7 +118,7 @@
((
member
"value"
result-params
)
(
format
"(out \"/dev/null\" %s)"
full-body
))
(
t
full-body
))))
((
lambda
(
result
)
(
if
(
or
(
member
"verbatim"
result-params
)
(
member
"scalar"
result-params
)
...
...
lisp/org/ob-ref.el
View file @
14e1337f
...
...
@@ -60,7 +60,7 @@
(
declare-function
org-narrow-to-subtree
"org"
())
(
declare-function
org-id-find-id-in-file
"org-id"
(
id
file
&optional
markerp
))
(
declare-function
org-show-context
"org"
(
&optional
key
))
(
declare-function
org-pop-to-buffer-same-window
(
declare-function
org-pop-to-buffer-same-window
"org-compat"
(
&optional
buffer-or-name
norecord
label
))
(
defvar
org-babel-ref-split-regexp
...
...
lisp/org/ob-ruby.el
View file @
14e1337f
...
...
@@ -28,10 +28,10 @@
;;; Requirements:
;; - ruby and irb executables :: http://www.ruby-lang.org/
;;
;;
;; - ruby-mode :: Can be installed through ELPA, or from
;; http://github.com/eschulte/rinari/raw/master/util/ruby-mode.el
;;
;;
;; - inf-ruby mode :: Can be installed through ELPA, or from
;; http://github.com/eschulte/rinari/raw/master/util/inf-ruby.el
...
...
lisp/org/ob-sql.el
View file @
14e1337f
...
...
@@ -39,7 +39,7 @@
;; - add more useful header arguments (user, passwd, database, etc...)
;; - support for more engines (currently only supports mysql)
;; - what's a reasonable way to drop table data into SQL?
;;
;;
;;; Code:
(
require
'ob
)
...
...
lisp/org/org-ascii.el
View file @
14e1337f
...
...
@@ -108,7 +108,7 @@ utf8 Use all UTF-8 characters")
(
defun
org-export-as-utf8
(
&rest
args
)
"Like `org-export-as-ascii', use encoding for special symbols."
(
interactive
)
(
org-export-as-encoding
'org-export-as-ascii
(
org-export-as-encoding
'org-export-as-ascii
(
org-called-interactively-p
'any
)
'utf8
args
))
...
...
lisp/org/org-capture.el
View file @
14e1337f
...
...
@@ -56,7 +56,7 @@
(
date
&optional
keep-restriction
))
(
declare-function
org-table-get-specials
"org-table"
())
(
declare-function
org-table-goto-line
"org-table"
(
N
))
(
declare-function
org-pop-to-buffer-same-window
"org-compat"
(
declare-function
org-pop-to-buffer-same-window
"org-compat"
(
&optional
buffer-or-name
norecord
label
))
(
defvar
org-remember-default-headline
)
...
...
lisp/org/org-clock.el
View file @
14e1337f
...
...
@@ -2000,7 +2000,7 @@ the currently selected interval size."
(
encode-time
0
0
0
(
+
d
n
)
m
y
))))
((
and
wp
(
string-match
"w\\|W"
wp
)
mw
(
>
(
length
wp
)
0
))
(
require
'cal-iso
)
(
setq
date
(
calendar-gregorian-from-absolute
(
setq
date
(
calendar-gregorian-from-absolute
(
calendar-absolute-from-iso
(
list
(
+
mw
n
)
1
y
))))
(
setq
ins
(
format-time-string
"%G-W%V"
...
...
@@ -2017,7 +2017,7 @@ the currently selected interval size."
(
setq
mw
5
y
(
-
y
1
))
())
(
setq
date
(
calendar-gregorian-from-absolute
(
setq
date
(
calendar-gregorian-from-absolute
(
calendar-absolute-from-iso
(
org-quarter-to-date
(
+
mw
n
)
y
))))
(
setq
ins
(
format-time-string
(
concatenate
'string
(
number-to-string
y
)
"-Q"
(
number-to-string
(
+
mw
n
)))
...
...
@@ -2642,4 +2642,3 @@ The details of what will be saved are regulated by the variable
(
provide
'org-clock
)
;;; org-clock.el ends here
lisp/org/org-crypt.el
View file @
14e1337f
...
...
@@ -76,21 +76,21 @@
(
defgroup
org-crypt
nil
"Org Crypt"
:tag
"Org Crypt"
:tag
"Org Crypt"
:group
'org
)
(
defcustom
org-crypt-tag-matcher
"crypt"
"The tag matcher used to find headings whose contents should be encrypted.
See the \"Match syntax\" section of the org manual for more details."
:type
'string
:type
'string
:group
'org-crypt
)
(
defcustom
org-crypt-key
""
"The default key to use when encrypting the contents of a heading.
This setting can also be overridden in the CRYPTKEY property."
:type
'string
:type
'string
:group
'org-crypt
)
(
defcustom
org-crypt-disable-auto-save
'ask
...
...
lisp/org/org-gnus.el
View file @
14e1337f
...
...
@@ -175,7 +175,7 @@ If `org-store-link' was called with a prefix arg the meaning of
(
setq
to
(
or
to
(
gnus-fetch-original-field
"To"
))
newsgroups
(
gnus-fetch-original-field
"Newsgroups"
)
x-no-archive
(
gnus-fetch-original-field
"x-no-archive"
)))
(
org-store-link-props
:type
"gnus"
:from
from
:subject
subject
(
org-store-link-props
:type
"gnus"
:from
from
:subject
subject
:message-id
message-id
:group
group
:to
to
)
(
when
date
(
org-add-link-props
:date
date
:date-timestamp
date-ts
...
...
lisp/org/org-id.el
View file @
14e1337f
...
...
@@ -73,7 +73,7 @@
(
require
'org
)
(
declare-function
message-make-fqdn
"message"
())
(
declare-function
org-pop-to-buffer-same-window
(
declare-function
org-pop-to-buffer-same-window
"org-compat"
(
&optional
buffer-or-name
norecord
label
))
;;; Customization
...
...
@@ -641,7 +641,3 @@ optional argument MARKERP, return the position as a new marker."
(
provide
'org-id
)
;;; org-id.el ends here
lisp/org/org-irc.el
View file @
14e1337f
...
...
@@ -59,7 +59,7 @@
(
declare-function
erc-server-buffer
"erc"
())
(
declare-function
erc-get-server-nickname-list
"erc"
())
(
declare-function
erc-cmd-JOIN
"erc"
(
channel
&optional
key
))
(
declare-function
org-pop-to-buffer-same-window
(
declare-function
org-pop-to-buffer-same-window
"org-compat"
(
&optional
buffer-or-name
norecord
label
))
(
defvar
org-irc-client
'erc
...
...
lisp/org/org-latex.el
View file @
14e1337f
...
...
@@ -302,8 +302,8 @@ markup defined, the first one in the association list will be used."
(
defcustom
org-export-latex-href-format
"\\href{%s}{%s}"
"A printf format string to be applied to href links.
The format must contain either two %s instances or just one.
If it contains two %s instances, the first will be filled with
The format must contain either two %s instances or just one.
If it contains two %s instances, the first will be filled with
the link, the second with the link description. If it contains
only one, the %s will be filled with the link."
:group
'org-export-latex
...
...
@@ -2226,7 +2226,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
;; a LaTeX issue, but we here implement a work-around anyway.
(
setq
path
(
org-export-latex-protect-amp
path
)
desc
(
org-export-latex-protect-amp
desc
)))
(
insert
(
insert
(
if
(
string-match
"%s.*%s"
org-export-latex-href-format
)
(
format
org-export-latex-href-format
path
desc
)
(
format
org-export-latex-href-format
path
))))
...
...
lisp/org/org-mks.el
View file @
14e1337f
...
...
@@ -24,7 +24,7 @@
;;; Commentary:
;;
;;
;;; Code:
...
...
lisp/org/org-mobile.el
View file @
14e1337f
...
...
@@ -37,7 +37,7 @@
(
eval-when-compile
(
require
'cl
))
(
declare-function
org-pop-to-buffer-same-window
(
declare-function
org-pop-to-buffer-same-window
"org-compat"
(
&optional
buffer-or-name
norecord
label
))
(
defgroup
org-mobile
nil
...
...
@@ -272,7 +272,7 @@ Also exclude files matching `org-mobile-files-exclude-regexp'."
(
t
nil
)))
org-mobile-files
)))
(
files
(
delete
nil
nil
(
mapcar
(
lambda
(
f
)
(
unless
(
and
(
not
(
string=
org-mobile-files-exclude-regexp
""
))
(
string-match
org-mobile-files-exclude-regexp
f
))
...
...
@@ -499,7 +499,7 @@ agenda view showing the flagged items."
org-mobile-directory
))
(
save-excursion
(
setq
buf
(
find-file
file
))
(
when
(
and
(
=
(
point-min
)
(
point-max
)))
(
when
(
and
(
=
(
point-min
)
(
point-max
)))
(
insert
"\n"
)
(
save-buffer
)
(
when
org-mobile-use-encryption
...
...
@@ -1099,4 +1099,3 @@ A and B must be strings or nil."
(
provide
'org-mobile
)
;;; org-mobile.el ends here
lisp/org/org-pcomplete.el
View file @
14e1337f
...
...
@@ -146,7 +146,7 @@ When completing for #+STARTUP, for example, this function returns
(
org-split-string
(
org-get-current-options
)
"\n"
))
org-additional-option-like-keywords
)))))
(
substring
pcomplete-stub
2
)))
(
defvar
org-startup-options
)
(
defun
pcomplete/org-mode/file-option/startup
()
"Complete arguments for the #+STARTUP file option."
...
...
lisp/org/org-publish.el
View file @
14e1337f
...
...
@@ -368,7 +368,7 @@ This is a compatibility function for Emacsen without `delete-dups'."
(
declare-function
org-publish-delete-dups
"org-publish"
(
list
))
(
declare-function
find-lisp-find-files
"find-lisp"
(
directory
regexp
))
(
declare-function
org-pop-to-buffer-same-window
(
declare-function
org-pop-to-buffer-same-window
"org-compat"
(
&optional
buffer-or-name
norecord
label
))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
...
...
@@ -1127,7 +1127,7 @@ so that the file including them will be republished as well."
(
let
((
ctime
(
org-publish-cache-ctime-of-src
filename
)))
(
or
(
<
pstamp
ctime
)
(
when
included-files-ctime
(
not
(
null
(
delq
nil
(
mapcar
(
lambda
(
ct
)
(
<
ctime
ct
))
(
not
(
null
(
delq
nil
(
mapcar
(
lambda
(
ct
)
(
<
ctime
ct
))
included-files-ctime
))))))))))
(
defun
org-publish-cache-set-file-property
(
filename
property
value
&optional
project-name
)
...
...
lisp/org/org-remember.el
View file @
14e1337f
...
...
@@ -39,7 +39,7 @@
(
declare-function
remember
"remember"
(
&optional
initial
))
(
declare-function
remember-buffer-desc
"remember"
())
(
declare-function
remember-finalize
"remember"
())
(
declare-function
org-pop-to-buffer-same-window
(
declare-function
org-pop-to-buffer-same-window
"org-compat"
(
&optional
buffer-or-name
norecord
label
))
(
defvar
remember-save-after-remembering
)
...
...
@@ -1152,4 +1152,3 @@ See also the variable `org-reverse-note-order'."
(
provide
'org-remember
)
;;; org-remember.el ends here
lisp/org/org-special-blocks.el
View file @
14e1337f
...
...
@@ -51,7 +51,7 @@ interpreted by other mechanisms.")
(
defun
org-special-blocks-make-special-cookies
()
"Adds special cookies when #+begin_foo and #+end_foo tokens are
seen. This is run after a few special cases are taken care of."
(
when
(
or
(
eq
org-export-current-backend
'html
)
(
when
(
or
(
eq
org-export-current-backend
'html
)
(
eq
org-export-current-backend
'latex
))
(
goto-char
(
point-min
))
(
while
(
re-search-forward
"^[ \t]*#\\+\\(begin\\|end\\)_\\(.*\\)$"
nil
t
)
...
...
lisp/org/org-src.el
View file @
14e1337f
...
...
@@ -41,7 +41,7 @@
(
declare-function
org-at-table.el-p
"org"
())
(
declare-function
org-get-indentation
"org"
(
&optional
line
))
(
declare-function
org-switch-to-buffer-other-window
"org"
(
&rest
args
))
(
declare-function
org-pop-to-buffer-same-window
(
declare-function
org-pop-to-buffer-same-window
"org-compat"
(
&optional
buffer-or-name
norecord
label
))
(
defcustom
org-edit-src-region-extra
nil
...
...
lisp/org/org-table.el
View file @
14e1337f
...
...
@@ -2436,7 +2436,7 @@ not overwrite the stored one."
(modes (copy-sequence org-calc-default-modes))
(numbers nil) ; was a variable, now fixed default
(keep-empty nil)
n form form0 formrpl formrg bw fmt x ev orig c lispp literal
n form form0 formrpl formrg bw fmt x ev orig c lispp literal
duration duration-output-format)
;; Parse the format string. Since we have a lot of modes, this is
;; a lot of work. However, I think calc still uses most of the time.
...
...
@@ -2461,7 +2461,7 @@ not overwrite the stored one."
duration-output-format
nil
fmt
(
replace-match
""
t
t
fmt
)))
(
if
(
string-match
"t"
fmt
)
(
setq
duration
t
(
setq
duration
t
duration-output-format
org-table-duration-custom-format
numbers
t
fmt
(
replace-match
""
t
t
fmt
)))
...
...
@@ -2529,7 +2529,7 @@ not overwrite the stored one."
;; Insert complex ranges
(
while
(
and
(
string-match
org-table-range-regexp
form
)
(
>
(
length
(
match-string
0
form
))
1
))
(
setq
formrg
(
save-match-data
(
setq
formrg
(
save-match-data
(
org-table-get-range
(
match-string
0
form
)
nil
n0
)))
(
setq
formrpl
(
save-match-data
...
...
@@ -4759,4 +4759,3 @@ list of the fields in the rectangle ."
(
provide
'org-table
)
;;; org-table.el ends here
lisp/org/org-taskjuggler.el
View file @
14e1337f
...
...
@@ -355,8 +355,8 @@ information, all the properties, etc."
(
let*
((
props
(
org-entry-properties
))
(
components
(
org-heading-components
))
(
level
(
nth
1
components
))
(
headline
(
replace-regexp-in-string
(
headline
(
replace-regexp-in-string
"\""
"\\\""
(
nth
4
components
)
t
t
))
; quote double quotes in headlines
(
parent-ordered
(
org-taskjuggler-parent-is-ordered-p
)))
(
push
(
cons
"level"
level
)
props
)
...
...
@@ -406,10 +406,10 @@ deeper), then it's not a leaf."
(
successor
(
car
(
cdr
tasks
))))
(
cond
;; if a task has no successors it is a leaf
((
null
successor
)
((
null
successor
)
(
push
(
cons
(
cons
"leaf-node"
t
)
task
)
new-list
))
;; if the successor has a lower level than task it is a leaf
((
<=
(
cdr
(
assoc
"level"
successor
))
(
cdr
(
assoc
"level"
task
)))
((
<=
(
cdr
(
assoc
"level"
successor
))
(
cdr
(
assoc
"level"
task
)))
(
push
(
cons
(
cons
"leaf-node"
t
)
task
)
new-list
))
;; otherwise examine the rest of the tasks
(
t
(
push
task
new-list
))))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment