1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-22 07:09:47 +00:00

Delete trailing whitespaces in core files.

This commit is contained in:
Bastien Guerry 2012-03-28 02:05:36 +02:00
parent ad3f9322ad
commit 8ab92f8b55
25 changed files with 53 additions and 60 deletions

View File

@ -24,9 +24,9 @@
;;; Commentary: ;;; Commentary:
;; Babel's awk can use special header argument: ;; Babel's awk can use special header argument:
;; ;;
;; - :in-file takes a path to a file of data to be processed by awk ;; - :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 ;; - :stdin takes an Org-mode data or code block reference, the value
;; of which will be passed to the awk process through STDIN ;; of which will be passed to the awk process through STDIN

View File

@ -34,7 +34,7 @@
;;; Requirements: ;;; Requirements:
;; - gnuplot :: http://www.gnuplot.info/ ;; - gnuplot :: http://www.gnuplot.info/
;; ;;
;; - gnuplot-mode :: http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html ;; - gnuplot-mode :: http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html
;;; Code: ;;; Code:

View File

@ -79,7 +79,7 @@
(cdr (member org-babel-haskell-eoe (cdr (member org-babel-haskell-eoe
(reverse (mapcar #'org-babel-trim raw))))))) (reverse (mapcar #'org-babel-trim raw)))))))
(org-babel-reassemble-table (org-babel-reassemble-table
(cond (cond
((equal result-type 'output) ((equal result-type 'output)
(mapconcat #'identity (reverse (cdr results)) "\n")) (mapconcat #'identity (reverse (cdr results)) "\n"))
((equal result-type 'value) ((equal result-type 'value)

View File

@ -110,7 +110,7 @@ blocks")
body)))) body))))
vars) vars)
body)) body))
(defun org-babel-execute:lilypond (body params) (defun org-babel-execute:lilypond (body params)
"This function is called by `org-babel-execute-src-block'. "This function is called by `org-babel-execute-src-block'.
Depending on whether we are in arrange mode either: Depending on whether we are in arrange mode either:
@ -134,7 +134,7 @@ specific arguments to =org-babel-tangle="
(defun ly-process-basic (body params) (defun ly-process-basic (body params)
"Execute a lilypond block in basic mode" "Execute a lilypond block in basic mode"
(let* ((result-params (cdr (assoc :result-params params))) (let* ((result-params (cdr (assoc :result-params params)))
(out-file (cdr (assoc :file params))) (out-file (cdr (assoc :file params)))
(cmdline (or (cdr (assoc :cmdline params)) (cmdline (or (cdr (assoc :cmdline params))
@ -143,7 +143,7 @@ specific arguments to =org-babel-tangle="
(with-temp-file in-file (with-temp-file in-file
(insert (org-babel-expand-body:generic body params))) (insert (org-babel-expand-body:generic body params)))
(org-babel-eval (org-babel-eval
(concat (concat
(ly-determine-ly-path) (ly-determine-ly-path)
@ -173,7 +173,7 @@ If error in compilation, attempt to mark the error in lilypond org file"
(ly-temp-file (ly-switch-extension (ly-temp-file (ly-switch-extension
(buffer-file-name) ".ly"))) (buffer-file-name) ".ly")))
(if (file-exists-p ly-tangled-file) (if (file-exists-p ly-tangled-file)
(progn (progn
(when (file-exists-p ly-temp-file) (when (file-exists-p ly-temp-file)
(delete-file ly-temp-file)) (delete-file ly-temp-file))
(rename-file ly-tangled-file (rename-file ly-tangled-file
@ -239,7 +239,7 @@ FILE-NAME is full path to lilypond file"
"Mark the erroneous lines in the lilypond org buffer. "Mark the erroneous lines in the lilypond org buffer.
FILE-NAME is full path to lilypond file. FILE-NAME is full path to lilypond file.
LINE is the erroneous line" LINE is the erroneous line"
(switch-to-buffer-other-window (switch-to-buffer-other-window
(concat (file-name-nondirectory (concat (file-name-nondirectory
(ly-switch-extension file-name ".org")))) (ly-switch-extension file-name ".org"))))
@ -252,7 +252,7 @@ LINE is the erroneous line"
(set-mark (point)) (set-mark (point))
(goto-char (- (point) (length line)))) (goto-char (- (point) (length line))))
(goto-char temp)))) (goto-char temp))))
(defun ly-parse-line-num (&optional buffer) (defun ly-parse-line-num (&optional buffer)
"Extract error line number." "Extract error line number."
@ -280,7 +280,7 @@ LINE is the erroneous line"
"Extract the erroneous line from the tangled .ly file "Extract the erroneous line from the tangled .ly file
FILE-NAME is full path to lilypond file. FILE-NAME is full path to lilypond file.
LINENO is the number of the erroneous line" LINENO is the number of the erroneous line"
(with-temp-buffer (with-temp-buffer
(insert-file-contents (ly-switch-extension file-name ".ly") (insert-file-contents (ly-switch-extension file-name ".ly")
nil nil nil t) nil nil nil t)
@ -290,12 +290,12 @@ LINENO is the number of the erroneous line"
(forward-line (- lineNo 1)) (forward-line (- lineNo 1))
(buffer-substring (point) (point-at-eol))) (buffer-substring (point) (point-at-eol)))
nil))) nil)))
(defun ly-attempt-to-open-pdf (file-name &optional test) (defun ly-attempt-to-open-pdf (file-name &optional test)
"Attempt to display the generated pdf file "Attempt to display the generated pdf file
FILE-NAME is full path to lilypond file FILE-NAME is full path to lilypond file
If TEST is non-nil, the shell command is returned and is not run" If TEST is non-nil, the shell command is returned and is not run"
(when ly-display-pdf-post-tangle (when ly-display-pdf-post-tangle
(let ((pdf-file (ly-switch-extension file-name ".pdf"))) (let ((pdf-file (ly-switch-extension file-name ".pdf")))
(if (file-exists-p pdf-file) (if (file-exists-p pdf-file)
@ -336,7 +336,7 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
(defun ly-determine-pdf-path (&optional test) (defun ly-determine-pdf-path (&optional test)
"Return correct path to pdf viewer depending on OS "Return correct path to pdf viewer depending on OS
If TEST is non-nil, it contains a simulation of the OS for test purposes" If TEST is non-nil, it contains a simulation of the OS for test purposes"
(let ((sys-type (let ((sys-type
(or test system-type))) (or test system-type)))
(cond ((string= sys-type "darwin") (cond ((string= sys-type "darwin")
@ -348,7 +348,7 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
(defun ly-determine-midi-path (&optional test) (defun ly-determine-midi-path (&optional test)
"Return correct path to midi player depending on OS "Return correct path to midi player depending on OS
If TEST is non-nil, it contains a simulation of the OS for test purposes" If TEST is non-nil, it contains a simulation of the OS for test purposes"
(let ((sys-type (let ((sys-type
(or test test system-type))) (or test test system-type)))
(cond ((string= sys-type "darwin") (cond ((string= sys-type "darwin")
@ -356,10 +356,10 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
((string= sys-type "win32") ((string= sys-type "win32")
ly-win32-midi-path) ly-win32-midi-path)
(t ly-nix-midi-path)))) (t ly-nix-midi-path))))
(defun ly-toggle-midi-play () (defun ly-toggle-midi-play ()
"Toggle whether midi will be played following a successful compilation" "Toggle whether midi will be played following a successful compilation"
(interactive) (interactive)
(setq ly-play-midi-post-tangle (setq ly-play-midi-post-tangle
(not ly-play-midi-post-tangle)) (not ly-play-midi-post-tangle))
@ -369,7 +369,7 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
(defun ly-toggle-pdf-display () (defun ly-toggle-pdf-display ()
"Toggle whether pdf will be displayed following a successful compilation" "Toggle whether pdf will be displayed following a successful compilation"
(interactive) (interactive)
(setq ly-display-pdf-post-tangle (setq ly-display-pdf-post-tangle
(not ly-display-pdf-post-tangle)) (not ly-display-pdf-post-tangle))

View File

@ -104,7 +104,7 @@ if so then run the appropriate source block from the Library."
(beginning-of-line 1) (beginning-of-line 1)
(when (looking-at org-babel-lob-one-liner-regexp) (when (looking-at org-babel-lob-one-liner-regexp)
(append (append
(mapcar #'org-babel-clean-text-properties (mapcar #'org-babel-clean-text-properties
(list (list
(format "%s%s(%s)%s" (format "%s%s(%s)%s"
(nonempty 3 12) (nonempty 3 12)
@ -115,7 +115,7 @@ if so then run the appropriate source block from the Library."
(nonempty 9 18))) (nonempty 9 18)))
(list (length (if (= (length (match-string 12)) 0) (list (length (if (= (length (match-string 12)) 0)
(match-string 2) (match-string 11)))))))))) (match-string 2) (match-string 11))))))))))
(defun org-babel-lob-execute (info) (defun org-babel-lob-execute (info)
"Execute the lob call specified by INFO." "Execute the lob call specified by INFO."
(let ((params (org-babel-process-params (let ((params (org-babel-process-params

View File

@ -98,7 +98,7 @@
(lambda (pair) (format "let %s = %s;;" (car pair) (lambda (pair) (format "let %s = %s;;" (car pair)
(org-babel-ocaml-elisp-to-ocaml (cdr pair)))) (org-babel-ocaml-elisp-to-ocaml (cdr pair))))
(mapcar #'cdr (org-babel-get-header params :var)))) (mapcar #'cdr (org-babel-get-header params :var))))
(defun org-babel-ocaml-elisp-to-ocaml (val) (defun org-babel-ocaml-elisp-to-ocaml (val)
"Return a string of ocaml code which evaluates to VAL." "Return a string of ocaml code which evaluates to VAL."
(if (listp val) (if (listp val)

View File

@ -45,10 +45,10 @@
;; PicoLisp _is_ an object-oriented database with a Prolog-based query ;; PicoLisp _is_ an object-oriented database with a Prolog-based query
;; language implemented in PicoLisp (Pilog). Database objects are ;; 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 ;; 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: ;;; Requirements:
@ -96,7 +96,7 @@
(defun org-babel-execute:picolisp (body params) (defun org-babel-execute:picolisp (body params)
"Execute a block of Picolisp code with org-babel. This function is "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") (message "executing Picolisp source code block")
(let* ( (let* (
;; name of the session or "none" ;; name of the session or "none"
@ -119,7 +119,7 @@
((member "value" result-params) ((member "value" result-params)
(format "(out \"/dev/null\" %s)" full-body)) (format "(out \"/dev/null\" %s)" full-body))
(t full-body)))) (t full-body))))
((lambda (result) ((lambda (result)
(if (or (member "verbatim" result-params) (if (or (member "verbatim" result-params)
(member "scalar" result-params) (member "scalar" result-params)

View File

@ -60,7 +60,7 @@
(declare-function org-narrow-to-subtree "org" ()) (declare-function org-narrow-to-subtree "org" ())
(declare-function org-id-find-id-in-file "org-id" (id file &optional markerp)) (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-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)) "org-compat" (&optional buffer-or-name norecord label))
(defvar org-babel-ref-split-regexp (defvar org-babel-ref-split-regexp

View File

@ -28,10 +28,10 @@
;;; Requirements: ;;; Requirements:
;; - ruby and irb executables :: http://www.ruby-lang.org/ ;; - ruby and irb executables :: http://www.ruby-lang.org/
;; ;;
;; - ruby-mode :: Can be installed through ELPA, or from ;; - ruby-mode :: Can be installed through ELPA, or from
;; http://github.com/eschulte/rinari/raw/master/util/ruby-mode.el ;; http://github.com/eschulte/rinari/raw/master/util/ruby-mode.el
;; ;;
;; - inf-ruby mode :: Can be installed through ELPA, or from ;; - inf-ruby mode :: Can be installed through ELPA, or from
;; http://github.com/eschulte/rinari/raw/master/util/inf-ruby.el ;; http://github.com/eschulte/rinari/raw/master/util/inf-ruby.el

View File

@ -40,7 +40,7 @@
;; - add more useful header arguments (user, passwd, database, etc...) ;; - add more useful header arguments (user, passwd, database, etc...)
;; - support for more engines (currently only supports mysql) ;; - support for more engines (currently only supports mysql)
;; - what's a reasonable way to drop table data into SQL? ;; - what's a reasonable way to drop table data into SQL?
;; ;;
;;; Code: ;;; Code:
(require 'ob) (require 'ob)

View File

@ -108,7 +108,7 @@ utf8 Use all UTF-8 characters")
(defun org-export-as-utf8 (&rest args) (defun org-export-as-utf8 (&rest args)
"Like `org-export-as-ascii', use encoding for special symbols." "Like `org-export-as-ascii', use encoding for special symbols."
(interactive) (interactive)
(org-export-as-encoding 'org-export-as-ascii (org-export-as-encoding 'org-export-as-ascii
(org-called-interactively-p 'any) (org-called-interactively-p 'any)
'utf8 args)) 'utf8 args))

View File

@ -56,7 +56,7 @@
(date &optional keep-restriction)) (date &optional keep-restriction))
(declare-function org-table-get-specials "org-table" ()) (declare-function org-table-get-specials "org-table" ())
(declare-function org-table-goto-line "org-table" (N)) (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)) (&optional buffer-or-name norecord label))
(defvar org-remember-default-headline) (defvar org-remember-default-headline)

View File

@ -1989,7 +1989,7 @@ the currently selected interval size."
(encode-time 0 0 0 (+ d n) m y)))) (encode-time 0 0 0 (+ d n) m y))))
((and wp (string-match "w\\|W" wp) mw (> (length wp) 0)) ((and wp (string-match "w\\|W" wp) mw (> (length wp) 0))
(require 'cal-iso) (require 'cal-iso)
(setq date (calendar-gregorian-from-absolute (setq date (calendar-gregorian-from-absolute
(calendar-absolute-from-iso (list (+ mw n) 1 y)))) (calendar-absolute-from-iso (list (+ mw n) 1 y))))
(setq ins (format-time-string (setq ins (format-time-string
"%G-W%V" "%G-W%V"
@ -2006,7 +2006,7 @@ the currently selected interval size."
(setq mw 5 (setq mw 5
y (- y 1)) 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)))) (calendar-absolute-from-iso (org-quarter-to-date (+ mw n) y))))
(setq ins (format-time-string (setq ins (format-time-string
(concatenate 'string (number-to-string y) "-Q" (number-to-string (+ mw n))) (concatenate 'string (number-to-string y) "-Q" (number-to-string (+ mw n)))
@ -2632,4 +2632,3 @@ The details of what will be saved are regulated by the variable
(provide 'org-clock) (provide 'org-clock)
;;; org-clock.el ends here ;;; org-clock.el ends here

View File

@ -76,21 +76,21 @@
(defgroup org-crypt nil (defgroup org-crypt nil
"Org Crypt" "Org Crypt"
:tag "Org Crypt" :tag "Org Crypt"
:group 'org) :group 'org)
(defcustom org-crypt-tag-matcher "crypt" (defcustom org-crypt-tag-matcher "crypt"
"The tag matcher used to find headings whose contents should be encrypted. "The tag matcher used to find headings whose contents should be encrypted.
See the \"Match syntax\" section of the org manual for more details." See the \"Match syntax\" section of the org manual for more details."
:type 'string :type 'string
:group 'org-crypt) :group 'org-crypt)
(defcustom org-crypt-key "" (defcustom org-crypt-key ""
"The default key to use when encrypting the contents of a heading. "The default key to use when encrypting the contents of a heading.
This setting can also be overridden in the CRYPTKEY property." This setting can also be overridden in the CRYPTKEY property."
:type 'string :type 'string
:group 'org-crypt) :group 'org-crypt)
(defcustom org-crypt-disable-auto-save 'ask (defcustom org-crypt-disable-auto-save 'ask

View File

@ -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")) (setq to (or to (gnus-fetch-original-field "To"))
newsgroups (gnus-fetch-original-field "Newsgroups") newsgroups (gnus-fetch-original-field "Newsgroups")
x-no-archive (gnus-fetch-original-field "x-no-archive"))) 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) :message-id message-id :group group :to to)
(when date (when date
(org-add-link-props :date date :date-timestamp date-ts (org-add-link-props :date date :date-timestamp date-ts

View File

@ -73,7 +73,7 @@
(require 'org) (require 'org)
(declare-function message-make-fqdn "message" ()) (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)) "org-compat" (&optional buffer-or-name norecord label))
;;; Customization ;;; Customization
@ -641,7 +641,3 @@ optional argument MARKERP, return the position as a new marker."
(provide 'org-id) (provide 'org-id)
;;; org-id.el ends here ;;; org-id.el ends here

View File

@ -59,7 +59,7 @@
(declare-function erc-server-buffer "erc" ()) (declare-function erc-server-buffer "erc" ())
(declare-function erc-get-server-nickname-list "erc" ()) (declare-function erc-get-server-nickname-list "erc" ())
(declare-function erc-cmd-JOIN "erc" (channel &optional key)) (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)) "org-compat" (&optional buffer-or-name norecord label))
(defvar org-irc-client 'erc (defvar org-irc-client 'erc

View File

@ -24,7 +24,7 @@
;;; Commentary: ;;; Commentary:
;; ;;
;;; Code: ;;; Code:

View File

@ -146,7 +146,7 @@ When completing for #+STARTUP, for example, this function returns
(org-split-string (org-get-current-options) "\n")) (org-split-string (org-get-current-options) "\n"))
org-additional-option-like-keywords))))) org-additional-option-like-keywords)))))
(substring pcomplete-stub 2))) (substring pcomplete-stub 2)))
(defvar org-startup-options) (defvar org-startup-options)
(defun pcomplete/org-mode/file-option/startup () (defun pcomplete/org-mode/file-option/startup ()
"Complete arguments for the #+STARTUP file option." "Complete arguments for the #+STARTUP file option."

View File

@ -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 org-publish-delete-dups "org-publish" (list))
(declare-function find-lisp-find-files "find-lisp" (directory regexp)) (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)) "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))) (let ((ctime (org-publish-cache-ctime-of-src filename)))
(or (< pstamp ctime) (or (< pstamp ctime)
(when included-files-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)))))))))) included-files-ctime))))))))))
(defun org-publish-cache-set-file-property (filename property value &optional project-name) (defun org-publish-cache-set-file-property (filename property value &optional project-name)

View File

@ -39,7 +39,7 @@
(declare-function remember "remember" (&optional initial)) (declare-function remember "remember" (&optional initial))
(declare-function remember-buffer-desc "remember" ()) (declare-function remember-buffer-desc "remember" ())
(declare-function remember-finalize "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)) "org-compat" (&optional buffer-or-name norecord label))
(defvar remember-save-after-remembering) (defvar remember-save-after-remembering)
@ -1152,4 +1152,3 @@ See also the variable `org-reverse-note-order'."
(provide 'org-remember) (provide 'org-remember)
;;; org-remember.el ends here ;;; org-remember.el ends here

View File

@ -51,7 +51,7 @@ interpreted by other mechanisms.")
(defun org-special-blocks-make-special-cookies () (defun org-special-blocks-make-special-cookies ()
"Adds special cookies when #+begin_foo and #+end_foo tokens are "Adds special cookies when #+begin_foo and #+end_foo tokens are
seen. This is run after a few special cases are taken care of." 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)) (eq org-export-current-backend 'latex))
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward "^[ \t]*#\\+\\(begin\\|end\\)_\\(.*\\)$" nil t) (while (re-search-forward "^[ \t]*#\\+\\(begin\\|end\\)_\\(.*\\)$" nil t)

View File

@ -2436,7 +2436,7 @@ not overwrite the stored one."
(modes (copy-sequence org-calc-default-modes)) (modes (copy-sequence org-calc-default-modes))
(numbers nil) ; was a variable, now fixed default (numbers nil) ; was a variable, now fixed default
(keep-empty nil) (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) duration duration-output-format)
;; Parse the format string. Since we have a lot of modes, this is ;; 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. ;; 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 duration-output-format nil
fmt (replace-match "" t t fmt))) fmt (replace-match "" t t fmt)))
(if (string-match "t" fmt) (if (string-match "t" fmt)
(setq duration t (setq duration t
duration-output-format org-table-duration-custom-format duration-output-format org-table-duration-custom-format
numbers t numbers t
fmt (replace-match "" t t fmt))) fmt (replace-match "" t t fmt)))
@ -2529,7 +2529,7 @@ not overwrite the stored one."
;; Insert complex ranges ;; Insert complex ranges
(while (and (string-match org-table-range-regexp form) (while (and (string-match org-table-range-regexp form)
(> (length (match-string 0 form)) 1)) (> (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))) (org-table-get-range (match-string 0 form) nil n0)))
(setq formrpl (setq formrpl
(save-match-data (save-match-data
@ -4759,4 +4759,3 @@ list of the fields in the rectangle ."
(provide 'org-table) (provide 'org-table)
;;; org-table.el ends here ;;; org-table.el ends here

View File

@ -355,8 +355,8 @@ information, all the properties, etc."
(let* ((props (org-entry-properties)) (let* ((props (org-entry-properties))
(components (org-heading-components)) (components (org-heading-components))
(level (nth 1 components)) (level (nth 1 components))
(headline (headline
(replace-regexp-in-string (replace-regexp-in-string
"\"" "\\\"" (nth 4 components) t t)) ; quote double quotes in headlines "\"" "\\\"" (nth 4 components) t t)) ; quote double quotes in headlines
(parent-ordered (org-taskjuggler-parent-is-ordered-p))) (parent-ordered (org-taskjuggler-parent-is-ordered-p)))
(push (cons "level" level) props) (push (cons "level" level) props)
@ -406,10 +406,10 @@ deeper), then it's not a leaf."
(successor (car (cdr tasks)))) (successor (car (cdr tasks))))
(cond (cond
;; if a task has no successors it is a leaf ;; if a task has no successors it is a leaf
((null successor) ((null successor)
(push (cons (cons "leaf-node" t) task) new-list)) (push (cons (cons "leaf-node" t) task) new-list))
;; if the successor has a lower level than task it is a leaf ;; 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)) (push (cons (cons "leaf-node" t) task) new-list))
;; otherwise examine the rest of the tasks ;; otherwise examine the rest of the tasks
(t (push task new-list)))) (t (push task new-list))))

View File

@ -12775,7 +12775,7 @@ this case the return value is a list of all return values from these calls.
MATCHER is a Lisp form to be evaluated, testing if a given set of tags MATCHER is a Lisp form to be evaluated, testing if a given set of tags
qualifies a headline for inclusion. When TODO-ONLY is non-nil, qualifies a headline for inclusion. When TODO-ONLY is non-nil,
only lines with a not-done TODO keyword are included in the output. only lines with a not-done TODO keyword are included in the output.
This should be the same variable that was scoped into This should be the same variable that was scoped into
and set by `org-make-tags-matcher' when it constructed MATCHER. and set by `org-make-tags-matcher' when it constructed MATCHER.
START-LEVEL can be a string with asterisks, reducing the scope to START-LEVEL can be a string with asterisks, reducing the scope to