emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Daimrod <daimrod@gmail.com>
To: Glenn Morris <rgm@gnu.org>
Cc: 14374@debbugs.gnu.org
Subject: bug#14374:  bug#14374: Possibly incorrect custom :types
Date: Thu, 09 May 2013 10:06:43 +0200	[thread overview]
Message-ID: <87txmcr2zw.fsf@tanger.home> (raw)
In-Reply-To: <2mvc6t6i3g.fsf@fencepost.gnu.org>


[-- Attachment #1.1: Type: text/plain, Size: 2734 bytes --]

Glenn Morris <rgm@gnu.org> writes:
Hi Glenn,

Thanks for this detailled report.

May I ask how you did you tests? I can't find cus-test.el in my Emacs.

I've attached a diff patch where I fix some of this.

> Package: org-mode
>
> cus-test.el suggests the following variables may have incorrect
> custom :types. (There may be some false positives.)
> This refers to Org mode in current Emacs trunk.
>
> Eg, org-footnote-auto-adjust does not have "nil" as an option.

> org-refile-target-verify-function
It's a function with no function by default and I don't know how to fix
it. Should we use '(choice function nil)?

> org-icalendar-combined-description
Seems fine to me.

> org-link-frame-setup
Patched (I've only interferred the functions name could VM users
confirmed that they are correct).

> org-export-with-archived-trees
Patched.

> org-bibtex-prefix
It's suppose to be a string and after a quick look at the code I think
it's safe to set it to nil but I'm not sure.

> org-log-note-headings
Patched.

> org-structure-template-alist
Patched.

> org-export-html-postamble-format
I think it's named `org-html-postamble-format' in master. The docstring
and the type talks about an alist but the default value is not. I don't
know which one is correct (the default value or the description).

> org-get-priority-function
Same problem than `org-refile-target-verify-function'.

> org-export-odt-content-template-file
Now `org-odt-content-template-file', the type is a file but the default
value is nil. Should we use '(choice file nil)?

> org-export-latex-quotes
I couldn't find this variable in master.

> org-export-html-toplevel-hlevel
Now `org-html-toplevel-hlevel' and it doesn't seem to be wrong.

> org-agenda-ndays
The type is an integer but the default value is nil. Should we use
'(choice integer nil)?

I've just seen Carsten's mail so I'll stop here.

> org-export-initial-scope
> org-plantuml-jar-path
> org-export-blocks-witheld
> org-make-link-description-function
> org-export-html-postamble
> org-babel-lob-files
> org-agenda-export-html-style
> org-clock-heading-function
> org-show-notification-handler
> org-agenda-custom-commands
> org-beamer-outline-frame-options
> org-agenda-day-face-function
> org-use-fast-tag-selection
> org-export-docbook-xsl-fo-proc-command
> org-link-translation-function
> org-export-docbook-xslt-stylesheet
> org-export-docbook-xslt-proc-command
> org-columns-modify-value-for-display-function
> org-export-html-preamble-format
> org-agenda-auto-exclude-function
> org-export-docbook-doctype
> org-wl-namazu-default-index
> org-agenda-inactive-leader
> org-export-ascii-underline
> org-sparse-tree-default-date-type
> org-footnote-auto-adjust
> org-protocol-default-template-key


[-- Attachment #1.2: defcustom-fixes.path --]
[-- Type: application/octet-stream, Size: 2790 bytes --]

diff --git a/lisp/org.el b/lisp/org.el
index 87c9a07..c707e45 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1766,6 +1766,11 @@ another window."
 		 (const vm-visit-folder)
 		 (const vm-visit-folder-other-window)
 		 (const vm-visit-folder-other-frame)))
+	  (cons (const vm-imap)
+		(choice
+		 (const vm-visit-imap-folder)
+		 (const vm-visit-imap-folder-other-window)
+		 (const vm-visit-imap-folder-other-frame)))
 	  (cons (const gnus)
 		(choice
 		 (const gnus)
@@ -2639,12 +2644,12 @@ agenda log mode depends on the format of these entries."
 			    "Heading when changing todo state (todo sequence only)"
 			    state) string)
 	       (cons (const :tag "Heading when just taking a note" note) string)
-	       (cons (const :tag "Heading when clocking out" clock-out) string)
-	       (cons (const :tag "Heading when an item is no longer scheduled" delschedule) string)
 	       (cons (const :tag "Heading when rescheduling" reschedule) string)
+	       (cons (const :tag "Heading when an item is no longer scheduled" delschedule) string)
 	       (cons (const :tag "Heading when changing deadline"  redeadline) string)
 	       (cons (const :tag "Heading when deleting a deadline" deldeadline) string)
-	       (cons (const :tag "Heading when refiling" refile) string)))
+	       (cons (const :tag "Heading when refiling" refile) string)
+  	       (cons (const :tag "Heading when clocking out" clock-out) string)))
 
 (unless (assq 'note org-log-note-headings)
   (push '(note . "%t") org-log-note-headings))
@@ -11965,9 +11970,10 @@ the default when the /org-mtags.el/ module has been loaded.  See also the
 variable `org-mtags-prefer-muse-templates'."
   :group 'org-completion
   :type '(repeat
-	  (string :tag "Key")
-	  (string :tag "Template")
-	  (string :tag "Muse Template")))
+	  (set
+	   (string :tag "Key")
+	   (string :tag "Template")
+	   (string :tag "Muse Template"))))
 
 (defun org-try-structure-completion ()
   "Try to complete a structure template before point.
diff --git a/lisp/ox.el b/lisp/ox.el
index 7a2186f..df9b654 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -326,14 +326,13 @@ uses the same subtree if the previous command was restricted to a subtree.")
 This can have three different values:
 nil         Do not export, pretend this tree is not present.
 t           Do export the entire tree.
-`headline'  Only export the headline, but skip the tree below it.
-
+headline    Only export the headline, but skip the tree below it.
 This option can also be set with the OPTIONS keyword,
 e.g. \"arch:nil\"."
   :group 'org-export-general
   :type '(choice
 	  (const :tag "Not at all" nil)
-	  (const :tag "Headline only" 'headline)
+	  (const :tag "Headline only" headline)
 	  (const :tag "Entirely" t)))
 
 (defcustom org-export-with-author t

[-- Attachment #1.3: Type: text/plain, Size: 21 bytes --]


-- 
Daimrod/Greg

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

      parent reply	other threads:[~2013-05-09  8:05 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-09  1:46 bug#14374: Possibly incorrect custom :types Glenn Morris
2013-05-09  7:39 ` bug#14374: " Carsten Dominik
2013-05-10  1:26   ` Glenn Morris
2013-05-10  6:05     ` Carsten Dominik
2013-05-09  8:06 ` Daimrod [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87txmcr2zw.fsf@tanger.home \
    --to=daimrod@gmail.com \
    --cc=14374@debbugs.gnu.org \
    --cc=rgm@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).