diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/pg-pbrpm.el | 7 | ||||
| -rw-r--r-- | generic/proof-menu.el | 8 | ||||
| -rw-r--r-- | generic/proof-utils.el | 32 |
3 files changed, 23 insertions, 24 deletions
diff --git a/generic/pg-pbrpm.el b/generic/pg-pbrpm.el index f1f83ff1..b40cfff3 100644 --- a/generic/pg-pbrpm.el +++ b/generic/pg-pbrpm.el @@ -34,6 +34,7 @@ ;;; Code: (require 'span) +(eval-when-compile (require 'cl-lib)) (eval-when-compile (require 'proof-utils)) @@ -421,14 +422,14 @@ If no match found, return the empty string." (save-excursion (let ((pos (point))) (beginning-of-line) - (block 'loop + (cl-block 'loop (while (< (point) pos) (unless (search-forward-regexp pg-pbrpm-auto-select-regexp nil t) (return-from 'loop "")) (if (and (<= (match-beginning 0) pos) (<= pos (match-end 0))) - (return-from 'loop (match-string 0)))) - (return-from 'loop ""))))) + (cl-return-from 'loop (match-string 0)))) + (cl-return-from 'loop ""))))) (defun pg-pbrpm-translate-position (buffer pos) "If BUFFER is goals-buffer, return POS, otherwise the point in the goal buffer." diff --git a/generic/proof-menu.el b/generic/proof-menu.el index ffd80415..dd3d05c8 100644 --- a/generic/proof-menu.el +++ b/generic/proof-menu.el @@ -864,11 +864,11 @@ KEY is the optional key binding." proof-assistant-settings) (dolist (grp (reverse groups)) (let* ((gstgs (cl-mapcan (lambda (stg) - (if (eq (get (car stg) 'pggroup) grp) - (list stg))) - proof-assistant-settings)) + (if (eq (get (car stg) 'pggroup) grp) + (list stg))) + proof-assistant-settings)) (cmds (mapcar (lambda (stg) - (apply 'proof-menu-entry-for-setting stg)) + (apply #'proof-menu-entry-for-setting stg)) (reverse gstgs)))) (setq ents (if grp (cons (cons grp cmds) ents) diff --git a/generic/proof-utils.el b/generic/proof-utils.el index 1568b2f0..4a15301a 100644 --- a/generic/proof-utils.el +++ b/generic/proof-utils.el @@ -589,25 +589,23 @@ The name of the defined function is returned." `(proof-deffloatset-fn (quote ,var) (quote ,othername))) (defun proof-defstringset-fn (var &optional othername) - "Define a function <VAR>-toggle for setting an integer customize setting VAR. -Args as for the macro `proof-defstringset', except will be evaluated." + "Define a function OTHERNAME for setting an string customize setting VAR. +OTHERNAME defaults to `VAR-stringset'." (eval - `(defun ,(if othername othername - (intern (concat (symbol-name var) "-stringset"))) (arg) - ,(concat "Set `" (symbol-name var) "' to ARG. -This function simply uses customize-set-variable to set the variable. + `(defun ,(or othername + (intern (concat (symbol-name var) "-stringset"))) + (arg) + ,(concat "Set `" (symbol-name var) "' to ARG. +This function simply uses `customize-set-variable' to set the variable. It was constructed with `proof-defstringset-fn'.") - (interactive ,(format "sValue for %s (a string): " - (symbol-name var))) - (customize-set-variable (quote ,var) arg)))) - -(defmacro proof-defstringset (var &optional othername) - "The setting function uses customize-set-variable to change the variable. -OTHERNAME gives an alternative name than the default <VAR>-stringset. -The name of the defined function is returned." - `(proof-defstringset-fn (quote ,var) (quote ,othername))) - - + (interactive (list + (read-string + (format "Value for %s (default %s): " + (symbol-name (quote ,var)) + (symbol-value (quote ,var))) + nil nil + (symbol-value (quote ,var))))) + (customize-set-variable (quote ,var) arg)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; |