]> code.delx.au - gnu-emacs/blobdiff - lisp/map-ynp.el
(diary-display-hook): Change default and fix doc string.
[gnu-emacs] / lisp / map-ynp.el
index 777c1e39614ddb51942379c42bb7783f2b40ad7b..a0badd5ed3a0476a2a80f995a15aaad2c9384f92 100644 (file)
@@ -67,28 +67,12 @@ FUNCTION is called.  If it returns non-nil, the object is considered
 \"acted upon\", and the next object from LIST is processed.  If it returns
 nil, the prompt is repeated for the same object.
 
+This function uses `query-replace-map' to define the standard responses,
+but not all of the responses which `query-replace' understands
+are meaningful here.
+
 Returns the number of actions taken."
-  (let* ((old-help-form help-form)
-        (help-form (let ((object (if help (nth 0 help) "object"))
-                         (objects (if help (nth 1 help) "objects"))
-                         (action (if help (nth 2 help) "act on")))
-                     (concat (format "Type SPC or `y' to %s the current %s;
-DEL or `n' to skip the current %s;
-! to %s all remaining %s;
-ESC or `q' to exit;\n"
-                                     action object object action objects)
-                             (mapconcat (function
-                                         (lambda (elt)
-                                           (format "%c to %s"
-                                                   (nth 0 elt)
-                                                   (nth 2 elt))))
-                                        action-alist
-                                        ";\n")
-                             (if action-alist ";\n")
-                             (format "or . (period) to %s \
-the current %s and exit."
-                                     action object))))
-        (user-keys (if action-alist
+  (let* ((user-keys (if action-alist
                        (concat (mapconcat (function
                                            (lambda (elt)
                                              (key-description
@@ -96,11 +80,18 @@ the current %s and exit."
                                           action-alist ", ")
                                " ")
                      ""))
+        ;; Make a map that defines each user key as a vector containing
+        ;; its definition.
+        (map (cons 'keymap
+                   (append (mapcar (lambda (elt)
+                                     (cons (car elt) (vector (nth 1 elt))))
+                                   action-alist)
+                           query-replace-map)))
         (actions 0)
-        prompt char elt tail
-        (next (if (or (symbolp list)
+        prompt char elt tail def delayed-switch-frame
+        (next (if (or (and list (symbolp list))
                       (subrp list)
-                      (compiled-function-p list)
+                      (byte-code-function-p list)
                       (and (consp list)
                            (eq (car list) 'lambda)))
                   (function (lambda ()
@@ -112,77 +103,117 @@ the current %s and exit."
                                         list (cdr list))
                                   t)
                               nil))))))
-    (if (stringp prompter)
-       (setq prompter (` (lambda (object)
-                           (format (, prompter) object)))))
-    (while (funcall next)
-      (setq prompt (funcall prompter elt))
-      (if (stringp prompt)
-         (progn
-           ;; Prompt the user about this object.
-           (let ((cursor-in-echo-area t))
-             (message "%s(y, n, !, ., q, %sor %s) "
-                      prompt user-keys
-                      (key-description (char-to-string help-char)))
-             (setq char (read-char)))
-           (cond ((or (= ?q char)
-                      (= ?\e char))
-                  (setq next (function (lambda () nil))))
-                 ((or (= ?y char)
-                      (= ?Y char)
-                      (= ?  char))
-                  ;; Act on the object.
-                  (let ((help-form old-help-form))
-                    (funcall actor elt))
-                  (setq actions (1+ actions)))
-                 ((or (= ?n char)
-                      (= ?N char)
-                      (= ?\^? char))
-                  ;; Skip the object.
-                  )
-                 ((= ?. char)
-                  ;; Act on the object and then exit.
-                  (funcall actor elt)
-                  (setq actions (1+ actions)
-                        next (function (lambda () nil))))
-                 ((= ?! char)
-                  ;; Act on this and all following objects.
-                  (if (eval (funcall prompter elt))
-                      (progn
+    (unwind-protect
+       (progn
+         (if (stringp prompter)
+             (setq prompter (` (lambda (object)
+                                 (format (, prompter) object)))))
+         (while (funcall next)
+           (setq prompt (funcall prompter elt))
+           (if (stringp prompt)
+               (progn
+                 (setq quit-flag nil)
+                 ;; Prompt the user about this object.
+                 (let ((cursor-in-echo-area t))
+                   (message "%s(y, n, !, ., q, %sor %s) "
+                            prompt user-keys
+                            (key-description (char-to-string help-char)))
+                   (setq char (read-event)))
+                 ;; Show the answer to the question.
+                 (message "%s(y, n, !, ., q, %sor %s) %s"
+                          prompt user-keys
+                          (key-description (char-to-string help-char))
+                          (single-key-description char))
+                 (setq def (lookup-key map (vector char)))
+                 (cond ((eq def 'exit)
+                        (setq next (function (lambda () nil))))
+                       ((eq def 'act)
+                        ;; Act on the object.
+                        (funcall actor elt)
+                        (setq actions (1+ actions)))
+                       ((eq def 'skip)
+                        ;; Skip the object.
+                        )
+                       ((eq def 'act-and-exit)
+                        ;; Act on the object and then exit.
                         (funcall actor elt)
-                        (setq actions (1+ actions))))
-                  (while (funcall next)
-                    (if (eval (funcall prompter elt))
-                        (progn
-                          (funcall actor elt)
-                          (setq actions (1+ actions))))))
-                 ((= ?? char)
-                  (setq unread-command-char help-char)
-                  (setq next (` (lambda ()
-                                  (setq next '(, next))
-                                  '(, elt)))))
-                 ((setq tail (assq char action-alist))
-                  ;; A user-defined key.
-                  (if (funcall (nth 1 tail) elt) ;Call its function.
-                      ;; The function has eaten this object.
-                      (setq actions (1+ actions))
-                    ;; Regurgitated; try again.
-                    (setq next (` (lambda ()
-                                  (setq next '(, next))
-                                  '(, elt))))))
-                 (t
-                  ;; Random char.
-                  (message "Type %s for help."
-                           (key-description (char-to-string help-char)))
-                  (beep)
-                  (sit-for 1)
-                  (setq next (` (lambda ()
-                                  (setq next '(, next))
-                                  '(, elt)))))))
-       (if (eval prompt)
-           (progn
-             (funcall actor elt)
-             (setq actions (1+ actions))))))
+                        (setq actions (1+ actions)
+                              next (function (lambda () nil))))
+                       ((eq def 'quit)
+                        (setq quit-flag t)
+                        (setq next (` (lambda ()
+                                        (setq next '(, next))
+                                        '(, elt)))))
+                       ((eq def 'automatic)
+                        ;; Act on this and all following objects.
+                        (if (eval (funcall prompter elt))
+                            (progn
+                              (funcall actor elt)
+                              (setq actions (1+ actions))))
+                        (while (funcall next)
+                          (if (eval (funcall prompter elt))
+                              (progn
+                                (funcall actor elt)
+                                (setq actions (1+ actions))))))
+                       ((eq def 'help)
+                        (with-output-to-temp-buffer "*Help*"
+                          (princ
+                           (let ((object (if help (nth 0 help) "object"))
+                                 (objects (if help (nth 1 help) "objects"))
+                                 (action (if help (nth 2 help) "act on")))
+                             (concat
+                              (format "Type SPC or `y' to %s the current %s;
+DEL or `n' to skip the current %s;
+! to %s all remaining %s;
+ESC or `q' to exit;\n"
+                                      action object object action objects)
+                                     (mapconcat (function
+                                                 (lambda (elt)
+                                                   (format "%c to %s"
+                                                           (nth 0 elt)
+                                                           (nth 2 elt))))
+                                                action-alist
+                                                ";\n")
+                                     (if action-alist ";\n")
+                                     (format "or . (period) to %s \
+the current %s and exit."
+                                             action object)))))
+
+                        (setq next (` (lambda ()
+                                        (setq next '(, next))
+                                        '(, elt)))))
+                       ((vectorp def)
+                        ;; A user-defined key.
+                        (if (funcall (aref def 0) elt) ;Call its function.
+                            ;; The function has eaten this object.
+                            (setq actions (1+ actions))
+                          ;; Regurgitated; try again.
+                          (setq next (` (lambda ()
+                                          (setq next '(, next))
+                                          '(, elt))))))
+                       ((and (consp char)
+                             (eq (car char) 'switch-frame))
+                        ;; switch-frame event.  Put it off until we're done.
+                        (setq delayed-switch-frame char)
+                        (setq next (` (lambda ()
+                                        (setq next '(, next))
+                                        '(, elt)))))
+                       (t
+                        ;; Random char.
+                        (message "Type %s for help."
+                                 (key-description (char-to-string help-char)))
+                        (beep)
+                        (sit-for 1)
+                        (setq next (` (lambda ()
+                                        (setq next '(, next))
+                                        '(, elt)))))))
+             (if (eval prompt)
+                 (progn
+                   (funcall actor elt)
+                   (setq actions (1+ actions)))))))
+      (if delayed-switch-frame
+         (setq unread-command-events
+               (cons delayed-switch-frame unread-command-events))))
     ;; Clear the last prompt from the minibuffer.
     (message "")
     ;; Return the number of actions that were taken.