diff options
| author | Juanma Barranquero | 2006-02-23 14:43:40 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2006-02-23 14:43:40 +0000 |
| commit | 35402b9845e63e8e97371c0f70b2ac409ff288f0 (patch) | |
| tree | c6b081c014ad723f8d705deef2a68d5142a083cc | |
| parent | cca179692374bb39769ca42e6350c1da07720329 (diff) | |
| download | emacs-35402b9845e63e8e97371c0f70b2ac409ff288f0.tar.gz emacs-35402b9845e63e8e97371c0f70b2ac409ff288f0.zip | |
(org-xemacs-p, org-export-html-show-new-buffer, org-table-may-need-update,
org-insert-item, org-mhe-get-message-real-folder,
org-mhe-get-message-folder-from-index, org-mhe-get-message-folder,
org-mhe-get-message-num, org-mhe-get-header, org-make-org-heading-search-string,
org-make-org-heading-camel, org-table-sort-lines, org-format-org-table-html,
org-format-table-table-html): Fix typos in docstrings.
| -rw-r--r-- | lisp/ChangeLog | 51 | ||||
| -rw-r--r-- | lisp/textmodes/org.el | 63 |
2 files changed, 63 insertions, 51 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9c1ff952196..601f4928a13 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,15 @@ | |||
| 1 | 2006-02-23 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * textmodes/org.el (org-xemacs-p) | ||
| 4 | (org-export-html-show-new-buffer, org-table-may-need-update) | ||
| 5 | (org-insert-item, org-mhe-get-message-real-folder) | ||
| 6 | (org-mhe-get-message-folder-from-index) | ||
| 7 | (org-mhe-get-message-folder, org-mhe-get-message-num) | ||
| 8 | (org-mhe-get-header, org-make-org-heading-search-string) | ||
| 9 | (org-make-org-heading-camel, org-table-sort-lines) | ||
| 10 | (org-format-org-table-html, org-format-table-table-html): | ||
| 11 | Fix typos in docstrings. | ||
| 12 | |||
| 1 | 12006-02-23 Carsten Dominik <dominik@science.uva.nl> | 13 | 12006-02-23 Carsten Dominik <dominik@science.uva.nl> |
| 2 | 14 | ||
| 3 | * textmodes/org.el (org-cleaned-string-for-export) | 15 | * textmodes/org.el (org-cleaned-string-for-export) |
| @@ -40,7 +52,7 @@ | |||
| 40 | * textmodes/reftex.el (reftex-locate-file): Search all extensions | 52 | * textmodes/reftex.el (reftex-locate-file): Search all extensions |
| 41 | if `reftex-try-all-extensions' is set. | 53 | if `reftex-try-all-extensions' is set. |
| 42 | 54 | ||
| 43 | * textmodes/org.el (org-mark-ring-previous, org-mark-ring-set): | 55 | * textmodes/org.el (org-mark-ring-push, org-mark-ring-goto): |
| 44 | New commands. | 56 | New commands. |
| 45 | (org-mark-ring): New variable. | 57 | (org-mark-ring): New variable. |
| 46 | (org-mark-ring-length): New option. | 58 | (org-mark-ring-length): New option. |
| @@ -48,12 +60,12 @@ | |||
| 48 | onto the mark ring. | 60 | onto the mark ring. |
| 49 | (org-add-hook): New function. | 61 | (org-add-hook): New function. |
| 50 | (org-export-table-remove-special-lines): New option. | 62 | (org-export-table-remove-special-lines): New option. |
| 51 | (org-skip-comments, org-format-org-table-html): Respect new option | 63 | (org-skip-comments, org-format-org-table-html): Respect new |
| 52 | `org-export-table-remove-special-lines'. | 64 | option `org-export-table-remove-special-lines'. |
| 53 | (org-open-file): Allow special command configuration for directory | 65 | (org-open-file): Allow special command configuration for |
| 54 | link. | 66 | directory link. |
| 55 | (org-file-apps): Fixed bugs in customize type, added setting for | 67 | (org-file-apps): Fixed bugs in customize type, added setting |
| 56 | directories. | 68 | for directories. |
| 57 | (org-activate-tags, org-format-agenda-item, org-complete) | 69 | (org-activate-tags, org-format-agenda-item, org-complete) |
| 58 | (org-get-tags-at, org-scan-tags, org-make-tags-matcher) | 70 | (org-get-tags-at, org-scan-tags, org-make-tags-matcher) |
| 59 | (org-get-tags, org-get-buffer-tags, org-open-at-point) | 71 | (org-get-tags, org-get-buffer-tags, org-open-at-point) |
| @@ -62,30 +74,31 @@ | |||
| 62 | (org-radio-targets, org-file-link-context-use-camel-case) | 74 | (org-radio-targets, org-file-link-context-use-camel-case) |
| 63 | (org-activate-camels): New options. | 75 | (org-activate-camels): New options. |
| 64 | (org-update-radio-target-regexp, org-all-targets) | 76 | (org-update-radio-target-regexp, org-all-targets) |
| 65 | (org-make-target-link-regexp, org-activate-target-links): New | 77 | (org-make-target-link-regexp, org-activate-target-links): |
| 66 | functions. | 78 | New functions. |
| 67 | (org-make-org-heading-search-string): New function. | 79 | (org-make-org-heading-search-string): New function. |
| 68 | (org-store-link, org-insert-link): Use new option | 80 | (org-store-link, org-insert-link): Use new option |
| 69 | `org-file-link-context-use-camel-case'. | 81 | `org-file-link-context-use-camel-case'. |
| 70 | (org-activate-camels): Use new option `org-activate-camels'. | 82 | (org-activate-camels): Use new option `org-activate-camels'. |
| 71 | (org-link-regexp): Added mhe prefix. | 83 | (org-link-regexp): Added mhe prefix. |
| 72 | (org-open-at-point,org-store-link): Support for mhe links. | 84 | (org-open-at-point, org-store-link): Support for mhe links. |
| 73 | (org-mhe-get-message-id, org-mhe-get-message-folder) | 85 | (org-mhe-get-message-real-folder, org-mhe-get-message-folder) |
| 74 | (org-mhe-get-header,org-follow-mhe-link): New functions. | 86 | (org-mhe-get-message-folder-from-index, org-mhe-get-message-num) |
| 75 | (org-remove-angle-brackets, org-add-angle-brackets): New | 87 | (org-mhe-get-header, org-follow-mhe-link): New functions. |
| 76 | functions. | 88 | (org-remove-angle-brackets, org-add-angle-brackets): |
| 77 | (org-bracked-link-regexp): New constant. | 89 | New functions. |
| 90 | (org-bracket-link-regexp): New constant. | ||
| 78 | (org-read-date): Fixed bug that was rejecting all typed dates. | 91 | (org-read-date): Fixed bug that was rejecting all typed dates. |
| 79 | (org-link-search): Make hierarchy above visible after a match. | 92 | (org-link-search): Make hierarchy above visible after a match. |
| 80 | (org-follow-bbdb-link): Inhibit electric mode for BBDB. | 93 | (org-follow-bbdb-link): Inhibit electric mode for BBDB. |
| 81 | (org-store-link): Fixed bug with link creation when cursor is in | 94 | (org-store-link): Fixed bug with link creation when cursor is in |
| 82 | an empty line. | 95 | an empty line. |
| 83 | (org-open-at-point): Fixed bug with matching a link. Fixed buggy | 96 | (org-open-at-point): Fixed bug with matching a link. |
| 84 | argument sequence in call to `org-view-tags'. | 97 | Fixed buggy argument sequence in call to `org-view-tags'. |
| 85 | (org-compile-prefix-format): Set `org-prefix-has-tag'. | 98 | (org-compile-prefix-format): Set `org-prefix-has-tag'. |
| 86 | (org-prefix-has-tag): New variable. | 99 | (org-prefix-has-tag): New variable. |
| 87 | (org-format-agenda-item): Remove tags from headline if | 100 | (org-format-agenda-item): Remove tags from headline |
| 88 | appropriate. | 101 | if appropriate. |
| 89 | (org-agenda-remove-tags-when-in-prefix): New option. | 102 | (org-agenda-remove-tags-when-in-prefix): New option. |
| 90 | 103 | ||
| 91 | 2006-02-21 Michael Kifer <kifer@cs.stonybrook.edu> | 104 | 2006-02-21 Michael Kifer <kifer@cs.stonybrook.edu> |
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index ab06318e0e5..cecfe7f5164 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el | |||
| @@ -140,7 +140,7 @@ | |||
| 140 | ;; versions (Emacs versus XEmacs) and with different versions of outline.el. | 140 | ;; versions (Emacs versus XEmacs) and with different versions of outline.el. |
| 141 | ;; The compatibility code in org.el is based on these two constants. | 141 | ;; The compatibility code in org.el is based on these two constants. |
| 142 | (defconst org-xemacs-p (featurep 'xemacs) | 142 | (defconst org-xemacs-p (featurep 'xemacs) |
| 143 | "Are we running xemacs?") | 143 | "Are we running XEmacs?") |
| 144 | (defconst org-noutline-p (featurep 'noutline) | 144 | (defconst org-noutline-p (featurep 'noutline) |
| 145 | "Are we using the new outline mode?") | 145 | "Are we using the new outline mode?") |
| 146 | 146 | ||
| @@ -1651,7 +1651,7 @@ Otherwise the buffer will just be saved to a file and stay hidden." | |||
| 1651 | :type 'boolean) | 1651 | :type 'boolean) |
| 1652 | 1652 | ||
| 1653 | (defcustom org-export-html-show-new-buffer nil | 1653 | (defcustom org-export-html-show-new-buffer nil |
| 1654 | "Non-nil means, popup buffer containing the exported html text. | 1654 | "Non-nil means, popup buffer containing the exported HTML text. |
| 1655 | Otherwise, the buffer will just be saved to a file and stay hidden." | 1655 | Otherwise, the buffer will just be saved to a file and stay hidden." |
| 1656 | :group 'org-export | 1656 | :group 'org-export |
| 1657 | :type 'boolean) | 1657 | :type 'boolean) |
| @@ -1999,8 +1999,8 @@ When this is non-nil, the headline after the keyword is set to the | |||
| 1999 | ;; an update. | 1999 | ;; an update. |
| 2000 | (defvar org-table-may-need-update t | 2000 | (defvar org-table-may-need-update t |
| 2001 | "Indicates that a table might need an update. | 2001 | "Indicates that a table might need an update. |
| 2002 | This variable is set by `org-before-change-function'. `org-table-align' | 2002 | This variable is set by `org-before-change-function'. |
| 2003 | sets it back to nil.") | 2003 | `org-table-align'sets it back to nil.") |
| 2004 | (defvar org-mode-hook nil) | 2004 | (defvar org-mode-hook nil) |
| 2005 | (defvar org-inhibit-startup nil) ; Dynamically-scoped param. | 2005 | (defvar org-inhibit-startup nil) ; Dynamically-scoped param. |
| 2006 | (defvar org-agenda-keep-modes nil) ; Dynamically-scoped param. | 2006 | (defvar org-agenda-keep-modes nil) ; Dynamically-scoped param. |
| @@ -2660,7 +2660,7 @@ or nil." | |||
| 2660 | 2660 | ||
| 2661 | (defun org-insert-item () | 2661 | (defun org-insert-item () |
| 2662 | "Insert a new item at the current level. | 2662 | "Insert a new item at the current level. |
| 2663 | Return t when tings worked, nil when we are not in an item." | 2663 | Return t when things worked, nil when we are not in an item." |
| 2664 | (when (save-excursion | 2664 | (when (save-excursion |
| 2665 | (condition-case nil | 2665 | (condition-case nil |
| 2666 | (progn | 2666 | (progn |
| @@ -3371,7 +3371,7 @@ At all other locations, this simply calls `ispell-complete-word'." | |||
| 3371 | (save-excursion | 3371 | (save-excursion |
| 3372 | (goto-char (point-min)) | 3372 | (goto-char (point-min)) |
| 3373 | (while (re-search-forward org-todo-line-regexp nil t) | 3373 | (while (re-search-forward org-todo-line-regexp nil t) |
| 3374 | (push (list | 3374 | (push (list |
| 3375 | (if org-file-link-context-use-camel-case | 3375 | (if org-file-link-context-use-camel-case |
| 3376 | (org-make-org-heading-camel (match-string 3) t) | 3376 | (org-make-org-heading-camel (match-string 3) t) |
| 3377 | (org-make-org-heading-search-string | 3377 | (org-make-org-heading-search-string |
| @@ -6988,7 +6988,7 @@ to read." | |||
| 6988 | (interactive) | 6988 | (interactive) |
| 6989 | (setq pos (or pos (point))) | 6989 | (setq pos (or pos (point))) |
| 6990 | (setq org-mark-ring (nthcdr (1- org-mark-ring-length) org-mark-ring)) | 6990 | (setq org-mark-ring (nthcdr (1- org-mark-ring-length) org-mark-ring)) |
| 6991 | (move-marker (car org-mark-ring) | 6991 | (move-marker (car org-mark-ring) |
| 6992 | (or pos (point)) | 6992 | (or pos (point)) |
| 6993 | (or buffer (current-buffer))) | 6993 | (or buffer (current-buffer))) |
| 6994 | (message | 6994 | (message |
| @@ -7136,14 +7136,14 @@ onto the ring." | |||
| 7136 | ;; mh-e integration based on planner-mode | 7136 | ;; mh-e integration based on planner-mode |
| 7137 | (defun org-mhe-get-message-real-folder () | 7137 | (defun org-mhe-get-message-real-folder () |
| 7138 | "Return the name of the current message real folder, so if you use | 7138 | "Return the name of the current message real folder, so if you use |
| 7139 | sequences, it will now work." | 7139 | sequences, it will now work." |
| 7140 | (save-excursion | 7140 | (save-excursion |
| 7141 | (let* ((folder | 7141 | (let* ((folder |
| 7142 | (if (equal major-mode 'mh-folder-mode) | 7142 | (if (equal major-mode 'mh-folder-mode) |
| 7143 | mh-current-folder | 7143 | mh-current-folder |
| 7144 | ;; Refer to the show buffer | 7144 | ;; Refer to the show buffer |
| 7145 | mh-show-folder-buffer)) | 7145 | mh-show-folder-buffer)) |
| 7146 | (end-index | 7146 | (end-index |
| 7147 | (if (boundp 'mh-index-folder) | 7147 | (if (boundp 'mh-index-folder) |
| 7148 | (min (length mh-index-folder) (length folder)))) | 7148 | (min (length mh-index-folder) (length folder)))) |
| 7149 | ) | 7149 | ) |
| @@ -7166,8 +7166,7 @@ onto the ring." | |||
| 7166 | ))) | 7166 | ))) |
| 7167 | 7167 | ||
| 7168 | (defun org-mhe-get-message-folder-from-index () | 7168 | (defun org-mhe-get-message-folder-from-index () |
| 7169 | "Returns the name of the message folder in a index folder | 7169 | "Returns the name of the message folder in a index folder buffer." |
| 7170 | buffer." | ||
| 7171 | (save-excursion | 7170 | (save-excursion |
| 7172 | (mh-index-previous-folder) | 7171 | (mh-index-previous-folder) |
| 7173 | (if (not (re-search-forward "^\\(+.*\\)$" nil t)) | 7172 | (if (not (re-search-forward "^\\(+.*\\)$" nil t)) |
| @@ -7175,8 +7174,8 @@ onto the ring." | |||
| 7175 | (message (match-string 1))))) | 7174 | (message (match-string 1))))) |
| 7176 | 7175 | ||
| 7177 | (defun org-mhe-get-message-folder () | 7176 | (defun org-mhe-get-message-folder () |
| 7178 | "Return the name of the current message folder. Be careful if you | 7177 | "Return the name of the current message folder. Be careful if you |
| 7179 | use sequences." | 7178 | use sequences." |
| 7180 | (save-excursion | 7179 | (save-excursion |
| 7181 | (if (equal major-mode 'mh-folder-mode) | 7180 | (if (equal major-mode 'mh-folder-mode) |
| 7182 | mh-current-folder | 7181 | mh-current-folder |
| @@ -7184,8 +7183,8 @@ onto the ring." | |||
| 7184 | mh-show-folder-buffer))) | 7183 | mh-show-folder-buffer))) |
| 7185 | 7184 | ||
| 7186 | (defun org-mhe-get-message-num () | 7185 | (defun org-mhe-get-message-num () |
| 7187 | "Return the number of the current message. Be careful if you | 7186 | "Return the number of the current message. Be careful if you |
| 7188 | use sequences." | 7187 | use sequences." |
| 7189 | (save-excursion | 7188 | (save-excursion |
| 7190 | (if (equal major-mode 'mh-folder-mode) | 7189 | (if (equal major-mode 'mh-folder-mode) |
| 7191 | (mh-get-msg-num nil) | 7190 | (mh-get-msg-num nil) |
| @@ -7193,9 +7192,9 @@ onto the ring." | |||
| 7193 | (mh-show-buffer-message-number)))) | 7192 | (mh-show-buffer-message-number)))) |
| 7194 | 7193 | ||
| 7195 | (defun org-mhe-get-header (header) | 7194 | (defun org-mhe-get-header (header) |
| 7196 | "Return a header of the message in folder mode. This will create a | 7195 | "Return a header of the message in folder mode. This will create a |
| 7197 | show buffer for the corresponding message. If you have a more clever | 7196 | show buffer for the corresponding message. If you have a more clever |
| 7198 | idea..." | 7197 | idea..." |
| 7199 | (let* ((folder (org-mhe-get-message-folder)) | 7198 | (let* ((folder (org-mhe-get-message-folder)) |
| 7200 | (num (org-mhe-get-message-num)) | 7199 | (num (org-mhe-get-message-num)) |
| 7201 | (buffer (get-buffer-create (concat "show-" folder))) | 7200 | (buffer (get-buffer-create (concat "show-" folder))) |
| @@ -7222,7 +7221,7 @@ onto the ring." | |||
| 7222 | (get-buffer-create show-buf) | 7221 | (get-buffer-create show-buf) |
| 7223 | (mh-show-msg | 7222 | (mh-show-msg |
| 7224 | (string-to-number | 7223 | (string-to-number |
| 7225 | (car (split-string | 7224 | (car (split-string |
| 7226 | (with-temp-buffer | 7225 | (with-temp-buffer |
| 7227 | (call-process | 7226 | (call-process |
| 7228 | (expand-file-name "pick" mh-progs) | 7227 | (expand-file-name "pick" mh-progs) |
| @@ -7387,7 +7386,7 @@ For file links, arg negates `org-context-in-file-links'." | |||
| 7387 | (setq cpltxt (concat from-header " on: " subject)) | 7386 | (setq cpltxt (concat from-header " on: " subject)) |
| 7388 | (setq link (concat cpltxt "\n " | 7387 | (setq link (concat cpltxt "\n " |
| 7389 | (org-make-link | 7388 | (org-make-link |
| 7390 | "mhe:" (org-mhe-get-message-real-folder) "#" | 7389 | "mhe:" (org-mhe-get-message-real-folder) "#" |
| 7391 | (org-remove-angle-brackets | 7390 | (org-remove-angle-brackets |
| 7392 | (org-mhe-get-header "Message-Id:"))))))) | 7391 | (org-mhe-get-header "Message-Id:"))))))) |
| 7393 | 7392 | ||
| @@ -7495,7 +7494,7 @@ For file links, arg negates `org-context-in-file-links'." | |||
| 7495 | (error "Cannot link to a buffer which is not visiting a file")) | 7494 | (error "Cannot link to a buffer which is not visiting a file")) |
| 7496 | 7495 | ||
| 7497 | (t (setq link nil))) | 7496 | (t (setq link nil))) |
| 7498 | 7497 | ||
| 7499 | (if (and (interactive-p) link) | 7498 | (if (and (interactive-p) link) |
| 7500 | (progn | 7499 | (progn |
| 7501 | (setq org-stored-links | 7500 | (setq org-stored-links |
| @@ -7504,7 +7503,7 @@ For file links, arg negates `org-context-in-file-links'." | |||
| 7504 | link))) | 7503 | link))) |
| 7505 | 7504 | ||
| 7506 | (defun org-make-org-heading-search-string (&optional string heading) | 7505 | (defun org-make-org-heading-search-string (&optional string heading) |
| 7507 | "Make search string for S or current headline." | 7506 | "Make search string for STRING or current headline." |
| 7508 | (interactive) | 7507 | (interactive) |
| 7509 | (let ((s (or string (org-get-heading)))) | 7508 | (let ((s (or string (org-get-heading)))) |
| 7510 | (unless (and string (not heading)) | 7509 | (unless (and string (not heading)) |
| @@ -7525,7 +7524,7 @@ For file links, arg negates `org-context-in-file-links'." | |||
| 7525 | (mapconcat 'identity (org-split-string s "[ \t]+") " "))) | 7524 | (mapconcat 'identity (org-split-string s "[ \t]+") " "))) |
| 7526 | 7525 | ||
| 7527 | (defun org-make-org-heading-camel (&optional string heading) | 7526 | (defun org-make-org-heading-camel (&optional string heading) |
| 7528 | "Make a CamelCase string for S or the current headline." | 7527 | "Make a CamelCase string for STRING or the current headline." |
| 7529 | (interactive) | 7528 | (interactive) |
| 7530 | (let ((s (or string (org-get-heading)))) | 7529 | (let ((s (or string (org-get-heading)))) |
| 7531 | (unless (and string (not heading)) | 7530 | (unless (and string (not heading)) |
| @@ -8642,8 +8641,8 @@ Point and mark define the first and last line to include. Both point and | |||
| 8642 | mark should be in the column that is used for sorting. For example, to | 8641 | mark should be in the column that is used for sorting. For example, to |
| 8643 | sort according to column 3, put the mark in the first line to sort, in | 8642 | sort according to column 3, put the mark in the first line to sort, in |
| 8644 | table column 3. Put point into the last line to be included in the sorting, | 8643 | table column 3. Put point into the last line to be included in the sorting, |
| 8645 | also in table column 3. The command will prompt for the sorting method (n for | 8644 | also in table column 3. The command will prompt for the sorting method |
| 8646 | numerical, a for alphanumeric)." | 8645 | \(n for numerical, a for alphanumeric)." |
| 8647 | (interactive "r\nsSorting method: [n]=numeric [a]=alpha: ") | 8646 | (interactive "r\nsSorting method: [n]=numeric [a]=alpha: ") |
| 8648 | (setq numericp (string-match "[nN]" numericp)) | 8647 | (setq numericp (string-match "[nN]" numericp)) |
| 8649 | (org-table-align) ;; Just to be safe | 8648 | (org-table-align) ;; Just to be safe |
| @@ -9482,8 +9481,8 @@ not overwrite the stored one." | |||
| 9482 | (if (= c ?p) (setq modes (org-set-calc-mode 'calc-internal-prec n)) | 9481 | (if (= c ?p) (setq modes (org-set-calc-mode 'calc-internal-prec n)) |
| 9483 | (setq modes (org-set-calc-mode | 9482 | (setq modes (org-set-calc-mode |
| 9484 | 'calc-float-format | 9483 | 'calc-float-format |
| 9485 | (list (cdr (assoc c '((?n. float) (?f. fix) | 9484 | (list (cdr (assoc c '((?n . float) (?f . fix) |
| 9486 | (?s. sci) (?e. eng)))) | 9485 | (?s . sci) (?e . eng)))) |
| 9487 | n)))) | 9486 | n)))) |
| 9488 | (setq fmt (replace-match "" t t fmt))) | 9487 | (setq fmt (replace-match "" t t fmt))) |
| 9489 | (while (string-match "[DRFS]" fmt) | 9488 | (while (string-match "[DRFS]" fmt) |
| @@ -11004,7 +11003,7 @@ headlines. The default is 3. Lower levels will become bulleted lists." | |||
| 11004 | ;; make targets to anchors | 11003 | ;; make targets to anchors |
| 11005 | (while (string-match "<<<?\\([^<>]*\\)>>>?[ \t]*\n?" line) | 11004 | (while (string-match "<<<?\\([^<>]*\\)>>>?[ \t]*\n?" line) |
| 11006 | (setq line (replace-match | 11005 | (setq line (replace-match |
| 11007 | (concat "@<a name=\"" | 11006 | (concat "@<a name=\"" |
| 11008 | (org-solidify-link-text (match-string 1 line)) | 11007 | (org-solidify-link-text (match-string 1 line)) |
| 11009 | "\">\\nbsp@</a>") | 11008 | "\">\\nbsp@</a>") |
| 11010 | t t line))) | 11009 | t t line))) |
| @@ -11012,7 +11011,7 @@ headlines. The default is 3. Lower levels will become bulleted lists." | |||
| 11012 | (while (string-match org-bracket-link-regexp line) | 11011 | (while (string-match org-bracket-link-regexp line) |
| 11013 | (setq line (replace-match | 11012 | (setq line (replace-match |
| 11014 | (concat | 11013 | (concat |
| 11015 | "@<a href=\"#" | 11014 | "@<a href=\"#" |
| 11016 | (org-solidify-link-text (match-string 1 line)) | 11015 | (org-solidify-link-text (match-string 1 line)) |
| 11017 | "\">" | 11016 | "\">" |
| 11018 | (match-string (if (match-end 3) 3 1) line) | 11017 | (match-string (if (match-end 3) 3 1) line) |
| @@ -11197,7 +11196,7 @@ headlines. The default is 3. Lower levels will become bulleted lists." | |||
| 11197 | (org-format-table-table-html-using-table-generate-source olines))))) | 11196 | (org-format-table-table-html-using-table-generate-source olines))))) |
| 11198 | 11197 | ||
| 11199 | (defun org-format-org-table-html (lines) | 11198 | (defun org-format-org-table-html (lines) |
| 11200 | "Format a table into html." | 11199 | "Format a table into HTML." |
| 11201 | (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines))) | 11200 | (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines))) |
| 11202 | (setq lines (nreverse lines)) | 11201 | (setq lines (nreverse lines)) |
| 11203 | (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines))) | 11202 | (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines))) |
| @@ -11224,7 +11223,7 @@ headlines. The default is 3. Lower levels will become bulleted lists." | |||
| 11224 | (string-match "^[ \t]*|[^|]*|" x)) | 11223 | (string-match "^[ \t]*|[^|]*|" x)) |
| 11225 | (replace-match "|" t t x)))) | 11224 | (replace-match "|" t t x)))) |
| 11226 | lines)))))) | 11225 | lines)))))) |
| 11227 | 11226 | ||
| 11228 | (let ((head (and org-export-highlight-first-table-line | 11227 | (let ((head (and org-export-highlight-first-table-line |
| 11229 | (delq nil (mapcar | 11228 | (delq nil (mapcar |
| 11230 | (lambda (x) (string-match "^[ \t]*|-" x)) | 11229 | (lambda (x) (string-match "^[ \t]*|-" x)) |
| @@ -11263,7 +11262,7 @@ headlines. The default is 3. Lower levels will become bulleted lists." | |||
| 11263 | newstr)) | 11262 | newstr)) |
| 11264 | 11263 | ||
| 11265 | (defun org-format-table-table-html (lines) | 11264 | (defun org-format-table-table-html (lines) |
| 11266 | "Format a table generated by table.el into html. | 11265 | "Format a table generated by table.el into HTML. |
| 11267 | This conversion does *not* use `table-generate-source' from table.el. | 11266 | This conversion does *not* use `table-generate-source' from table.el. |
| 11268 | This has the advantage that Org-mode's HTML conversions can be used. | 11267 | This has the advantage that Org-mode's HTML conversions can be used. |
| 11269 | But it has the disadvantage, that no cell- or row-spanning is allowed." | 11268 | But it has the disadvantage, that no cell- or row-spanning is allowed." |