Mercurial > hg > xemacs-beta
view lisp/cmdloop.el @ 665:fdefd0186b75
[xemacs-hg @ 2001-09-20 06:28:42 by ben]
The great integral types renaming.
The purpose of this is to rationalize the names used for various
integral types, so that they match their intended uses and follow
consist conventions, and eliminate types that were not semantically
different from each other.
The conventions are:
-- All integral types that measure quantities of anything are
signed. Some people disagree vociferously with this, but their
arguments are mostly theoretical, and are vastly outweighed by
the practical headaches of mixing signed and unsigned values,
and more importantly by the far increased likelihood of
inadvertent bugs: Because of the broken "viral" nature of
unsigned quantities in C (operations involving mixed
signed/unsigned are done unsigned, when exactly the opposite is
nearly always wanted), even a single error in declaring a
quantity unsigned that should be signed, or even the even more
subtle error of comparing signed and unsigned values and
forgetting the necessary cast, can be catastrophic, as
comparisons will yield wrong results. -Wsign-compare is turned
on specifically to catch this, but this tends to result in a
great number of warnings when mixing signed and unsigned, and
the casts are annoying. More has been written on this
elsewhere.
-- All such quantity types just mentioned boil down to EMACS_INT,
which is 32 bits on 32-bit machines and 64 bits on 64-bit
machines. This is guaranteed to be the same size as Lisp
objects of type `int', and (as far as I can tell) of size_t
(unsigned!) and ssize_t. The only type below that is not an
EMACS_INT is Hashcode, which is an unsigned value of the same
size as EMACS_INT.
-- Type names should be relatively short (no more than 10
characters or so), with the first letter capitalized and no
underscores if they can at all be avoided.
-- "count" == a zero-based measurement of some quantity. Includes
sizes, offsets, and indexes.
-- "bpos" == a one-based measurement of a position in a buffer.
"Charbpos" and "Bytebpos" count text in the buffer, rather than
bytes in memory; thus Bytebpos does not directly correspond to
the memory representation. Use "Membpos" for this.
-- "Char" refers to internal-format characters, not to the C type
"char", which is really a byte.
-- For the actual name changes, see the script below.
I ran the following script to do the conversion. (NOTE: This script
is idempotent. You can safely run it multiple times and it will
not screw up previous results -- in fact, it will do nothing if
nothing has changed. Thus, it can be run repeatedly as necessary
to handle patches coming in from old workspaces, or old branches.)
There are two tags, just before and just after the change:
`pre-integral-type-rename' and `post-integral-type-rename'. When
merging code from the main trunk into a branch, the best thing to
do is first merge up to `pre-integral-type-rename', then apply the
script and associated changes, then merge from
`post-integral-type-change' to the present. (Alternatively, just do
the merging in one operation; but you may then have a lot of
conflicts needing to be resolved by hand.)
Script `fixtypes.sh' follows:
----------------------------------- cut ------------------------------------
files="*.[ch] s/*.h m/*.h config.h.in ../configure.in Makefile.in.in ../lib-src/*.[ch] ../lwlib/*.[ch]"
gr Memory_Count Bytecount $files
gr Lstream_Data_Count Bytecount $files
gr Element_Count Elemcount $files
gr Hash_Code Hashcode $files
gr extcount bytecount $files
gr bufpos charbpos $files
gr bytind bytebpos $files
gr memind membpos $files
gr bufbyte intbyte $files
gr Extcount Bytecount $files
gr Bufpos Charbpos $files
gr Bytind Bytebpos $files
gr Memind Membpos $files
gr Bufbyte Intbyte $files
gr EXTCOUNT BYTECOUNT $files
gr BUFPOS CHARBPOS $files
gr BYTIND BYTEBPOS $files
gr MEMIND MEMBPOS $files
gr BUFBYTE INTBYTE $files
gr MEMORY_COUNT BYTECOUNT $files
gr LSTREAM_DATA_COUNT BYTECOUNT $files
gr ELEMENT_COUNT ELEMCOUNT $files
gr HASH_CODE HASHCODE $files
----------------------------------- cut ------------------------------------
`fixtypes.sh' is a Bourne-shell script; it uses 'gr':
----------------------------------- cut ------------------------------------
#!/bin/sh
# Usage is like this:
# gr FROM TO FILES ...
# globally replace FROM with TO in FILES. FROM and TO are regular expressions.
# backup files are stored in the `backup' directory.
from="$1"
to="$2"
shift 2
echo ${1+"$@"} | xargs global-replace "s/$from/$to/g"
----------------------------------- cut ------------------------------------
`gr' in turn uses a Perl script to do its real work,
`global-replace', which follows:
----------------------------------- cut ------------------------------------
: #-*- Perl -*-
### global-modify --- modify the contents of a file by a Perl expression
## Copyright (C) 1999 Martin Buchholz.
## Copyright (C) 2001 Ben Wing.
## Authors: Martin Buchholz <martin@xemacs.org>, Ben Wing <ben@xemacs.org>
## Maintainer: Ben Wing <ben@xemacs.org>
## Current Version: 1.0, May 5, 2001
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to the Free
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
eval 'exec perl -w -S $0 ${1+"$@"}'
if 0;
use strict;
use FileHandle;
use Carp;
use Getopt::Long;
use File::Basename;
(my $myName = $0) =~ s@.*/@@; my $usage="
Usage: $myName [--help] [--backup-dir=DIR] [--line-mode] [--hunk-mode]
PERLEXPR FILE ...
Globally modify a file, either line by line or in one big hunk.
Typical usage is like this:
[with GNU print, GNU xargs: guaranteed to handle spaces, quotes, etc.
in file names]
find . -name '*.[ch]' -print0 | xargs -0 $0 's/\bCONST\b/const/g'\n
[with non-GNU print, xargs]
find . -name '*.[ch]' -print | xargs $0 's/\bCONST\b/const/g'\n
The file is read in, either line by line (with --line-mode specified)
or in one big hunk (with --hunk-mode specified; it's the default), and
the Perl expression is then evalled with \$_ set to the line or hunk of
text, including the terminating newline if there is one. It should
destructively modify the value there, storing the changed result in \$_.
Files in which any modifications are made are backed up to the directory
specified using --backup-dir, or to `backup' by default. To disable this,
use --backup-dir= with no argument.
Hunk mode is the default because it is MUCH MUCH faster than line-by-line.
Use line-by-line only when it matters, e.g. you want to do a replacement
only once per line (the default without the `g' argument). Conversely,
when using hunk mode, *ALWAYS* use `g'; otherwise, you will only make one
replacement in the entire file!
";
my %options = ();
$Getopt::Long::ignorecase = 0;
&GetOptions (
\%options,
'help', 'backup-dir=s', 'line-mode', 'hunk-mode',
);
die $usage if $options{"help"} or @ARGV <= 1;
my $code = shift;
die $usage if grep (-d || ! -w, @ARGV);
sub SafeOpen {
open ((my $fh = new FileHandle), $_[0]);
confess "Can't open $_[0]: $!" if ! defined $fh;
return $fh;
}
sub SafeClose {
close $_[0] or confess "Can't close $_[0]: $!";
}
sub FileContents {
my $fh = SafeOpen ("< $_[0]");
my $olddollarslash = $/;
local $/ = undef;
my $contents = <$fh>;
$/ = $olddollarslash;
return $contents;
}
sub WriteStringToFile {
my $fh = SafeOpen ("> $_[0]");
binmode $fh;
print $fh $_[1] or confess "$_[0]: $!\n";
SafeClose $fh;
}
foreach my $file (@ARGV) {
my $changed_p = 0;
my $new_contents = "";
if ($options{"line-mode"}) {
my $fh = SafeOpen $file;
while (<$fh>) {
my $save_line = $_;
eval $code;
$changed_p = 1 if $save_line ne $_;
$new_contents .= $_;
}
} else {
my $orig_contents = $_ = FileContents $file;
eval $code;
if ($_ ne $orig_contents) {
$changed_p = 1;
$new_contents = $_;
}
}
if ($changed_p) {
my $backdir = $options{"backup-dir"};
$backdir = "backup" if !defined ($backdir);
if ($backdir) {
my ($name, $path, $suffix) = fileparse ($file, "");
my $backfulldir = $path . $backdir;
my $backfile = "$backfulldir/$name";
mkdir $backfulldir, 0755 unless -d $backfulldir;
print "modifying $file (original saved in $backfile)\n";
rename $file, $backfile;
}
WriteStringToFile ($file, $new_contents);
}
}
----------------------------------- cut ------------------------------------
In addition to those programs, I needed to fix up a few other
things, particularly relating to the duplicate definitions of
types, now that some types merged with others. Specifically:
1. in lisp.h, removed duplicate declarations of Bytecount. The
changed code should now look like this: (In each code snippet
below, the first and last lines are the same as the original, as
are all lines outside of those lines. That allows you to locate
the section to be replaced, and replace the stuff in that
section, verifying that there isn't anything new added that
would need to be kept.)
--------------------------------- snip -------------------------------------
/* Counts of bytes or chars */
typedef EMACS_INT Bytecount;
typedef EMACS_INT Charcount;
/* Counts of elements */
typedef EMACS_INT Elemcount;
/* Hash codes */
typedef unsigned long Hashcode;
/* ------------------------ dynamic arrays ------------------- */
--------------------------------- snip -------------------------------------
2. in lstream.h, removed duplicate declaration of Bytecount.
Rewrote the comment about this type. The changed code should
now look like this:
--------------------------------- snip -------------------------------------
#endif
/* The have been some arguments over the what the type should be that
specifies a count of bytes in a data block to be written out or read in,
using Lstream_read(), Lstream_write(), and related functions.
Originally it was long, which worked fine; Martin "corrected" these to
size_t and ssize_t on the grounds that this is theoretically cleaner and
is in keeping with the C standards. Unfortunately, this practice is
horribly error-prone due to design flaws in the way that mixed
signed/unsigned arithmetic happens. In fact, by doing this change,
Martin introduced a subtle but fatal error that caused the operation of
sending large mail messages to the SMTP server under Windows to fail.
By putting all values back to be signed, avoiding any signed/unsigned
mixing, the bug immediately went away. The type then in use was
Lstream_Data_Count, so that it be reverted cleanly if a vote came to
that. Now it is Bytecount.
Some earlier comments about why the type must be signed: This MUST BE
SIGNED, since it also is used in functions that return the number of
bytes actually read to or written from in an operation, and these
functions can return -1 to signal error.
Note that the standard Unix read() and write() functions define the
count going in as a size_t, which is UNSIGNED, and the count going
out as an ssize_t, which is SIGNED. This is a horrible design
flaw. Not only is it highly likely to lead to logic errors when a
-1 gets interpreted as a large positive number, but operations are
bound to fail in all sorts of horrible ways when a number in the
upper-half of the size_t range is passed in -- this number is
unrepresentable as an ssize_t, so code that checks to see how many
bytes are actually written (which is mandatory if you are dealing
with certain types of devices) will get completely screwed up.
--ben
*/
typedef enum lstream_buffering
--------------------------------- snip -------------------------------------
3. in dumper.c, there are four places, all inside of switch()
statements, where XD_BYTECOUNT appears twice as a case tag. In
each case, the two case blocks contain identical code, and you
should *REMOVE THE SECOND* and leave the first.
author | ben |
---|---|
date | Thu, 20 Sep 2001 06:31:11 +0000 |
parents | 023b83f4e54b |
children | 943eaba38521 |
line wrap: on
line source
;;; cmdloop.el --- support functions for the top-level command loop. ;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc. ;; Author: Richard Mlynarik ;; Date: 8-Jul-92 ;; Maintainer: XEmacs Development Team ;; Keywords: internal, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: FSF 19.30. (Some of the stuff below is in FSF's subr.el.) ;;; Commentary: ;; This file is dumped with XEmacs. ;;; Code: (defun recursion-depth () "Return the current depth in recursive edits." (+ command-loop-level (minibuffer-depth))) (defun top-level () "Exit all recursive editing levels." (interactive) (throw 'top-level nil)) (defun exit-recursive-edit () "Exit from the innermost recursive edit or minibuffer." (interactive) (if (> (recursion-depth) 0) (throw 'exit nil)) (error "No recursive edit is in progress")) (defun abort-recursive-edit () "Abort the command that requested this recursive edit or minibuffer input." (interactive) (if (> (recursion-depth) 0) (throw 'exit t)) (error "No recursive edit is in progress")) ;; (defun keyboard-quit () ;; "Signal a `quit' condition." ;; (interactive) ;; (deactivate-mark) ;; (signal 'quit nil)) ;; moved here from pending-del. (defun keyboard-quit () "Signal a `quit' condition. If this character is typed while lisp code is executing, it will be treated as an interrupt. If this character is typed at top-level, this simply beeps. If `zmacs-regions' is true, and the zmacs region is active in this buffer, then this key deactivates the region without beeping or signalling." (interactive) (if (and (region-active-p) (eq (current-buffer) (zmacs-region-buffer))) ;; pseudo-zmacs compatibility: don't beep if this ^G is simply ;; deactivating the region. If it is inactive, beep. nil (signal 'quit nil))) (defvar buffer-quit-function nil "Function to call to \"quit\" the current buffer, or nil if none. \\[keyboard-escape-quit] calls this function when its more local actions \(such as cancelling a prefix argument, minibuffer or region) do not apply.") (defun keyboard-escape-quit () "Exit the current \"mode\" (in a generalized sense of the word). This command can exit an interactive command such as `query-replace', can clear out a prefix argument or a region, can get out of the minibuffer or other recursive edit, cancel the use of the current buffer (for special-purpose buffers), or go back to just one window (by deleting all but the selected window)." (interactive) (cond ((eq last-command 'mode-exited) nil) ((> (minibuffer-depth) 0) (abort-recursive-edit)) (current-prefix-arg nil) ((region-active-p) (zmacs-deactivate-region)) ((> (recursion-depth) 0) (exit-recursive-edit)) (buffer-quit-function (funcall buffer-quit-function)) ((not (one-window-p t)) (delete-other-windows)) ((string-match "^ \\*" (buffer-name (current-buffer))) (bury-buffer)))) ;; `cancel-mode-internal' is a function of a misc-user event, which is ;; queued when window system directs XEmacs frame to cancel any modal ;; behavior it exposes, like mouse pointer grabbing. ;; ;; This function does nothing at the top level, but the code which ;; runs modal event loops, such as selection drag loop in `mouse-track', ;; check if misc-user function symbol is `cancel-mode-internal', and ;; takes necessary cleanup actions. (defun cancel-mode-internal (object) (setq zmacs-region-stays t)) ;; Someone wrote: "This should really be a ring of last errors." ;; ;; But why bother? This stuff is not all that necessary now that we ;; have message log, anyway. (defvar last-error nil "Object describing the last signaled error.") (defcustom errors-deactivate-region nil "*Non-nil means that errors will cause the region to be deactivated." :type 'boolean :group 'editing-basics) (defun command-error (error-object) (let* ((old-debug-on-error debug-on-error) (inhibit-quit t) (debug-on-error nil) (etype (car-safe error-object))) (setq quit-flag nil) (setq standard-output t) (setq standard-input t) (setq executing-kbd-macro nil) (and errors-deactivate-region (zmacs-deactivate-region)) (discard-input) (setq last-error error-object) (message nil) (ding nil (cond ((eq etype 'undefined-keystroke-sequence) (if (and (vectorp (nth 1 error-object)) (/= 0 (length (nth 1 error-object))) (button-event-p (aref (nth 1 error-object) 0))) 'undefined-click 'undefined-key)) ((eq etype 'quit) 'quit) ((memq etype '(end-of-buffer beginning-of-buffer)) 'buffer-bound) ((eq etype 'buffer-read-only) 'read-only) (t 'command-error))) (display-error error-object t) (if (noninteractive) (progn (if old-debug-on-error (progn (message "Backtrace:\n\n") (backtrace) (message "\n"))) (message "%s exiting\n." emacs-program-name) (kill-emacs -1))) t)) (defun describe-last-error () "Redisplay the last error-message. See the variable `last-error'." (interactive) (if last-error (with-displaying-help-buffer (lambda () (princ "Last error was:\n" standard-output) (display-error last-error standard-output))) (message "No error yet"))) ;;#### Must be done later in the loadup sequence ;(define-key (symbol-function 'help-command) "e" 'describe-last-error) (defun truncate-command-history-for-gc () (let ((tail (nthcdr 30 command-history))) (if tail (setcdr tail nil))) (let ((tail (nthcdr 30 values))) (if tail (setcdr tail nil))) ) (add-hook 'pre-gc-hook 'truncate-command-history-for-gc) ;;;; Object-oriented programming at its finest ;; Now in src/print.c; used by Ferror_message_string and others ;(defun display-error (error-object stream) ;(defgeneric report-condition ...) ; "Display `error-object' on `stream' in a user-friendly way." ; (funcall (or (let ((type (car-safe error-object))) ; (catch 'error ; (and (consp error-object) ; (symbolp type) ; ;;(stringp (get type 'error-message)) ; (consp (get type 'error-conditions)) ; (let ((tail (cdr error-object))) ; (while (not (null tail)) ; (if (consp tail) ; (setq tail (cdr tail)) ; (throw 'error nil))) ; t) ; ;; (check-type condition condition) ; (get type 'error-conditions) ; ;; Search class hierarchy ; (let ((tail (get type 'error-conditions))) ; (while (not (null tail)) ; (cond ((not (and (consp tail) ; (symbolp (car tail)))) ; (throw 'error nil)) ; ((get (car tail) 'display-error) ; (throw 'error (get (car tail) ; 'display-error))) ; (t ; (setq tail (cdr tail))))) ; ;; Default method ; #'(lambda (error-object stream) ; (let ((type (car error-object)) ; (tail (cdr error-object)) ; (first t) ; (print-message-label 'error)) ; (if (eq type 'error) ; (progn (princ (car tail) stream) ; (setq tail (cdr tail))) ; (princ (or (gettext (get type 'error-message)) type) ; stream)) ; (while tail ; (princ (if first ": " ", ") stream) ; (prin1 (car tail) stream) ; (setq tail (cdr tail) ; first nil)))))))) ; #'(lambda (error-object stream) ; (princ (gettext "Peculiar error ") stream) ; (prin1 error-object stream))) ; error-object stream)) (put 'file-error 'display-error #'(lambda (error-object stream) (let ((tail (cdr error-object)) (first t)) (princ (car tail) stream) (while (setq tail (cdr tail)) (princ (if first ": " ", ") stream) (princ (car tail) stream) (setq first nil))))) (put 'undefined-keystroke-sequence 'display-error #'(lambda (error-object stream) (princ (key-description (car (cdr error-object))) stream) ;; #### I18N3: doesn't localize properly. (princ (gettext " not defined.") stream) ; doo dah, doo dah. )) (defcustom teach-extended-commands-p t "*If true, then `\\[execute-extended-command]' will teach you keybindings. Any time you execute a command with \\[execute-extended-command] which has a shorter keybinding, you will be shown the alternate binding before the command executes. There is a short pause after displaying the binding, before executing it; the length can be controlled by `teach-extended-commands-timeout'." :type 'boolean :group 'keyboard) (defcustom teach-extended-commands-timeout 4 "*How long to pause after displaying a keybinding before executing. The value is measured in seconds. This only applies if `teach-extended-commands-p' is true." :type 'number :group 'keyboard) ;That damn RMS went off and implemented something differently, after ;we had already implemented it. We can't support both properly until ;we have Lisp magic variables. ;(defvar suggest-key-bindings t ; "*FSFmacs equivalent of `teach-extended-commands-*'. ;Provided for compatibility only. ;Non-nil means show the equivalent key-binding when M-x command has one. ;The value can be a length of time to show the message for. ;If the value is non-nil and not a number, we wait 2 seconds.") ; ;(make-obsolete-variable 'suggest-key-bindings 'teach-extended-commands-p) (defun execute-extended-command (prefix-arg) "Read a command name from the minibuffer using 'completing-read'. Then call the specified command using 'command-execute' and return its return value. If the command asks for a prefix argument, supply the value of the current raw prefix argument, or the value of PREFIX-ARG when called from Lisp." (interactive "P") ;; Note: This doesn't hack "this-command-keys" (let ((prefix-arg prefix-arg)) (setq this-command (read-command ;; Note: this has the hard-wired ;; "C-u" and "M-x" string bug in common ;; with all Emacs's. ;; (i.e. it prints C-u and M-x regardless of ;; whether some other keys were actually bound ;; to `execute-extended-command' and ;; `universal-argument'. (cond ((eq prefix-arg '-) "- M-x ") ((equal prefix-arg '(4)) "C-u M-x ") ((integerp prefix-arg) (format "%d M-x " prefix-arg)) ((and (consp prefix-arg) (integerp (car prefix-arg))) (format "%d M-x " (car prefix-arg))) (t "M-x "))))) (if (and teach-extended-commands-p (interactive-p)) ;; Remember the keys, run the command, and show the keys (if ;; any). The funny variable names are a poor man's guarantee ;; that we don't get tripped by this-command doing something ;; funny. Quoth our forefathers: "We want lexical scope!" (let ((_execute_command_keys_ (where-is-internal this-command)) (_execute_command_name_ this-command)) ; the name can change (command-execute this-command t) (when _execute_command_keys_ ;; Normally the region is adjusted in post_command_hook; ;; however, it is not called until after we finish. It ;; looks ugly for the region to get updated after the ;; delays, so we do it now. The code below is a Lispified ;; copy of code in event-stream.c:post_command_hook(). (if (and (not zmacs-region-stays) (or (not (eq (selected-window) (minibuffer-window))) (eq (zmacs-region-buffer) (current-buffer)))) (zmacs-deactivate-region) (zmacs-update-region)) ;; Wait for a while, so the user can see a message printed, ;; if any. (when (sit-for 1) (display-message 'no-log (format (if (cdr _execute_command_keys_) "Command `%s' is bound to keys: %s" "Command `%s' is bound to key: %s") _execute_command_name_ (sorted-key-descriptions _execute_command_keys_))) (sit-for teach-extended-commands-timeout) (clear-message 'no-log)))) ;; Else, just run the command. (command-execute this-command t))) ;;; C code calls this; the underscores in the variable names are to avoid ;;; cluttering the specbind namespace (lexical scope! lexical scope!) ;;; Putting this in Lisp instead of C slows kbd macros by 50%. ;(defun command-execute (_command &optional _record-flag) ; "Execute CMD as an editor command. ;CMD must be a symbol that satisfies the `commandp' predicate. ;Optional second arg RECORD-FLAG non-nil ;means unconditionally put this command in `command-history'. ;Otherwise, that is done only if an arg is read using the minibuffer." ; (let ((_prefix prefix-arg) ; (_cmd (indirect-function _command))) ; (setq prefix-arg nil ; this-command _command ; current-prefix-arg _prefix ; zmacs-region-stays nil) ; ;; #### debug_on_next_call = 0; ; (cond ((and (symbolp _command) ; (get _command 'disabled)) ; (run-hooks disabled-command-hook)) ; ((or (stringp _cmd) (vectorp _cmd)) ; ;; If requested, place the macro in the command history. ; ;; For other sorts of commands, call-interactively takes ; ;; care of this. ; (if _record-flag ; (setq command-history ; (cons (list 'execute-kbd-macro _cmd _prefix) ; command-history))) ; (execute-kbd-macro _cmd _prefix)) ; (t ; (call-interactively _command _record-flag))))) (defun y-or-n-p-minibuf (prompt) "Ask user a \"y or n\" question. Return t if answer is \"y\". Takes one argument, which is the string to display to ask the question. It should end in a space; `y-or-n-p' adds `(y or n) ' to it. No confirmation of the answer is requested; a single character is enough. Also accepts Space to mean yes, or Delete to mean no." (save-excursion (let* ((pre "") (yn (gettext "(y or n) ")) ;; we need to translate the prompt ourselves because of the ;; strange way we handle it. (prompt (gettext prompt)) event) (while (stringp yn) (if (let ((cursor-in-echo-area t) (inhibit-quit t)) (message "%s%s%s" pre prompt yn) (setq event (next-command-event event)) (condition-case nil (prog1 (or quit-flag (eq 'keyboard-quit (key-binding event))) (setq quit-flag nil)) (wrong-type-argument t))) (progn (message "%s%s%s%s" pre prompt yn (single-key-description event)) (setq quit-flag nil) (signal 'quit '()))) (let* ((keys (events-to-keys (vector event))) (def (lookup-key query-replace-map keys))) (cond ((eq def 'skip) (message "%s%sNo" prompt yn) (setq yn nil)) ((eq def 'act) (message "%s%sYes" prompt yn) (setq yn t)) ((eq def 'recenter) (recenter)) ((or (eq def 'quit) (eq def 'exit-prefix)) (signal 'quit '())) ((button-release-event-p event) ; ignore them nil) (t (message "%s%s%s%s" pre prompt yn (single-key-description event)) (ding nil 'y-or-n-p) (discard-input) (if (= (length pre) 0) (setq pre (gettext "Please answer y or n. "))))))) yn))) (defun yes-or-no-p-minibuf (prompt) "Ask user a yes-or-no question. Return t if answer is yes. Takes one argument, which is the string to display to ask the question. It should end in a space; `yes-or-no-p' adds `(yes or no) ' to it. The user must confirm the answer with RET, and can edit it until it has been confirmed." (save-excursion (let ((p (concat (gettext prompt) (gettext "(yes or no) "))) (ans "")) (while (stringp ans) (setq ans (downcase (read-string p nil t))) ;no history (cond ((string-equal ans (gettext "yes")) (setq ans t)) ((string-equal ans (gettext "no")) (setq ans nil)) (t (ding nil 'yes-or-no-p) (discard-input) (message "Please answer yes or no.") (sleep-for 2)))) ans))) (defun yes-or-no-p (prompt) "Ask user a yes-or-no question. Return t if answer is yes. The question is asked with a dialog box or the minibuffer, as appropriate. Takes one argument, which is the string to display to ask the question. It should end in a space; `yes-or-no-p' adds `(yes or no) ' to it. The user must confirm the answer with RET, and can edit it until it as been confirmed." (if (should-use-dialog-box-p) (yes-or-no-p-dialog-box prompt) (yes-or-no-p-minibuf prompt))) (defun y-or-n-p (prompt) "Ask user a \"y or n\" question. Return t if answer is \"y\". Takes one argument, which is the string to display to ask the question. The question is asked with a dialog box or the minibuffer, as appropriate. It should end in a space; `y-or-n-p' adds `(y or n) ' to it. No confirmation of the answer is requested; a single character is enough. Also accepts Space to mean yes, or Delete to mean no." (if (should-use-dialog-box-p) (yes-or-no-p-dialog-box prompt) (y-or-n-p-minibuf prompt))) (defun read-char () "Read a character from the command input (keyboard or macro). If a mouse click or non-ASCII character is detected, an error is signalled. The character typed is returned as an ASCII value. This is most likely the wrong thing for you to be using: consider using the `next-command-event' function instead." (save-excursion (let ((event (next-command-event))) (or inhibit-quit (and (event-matches-key-specifier-p event (quit-char)) (signal 'quit nil))) (prog1 (or (event-to-character event) ;; Kludge. If the event we read was a mouse-release, ;; discard it and read the next one. (if (button-release-event-p event) (event-to-character (next-command-event event))) (error "Key read has no ASCII equivalent %S" event)) ;; this is not necessary, but is marginally more efficient than GC. (deallocate-event event))))) (defun read-char-exclusive () "Read a character from the command input (keyboard or macro). If a mouse click or non-ASCII character is detected, it is discarded. The character typed is returned as an ASCII value. This is most likely the wrong thing for you to be using: consider using the `next-command-event' function instead." (let (event ch) (while (progn (setq event (next-command-event)) (or inhibit-quit (and (event-matches-key-specifier-p event (quit-char)) (signal 'quit nil))) (setq ch (event-to-character event)) (deallocate-event event) (null ch))) ch)) (defun read-quoted-char (&optional prompt) "Like `read-char', except that if the first character read is an octal digit, we read up to two more octal digits and return the character represented by the octal number consisting of those digits. Optional argument PROMPT specifies a string to use to prompt the user." (let ((count 0) (code 0) done (prompt (and prompt (gettext prompt))) char event) (while (and (not done) (< count 3)) (let ((inhibit-quit (zerop count)) ;; Don't let C-h get the help message--only help function keys. (help-char nil) (help-form "Type the special character you want to use, or three octal digits representing its character code.")) (and prompt (display-message 'prompt (format "%s-" prompt))) (setq event (next-command-event) char (or (event-to-character event nil nil t) (signal 'error (list "key read cannot be inserted in a buffer" event)))) (if inhibit-quit (setq quit-flag nil))) (cond ((<= ?0 char ?7) (setq code (+ (* code 8) (- char ?0)) count (1+ count)) (when prompt (display-message 'prompt (setq prompt (format "%s %c" prompt char))))) ((> count 0) (setq unread-command-event event done t)) (t (setq code (char-int char) done t)))) (int-char code) ;; Turn a meta-character into a character with the 0200 bit set. ; (logior (if (/= (logand code ?\M-\^@) 0) 128 0) ; (logand 255 code)))) )) (defun momentary-string-display (string pos &optional exit-char message) "Momentarily display STRING in the buffer at POS. Display remains until next character is typed. If the char is EXIT-CHAR (optional third arg, default is SPC) it is swallowed; otherwise it is then available as input (as a command if nothing else). Display MESSAGE (optional fourth arg) in the echo area. If MESSAGE is nil, instructions to type EXIT-CHAR are displayed there." (or exit-char (setq exit-char ?\ )) (let ((buffer-read-only nil) ;; Don't modify the undo list at all. (buffer-undo-list t) (modified (buffer-modified-p)) (name buffer-file-name) insert-end) (unwind-protect (progn (save-excursion (goto-char pos) ;; defeat file locking... don't try this at home, kids! (setq buffer-file-name nil) (insert-before-markers (gettext string)) (setq insert-end (point)) ;; If the message end is off frame, recenter now. (if (> (window-end) insert-end) (recenter (/ (window-height) 2))) ;; If that pushed message start off the frame, ;; scroll to start it at the top of the frame. (move-to-window-line 0) (if (> (point) pos) (progn (goto-char pos) (recenter 0)))) (message (or message (gettext "Type %s to continue editing.")) (single-key-description exit-char)) (let ((event (save-excursion (next-command-event)))) (or (eq (event-to-character event) exit-char) (setq unread-command-event event)))) (if insert-end (save-excursion (delete-region pos insert-end))) (setq buffer-file-name name) (set-buffer-modified-p modified)))) ;;; cmdloop.el ends here