comparison lisp/map-ynp.el @ 2442:f692546797f9

(map-y-or-n-p): Make bindings of user-defined keys be each a vector containing the user's binding, rather than 'user. Check (vectorp DEF) and call the vector's elt, rather than checking (eq 'user DEF) and calling something completely random.

2441:78098404b263

					      (key-description
					       (char-to-string (car elt)))))
					   action-alist ", ")
				" ")
		      ""))
	 ;; Make a map that defines all the user keys as `user'.
	 (map (cons 'keymap
		    (append (mapcar (function
				     (lambda (elt)
				       (cons (car elt) 'user)))
				    action-alist)
			    query-replace-map)))
	 (actions 0)
	 prompt char elt tail def
	 (next (if (or (symbolp list)

					action object)))))

		   (setq next (` (lambda ()
				   (setq next '(, next))
				   '(, elt)))))
		  ((eq def 'user)
		   ;; 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))

2442:f692546797f9

					      (key-description
					       (char-to-string (car elt)))))
					   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 def
	 (next (if (or (symbolp list)

					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))