diff options
author | Nicolas Goaziou <n.goaziou@gmail.com> | 2014-01-28 21:30:48 +0100 |
---|---|---|
committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2014-01-28 21:36:54 +0100 |
commit | 6a00c96541a2a01c08fbeeaf96e552683d9c3163 (patch) | |
tree | e665619c73ddb75d6d5f925df12bcf9ade81bf37 | |
parent | e45d13d94e1185db14031e0becafb6911b7a57b6 (diff) | |
download | org-mode-6a00c96541a2a01c08fbeeaf96e552683d9c3163.tar.gz |
Remove left over references to QUOTE blocks
* lisp/org.el (org-quote-string): Remove variable.
(org-enable-fixed-width-editor, org-context): Update docstring.
(org-toggle-fixed-width-section): Remove function and binding.
(org-set-font-lock-defaults): Remove reference to `org-quote-string'.
* lisp/org-element.el (org-element-headline-parser,
org-element-headline-interpreter): Remove references to
`org-quote-string'.
* testing/lisp/test-org-element.el (test-org-element/headline-quote-keyword):
Remove test.
(test-org-element/headline-interpreter): Remove a test.
-rw-r--r-- | lisp/org-element.el | 19 | ||||
-rw-r--r-- | lisp/org.el | 64 | ||||
-rw-r--r-- | testing/lisp/test-org-element.el | 41 |
3 files changed, 9 insertions, 115 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el index 92eff3a..655bcf3 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -796,8 +796,8 @@ Return a list whose CAR is `headline' and CDR is a plist containing `:raw-value', `:title', `:alt-title', `:begin', `:end', `:pre-blank', `:contents-begin' and `:contents-end', `:level', `:priority', `:tags', `:todo-keyword',`:todo-type', -`:scheduled', `:deadline', `:closed', `:quotedp', `:archivedp', -`:commentedp' and `:footnote-section-p' keywords. +`:scheduled', `:deadline', `:closed', `:archivedp', `:commentedp' +and `:footnote-section-p' keywords. The plist also contains any property set in the property drawer, with its name in upper cases and colons added at the @@ -816,10 +816,6 @@ Assume point is at beginning of the headline." (tags (let ((raw-tags (nth 5 components))) (and raw-tags (org-split-string raw-tags ":")))) (raw-value (or (nth 4 components) "")) - (quotedp - (let ((case-fold-search nil)) - (string-match (format "^%s\\( \\|$\\)" org-quote-string) - raw-value))) (commentedp (let ((case-fold-search nil)) (string-match (format "^%s\\( \\|$\\)" org-comment-string) @@ -870,13 +866,11 @@ Assume point is at beginning of the headline." (forward-line) (point))))) ;; Clean RAW-VALUE from any quote or comment string. - (when (or quotedp commentedp) + (when commentedp (let ((case-fold-search nil)) (setq raw-value (replace-regexp-in-string - (concat - (regexp-opt (list org-quote-string org-comment-string)) - "\\(?: \\|$\\)") + (concat (regexp-quote org-comment-string) "\\(?: \\|$\\)") "" raw-value)))) ;; Clean TAGS from archive tag, if any. @@ -905,8 +899,7 @@ Assume point is at beginning of the headline." end) :footnote-section-p footnote-section-p :archivedp archivedp - :commentedp commentedp - :quotedp quotedp) + :commentedp commentedp) time-props standard-props)))) (let ((alt-title (org-element-property :ALT_TITLE headline))) @@ -937,11 +930,9 @@ CONTENTS is the contents of the element." (and tag-list (format ":%s:" (mapconcat 'identity tag-list ":"))))) (commentedp (org-element-property :commentedp headline)) - (quotedp (org-element-property :quotedp headline)) (pre-blank (or (org-element-property :pre-blank headline) 0)) (heading (concat (make-string (org-reduced-level level) ?*) (and todo (concat " " todo)) - (and quotedp (concat " " org-quote-string)) (and commentedp (concat " " org-comment-string)) (and priority (format " [#%s]" (char-to-string priority))) diff --git a/lisp/org.el b/lisp/org.el index 5b35f3a..703e47e 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -429,12 +429,6 @@ not contribute to the agenda listings.") An entry can be toggled between COMMENT and normal with \\[org-toggle-comment].") -(defconst org-quote-string "QUOTE" - "Entries starting with this keyword will be exported in fixed-width font. -Quoting applies only to the text in the entry following the headline, and does -not extend beyond the next headline, even if that is lower level. -An entry can be toggled between QUOTE and normal with -\\[org-toggle-fixed-width-section].") ;;;; LaTeX Environments and Fragments @@ -1554,8 +1548,7 @@ the list structure." (defcustom org-enable-fixed-width-editor t "Non-nil means lines starting with \":\" are treated as fixed-width. This currently only means they are never auto-wrapped. -When nil, such lines will be treated like ordinary lines. -See also the QUOTE keyword." +When nil, such lines will be treated like ordinary lines." :group 'org-edit-structure :type 'boolean) @@ -6324,9 +6317,7 @@ needs to be inserted at a specific position in the font-lock sequence.") '(org-activate-code (1 'org-code t)) ;; COMMENT (list (format org-heading-keyword-regexp-format - (concat "\\(" - org-comment-string "\\|" org-quote-string - "\\)")) + (concat "\\(" org-comment-string "\\)")) '(2 'org-special-keyword t)) ;; Blocks and meta lines '(org-fontify-meta-lines-and-blocks)))) @@ -19271,7 +19262,6 @@ boundaries." (org-defkey org-mode-map "\C-c}" 'org-table-toggle-coordinate-overlays) (org-defkey org-mode-map "\C-c{" 'org-table-toggle-formula-debugger) (org-defkey org-mode-map "\C-c\C-e" 'org-export-dispatch) -(org-defkey org-mode-map "\C-c:" 'org-toggle-fixed-width-section) (org-defkey org-mode-map "\C-c\C-x\C-f" 'org-emphasize) (org-defkey org-mode-map "\C-c\C-xf" 'org-footnote-action) (org-defkey org-mode-map "\C-c\C-x\C-mg" 'org-mobile-pull) @@ -21664,7 +21654,7 @@ contexts are: :clocktable in a clocktable :src-block in a source block :link on a hyperlink -:keyword on a keyword: SCHEDULED, DEADLINE, CLOSE, COMMENT, QUOTE. +:keyword on a keyword: SCHEDULED, DEADLINE, CLOSE, COMMENT. :target on a <<target>> :radio-target on a <<<radio-target>>> :latex-fragment on a LaTeX fragment @@ -22827,54 +22817,6 @@ range. Otherwise, translate both parts." ;;; Other stuff. -(defun org-toggle-fixed-width-section (arg) - "Toggle the fixed-width export. -If there is no active region, the QUOTE keyword at the current headline is -inserted or removed. When present, it causes the text between this headline -and the next to be exported as fixed-width text, and unmodified. -If there is an active region, this command adds or removes a colon as the -first character of this line. If the first character of a line is a colon, -this line is also exported in fixed-width font." - (interactive "P") - (let* ((cc 0) - (regionp (org-region-active-p)) - (beg (if regionp (region-beginning) (point))) - (end (if regionp (region-end))) - (nlines (or arg (if (and beg end) (count-lines beg end) 1))) - (case-fold-search nil) - (re "[ \t]*\\(:\\(?: \\|$\\)\\)") - off) - (if regionp - (save-excursion - (goto-char beg) - (setq cc (current-column)) - (beginning-of-line 1) - (setq off (looking-at re)) - (while (> nlines 0) - (setq nlines (1- nlines)) - (beginning-of-line 1) - (cond - (arg - (org-move-to-column cc t) - (insert ": \n") - (forward-line -1)) - ((and off (looking-at re)) - (replace-match "" t t nil 1)) - ((not off) (org-move-to-column cc t) (insert ": "))) - (forward-line 1))) - (save-excursion - (org-back-to-heading) - (cond - ((looking-at (format org-heading-keyword-regexp-format - org-quote-string)) - (goto-char (match-end 1)) - (looking-at (concat " +" org-quote-string)) - (replace-match "" t t) - (when (eolp) (insert " "))) - ((looking-at org-outline-regexp) - (goto-char (match-end 0)) - (insert org-quote-string " "))))))) - (defun org-reftex-citation () "Use reftex-citation to insert a citation into the buffer. This looks for a line like diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el index 39bb1e5..07268e6 100644 --- a/testing/lisp/test-org-element.el +++ b/testing/lisp/test-org-element.el @@ -934,40 +934,6 @@ Some other text ;;;; Headline -(ert-deftest test-org-element/headline-quote-keyword () - "Test QUOTE keyword recognition." - ;; Reference test. - (org-test-with-temp-text "* Headline" - (let ((org-quote-string "QUOTE")) - (should-not (org-element-property :quotedp (org-element-at-point))))) - ;; Standard position. - (org-test-with-temp-text "* QUOTE Headline" - (let* ((org-quote-string "QUOTE") - (headline (org-element-at-point))) - (should (org-element-property :quotedp headline)) - ;; Test removal from raw value. - (should (equal (org-element-property :raw-value headline) "Headline")))) - ;; Case sensitivity. - (org-test-with-temp-text "* QUOTE Headline" - (let* ((org-quote-string "Quote") - (headline (org-element-at-point))) - (should-not (org-element-property :quotedp headline)) - (should (equal (org-element-property :raw-value headline) - "QUOTE Headline")))) - ;; With another keyword. - (org-test-with-temp-text "* TODO QUOTE Headline" - (let* ((org-quote-string "QUOTE") - (org-todo-keywords '((sequence "TODO" "DONE"))) - (headline (org-element-at-point))) - (should (org-element-property :quotedp headline)) - (should (equal (org-element-property :raw-value headline) "Headline")))) - ;; With the keyword only. - (org-test-with-temp-text "* QUOTE" - (let* ((org-quote-string "QUOTE") - (headline (org-element-at-point))) - (should (org-element-property :quotedp headline)) - (should (equal (org-element-property :raw-value headline) ""))))) - (ert-deftest test-org-element/headline-comment-keyword () "Test COMMENT keyword recognition." ;; Reference test. @@ -2199,12 +2165,7 @@ Outside list" (equal (let ((org-comment-string "COMMENT")) (org-test-parse-and-interpret "* COMMENT Headline")) "* COMMENT Headline\n")) - ;; 6. With quote section. - (should - (equal (let ((org-quote-string "QUOTE")) - (org-test-parse-and-interpret "* QUOTE Headline")) - "* QUOTE Headline\n")) - ;; 7. Keep same number of blank lines before body. + ;; 6. Keep same number of blank lines before body. (should (equal (org-test-parse-and-interpret "* Headline\n\n\nText after two blank lines.") |