[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112545: More custom :type fixes
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112545: More custom :type fixes |
Date: |
Fri, 10 May 2013 19:21:29 -0700 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112545
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-05-10 19:21:29 -0700
message:
More custom :type fixes
* lisp/lpr.el (lpr-headers-switches):
* lisp/emacs-lisp/testcover.el (testcover-compose-functions):
* lisp/cedet/ede/project-am.el (project-am-compile-project-command): Fix
:type.
* lisp/progmodes/sql.el (sql-login-params): Fix and improve :type.
modified:
lisp/ChangeLog
lisp/cedet/ChangeLog
lisp/cedet/ede/project-am.el
lisp/emacs-lisp/testcover.el
lisp/lpr.el
lisp/progmodes/sql.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-11 02:17:45 +0000
+++ b/lisp/ChangeLog 2013-05-11 02:21:29 +0000
@@ -1,5 +1,10 @@
2013-05-11 Glenn Morris <address@hidden>
+ * lpr.el (lpr-headers-switches):
+ * emacs-lisp/testcover.el (testcover-compose-functions): Fix :type.
+
+ * progmodes/sql.el (sql-login-params): Fix and improve :type.
+
* emulation/edt-mapper.el: In batch mode, error rather than hang.
* term.el (term-set-escape-char): Make it idempotent.
=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog 2013-05-09 01:40:20 +0000
+++ b/lisp/cedet/ChangeLog 2013-05-11 02:21:29 +0000
@@ -1,3 +1,7 @@
+2013-05-11 Glenn Morris <address@hidden>
+
+ * ede/project-am.el (project-am-compile-project-command): Fix :type.
+
2013-05-09 Glenn Morris <address@hidden>
* semantic/db-find.el (semanticdb-find-throttle-custom-list):
=== modified file 'lisp/cedet/ede/project-am.el'
--- a/lisp/cedet/ede/project-am.el 2013-01-01 09:11:05 +0000
+++ b/lisp/cedet/ede/project-am.el 2013-05-11 02:21:29 +0000
@@ -55,7 +55,7 @@
(defcustom project-am-compile-project-command nil
"*Default command used to compile a project."
:group 'project-am
- :type 'string)
+ :type '(choice const nil) string)
(defcustom project-am-compile-target-command (concat ede-make-command " -k %s")
"*Default command used to compile a project."
=== modified file 'lisp/emacs-lisp/testcover.el'
--- a/lisp/emacs-lisp/testcover.el 2013-05-09 01:40:20 +0000
+++ b/lisp/emacs-lisp/testcover.el 2013-05-11 02:21:29 +0000
@@ -118,7 +118,7 @@
brown splotch is shown for these. This list is quite incomplete! Most
side-effect-free functions should be here."
:group 'testcover
- :type 'hook)
+ :type '(repeat symbol))
(defcustom testcover-progn-functions
'(define-key fset function goto-char mapc overlay-put progn
=== modified file 'lisp/lpr.el'
--- a/lisp/lpr.el 2013-01-01 09:11:05 +0000
+++ b/lisp/lpr.el 2013-05-11 02:21:29 +0000
@@ -125,7 +125,9 @@
"List of strings of options to request page headings in the printer program.
If nil, we run `lpr-page-header-program' to make page headings
and print the result."
- :type '(repeat (string :tag "Argument"))
+ :type '(choice (const nil)
+ (string :tag "Single argument")
+ (repeat :tag "Multiple arguments" (string :tag "Argument")))
:group 'lpr)
(defcustom print-region-function nil
=== modified file 'lisp/progmodes/sql.el'
--- a/lisp/progmodes/sql.el 2013-03-11 04:09:37 +0000
+++ b/lisp/progmodes/sql.el 2013-05-11 02:21:29 +0000
@@ -285,36 +285,49 @@
(define-widget 'sql-login-params 'lazy
"Widget definition of the login parameters list"
- ;; FIXME: does not implement :default property for the user,
- ;; database and server options. Anybody have some guidance on how to
- ;; do this.
:tag "Login Parameters"
- :type '(repeat (choice
- (const user)
- (const password)
- (choice :tag "server"
- (const server)
- (list :tag "file"
- (const :format "" server)
- (const :format "" :file)
- regexp)
- (list :tag "completion"
- (const :format "" server)
- (const :format "" :completion)
- (restricted-sexp
- :match-alternatives (listp stringp))))
- (choice :tag "database"
- (const database)
- (list :tag "file"
- (const :format "" database)
- (const :format "" :file)
- regexp)
- (list :tag "completion"
- (const :format "" database)
- (const :format "" :completion)
- (restricted-sexp
- :match-alternatives (listp stringp))))
- (const port))))
+ :type '(set :tag "Login Parameters"
+ (choice :tag "user"
+ :value user
+ (const user)
+ (list :tag "Specify a default"
+ (const user)
+ (list :tag "Default"
+ :inline t (const :default) string)))
+ (const password)
+ (choice :tag "server"
+ :value server
+ (const server)
+ (list :tag "Specify a default"
+ (const server)
+ (list :tag "Default"
+ :inline t (const :default) string))
+ (list :tag "file"
+ (const :format "" server)
+ (const :format "" :file)
+ regexp)
+ (list :tag "completion"
+ (const :format "" server)
+ (const :format "" :completion)
+ (restricted-sexp
+ :match-alternatives (listp stringp))))
+ (choice :tag "database"
+ :value database
+ (const database)
+ (list :tag "Specify a default"
+ (const database)
+ (list :tag "Default"
+ :inline t (const :default) string))
+ (list :tag "file"
+ (const :format "" database)
+ (const :format "" :file)
+ regexp)
+ (list :tag "completion"
+ (const :format "" database)
+ (const :format "" :completion)
+ (restricted-sexp
+ :match-alternatives (listp stringp))))
+ (const port)))
;; SQL Product support
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112545: More custom :type fixes,
Glenn Morris <=