diff options
-rw-r--r-- | generic/pg-custom.el | 11 | ||||
-rw-r--r-- | generic/proof-useropts.el | 15 |
2 files changed, 10 insertions, 16 deletions
diff --git a/generic/pg-custom.el b/generic/pg-custom.el index fd5c1a23..d85a1819 100644 --- a/generic/pg-custom.el +++ b/generic/pg-custom.el @@ -30,7 +30,8 @@ ;;; Code: -(require 'proof-utils) ; defpgcustom +(require 'pg-pamacs) ; defpgcustom +(require 'pg-vars) ; for proof-next-command-on-new-line (require 'proof-config) ; for proof-toolbar-entries-default (defpgcustom script-indent t @@ -158,6 +159,14 @@ Currently this setting is UNIMPLEMENTED, changes have no effect." :type 'boolean :group 'prover-config) +(defpgcustom one-command-per-line + (cond + ((eq proof-assistant-symbol 'isar) nil) + (t t)) + "*If non-nil, format for newlines after each command in a script." + :type 'boolean + :group 'proof-user-options) + ;; Contributed modes diff --git a/generic/proof-useropts.el b/generic/proof-useropts.el index f1019217..6d4fde2a 100644 --- a/generic/proof-useropts.el +++ b/generic/proof-useropts.el @@ -215,13 +215,6 @@ files which are out of date with respect to the loaded buffers!" :type 'boolean :group 'proof-user-options) -(defcustom proof-one-command-per-line - t - "*If non-nil, format for newlines after each proof command in a script. -This option is not fully-functional at the moment." ;; TODO - :type 'boolean - :group 'proof-user-options) - (defcustom proof-prog-name-ask nil "*If non-nil, query user which program to run for the inferior process." @@ -328,14 +321,6 @@ is no locked region." (const :tag "Automatically process" process)) :group 'proof-user-options) -(defcustom proof-script-command-separator " " - "*String separating commands in proof scripts. -For example, if a proof assistant prefers one command per line, then -this string should be set to a newline. Otherwise it should be -set to a space." - :type 'string - :group 'proof-user-options) - (defcustom proof-rsh-command nil "*Shell command prefix to run a command on a remote host. For example, |