2015-09-29 01:39:14 +03:00
|
|
|
;;; macroexp.el --- Additional macro-expansion support -*- lexical-binding: t -*-
|
2004-02-10 01:52:31 +00:00
|
|
|
;;
|
2022-01-01 02:45:51 -05:00
|
|
|
;; Copyright (C) 2004-2022 Free Software Foundation, Inc.
|
2004-02-10 01:52:31 +00:00
|
|
|
;;
|
|
|
|
;; Author: Miles Bader <miles@gnu.org>
|
|
|
|
;; Keywords: lisp, compiler, macros
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:21:21 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2004-02-10 01:52:31 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:21:21 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2004-02-10 01:52:31 +00:00
|
|
|
|
|
|
|
;; GNU Emacs 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
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2004-02-10 01:52:31 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
;;
|
|
|
|
;; This file contains macro-expansions functions that are not defined in
|
|
|
|
;; the Lisp core, namely `macroexpand-all', which expands all macros in
|
|
|
|
;; a form, not just a top-level one.
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
2022-01-14 19:06:04 +00:00
|
|
|
(defvar byte-compile-form-stack nil
|
|
|
|
"Dynamic list of successive enclosing forms.
|
|
|
|
This is used by the warning message routines to determine a
|
|
|
|
source code position. The most accessible element is the current
|
|
|
|
most deeply nested form.
|
|
|
|
|
|
|
|
Normally a form is manually pushed onto the list at the beginning
|
|
|
|
of `byte-compile-form', etc., and manually popped off at its end.
|
|
|
|
This is to preserve the data in it in the event of a
|
|
|
|
condition-case handling a signaled error.")
|
|
|
|
|
2004-02-10 01:52:31 +00:00
|
|
|
;; Bound by the top-level `macroexpand-all', and modified to include any
|
|
|
|
;; macros defined by `defmacro'.
|
|
|
|
(defvar macroexpand-all-environment nil)
|
|
|
|
|
2012-06-06 14:08:00 -04:00
|
|
|
(defun macroexp--cons (car cdr original-cons)
|
2019-08-02 23:03:47 +02:00
|
|
|
"Return ORIGINAL-CONS if the car/cdr of it is `eq' to CAR and CDR, respectively.
|
|
|
|
If not, return (CAR . CDR)."
|
2004-02-10 01:52:31 +00:00
|
|
|
(if (and (eq car (car original-cons)) (eq cdr (cdr original-cons)))
|
|
|
|
original-cons
|
|
|
|
(cons car cdr)))
|
|
|
|
|
|
|
|
;; We use this special macro to iteratively process forms and share list
|
|
|
|
;; structure of the result with the input. Doing so recursively using
|
2012-06-06 14:08:00 -04:00
|
|
|
;; `macroexp--cons' results in excessively deep recursion for very long
|
2004-02-10 01:52:31 +00:00
|
|
|
;; input forms.
|
2012-06-06 14:08:00 -04:00
|
|
|
(defmacro macroexp--accumulate (var+list &rest body)
|
2004-02-10 01:52:31 +00:00
|
|
|
"Return a list of the results of evaluating BODY for each element of LIST.
|
|
|
|
Evaluate BODY with VAR bound to each `car' from LIST, in turn.
|
|
|
|
Return a list of the values of the final form in BODY.
|
|
|
|
The list structure of the result will share as much with LIST as
|
|
|
|
possible (for instance, when BODY just returns VAR unchanged, the
|
2005-07-03 16:17:50 +00:00
|
|
|
result will be eq to LIST).
|
|
|
|
|
|
|
|
\(fn (VAR LIST) BODY...)"
|
2010-08-28 20:52:36 +02:00
|
|
|
(declare (indent 1))
|
2005-07-03 16:17:50 +00:00
|
|
|
(let ((var (car var+list))
|
|
|
|
(list (cadr var+list))
|
2004-02-10 01:52:31 +00:00
|
|
|
(shared (make-symbol "shared"))
|
|
|
|
(unshared (make-symbol "unshared"))
|
|
|
|
(tail (make-symbol "tail"))
|
|
|
|
(new-el (make-symbol "new-el")))
|
|
|
|
`(let* ((,shared ,list)
|
|
|
|
(,unshared nil)
|
|
|
|
(,tail ,shared)
|
|
|
|
,var ,new-el)
|
2012-05-29 23:59:42 -04:00
|
|
|
(while (consp ,tail)
|
2004-02-10 01:52:31 +00:00
|
|
|
(setq ,var (car ,tail)
|
|
|
|
,new-el (progn ,@body))
|
|
|
|
(unless (eq ,var ,new-el)
|
|
|
|
(while (not (eq ,shared ,tail))
|
|
|
|
(push (pop ,shared) ,unshared))
|
|
|
|
(setq ,shared (cdr ,shared))
|
|
|
|
(push ,new-el ,unshared))
|
|
|
|
(setq ,tail (cdr ,tail)))
|
|
|
|
(nconc (nreverse ,unshared) ,shared))))
|
|
|
|
|
2012-06-06 14:08:00 -04:00
|
|
|
(defun macroexp--all-forms (forms &optional skip)
|
2004-02-10 01:52:31 +00:00
|
|
|
"Return FORMS with macros expanded. FORMS is a list of forms.
|
|
|
|
If SKIP is non-nil, then don't expand that many elements at the start of
|
|
|
|
FORMS."
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--accumulate (form forms)
|
2004-02-10 01:52:31 +00:00
|
|
|
(if (or (null skip) (zerop skip))
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--expand-all form)
|
2004-02-10 01:52:31 +00:00
|
|
|
(setq skip (1- skip))
|
|
|
|
form)))
|
|
|
|
|
2012-06-06 14:08:00 -04:00
|
|
|
(defun macroexp--all-clauses (clauses &optional skip)
|
2004-02-10 01:52:31 +00:00
|
|
|
"Return CLAUSES with macros expanded.
|
|
|
|
CLAUSES is a list of lists of forms; any clause that's not a list is ignored.
|
|
|
|
If SKIP is non-nil, then don't expand that many elements at the start of
|
|
|
|
each clause."
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--accumulate (clause clauses)
|
2004-02-10 01:52:31 +00:00
|
|
|
(if (listp clause)
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--all-forms clause skip)
|
2004-02-10 01:52:31 +00:00
|
|
|
clause)))
|
|
|
|
|
2012-06-14 23:18:14 -04:00
|
|
|
(defun macroexp--compiler-macro (handler form)
|
2018-12-16 23:39:51 -05:00
|
|
|
(condition-case-unless-debug err
|
Make symbols with positions work with native compilation
This version of the software should bootstrap Emacs successfully with native
compilation enabled.
* lisp/emacs-lisp/bytecomp.el (byte-compile-strip-s-p-1)
(byte-compile-strip-symbol-positions): Rename and move to macroexp.el. Rename
calls to these functions throughout the file.
(byte-compile-initial-macro-environment): In the code sections for
eval-when-compile and eval-and-compile, call macroexp-strip-symbol-positions
before evaluating code.
(byte-compile-file, byte-compile-output-file-form)
(byte-compile-file-form-defmumble, byte-compile, batch-byte-compile): Call
macroexp-strip-symbol-positions from code being passed to the native compiler.
* lisp/emacs-lisp/cl-macs.el (cl-macs--strip-s-p-1)
(cl-macs--strip-symbol-positions): Remove, replacing them with the renamed
functions in macroexp.el.
(cl-define-compiler-macro): Apply macroexp-strip-symbol-positions to ARGS and
BODY.
* lisp/emacs-lisp/comp.el (comp-limplify-lap-inst): Use `null' to compile
byte-not rather than a compilation of `eq'.
(comp--native-compile): bind symbols-with-pos-enabled to t.
* lisp/emacs-lisp/macroexp.el (byte-compile--ssp-conses-seen)
(byte-compile--ssp-vectors-seen, byte-compile--ssp-records-seen): Provisional
auxiliary variables to support the following functions.
(macroexp--strip-s-p-2, byte-compile-strip-s-p-1)
(macroexp-strip-symbol-positions): Functions moved from bytecomp.el, renamed,
and further developed.
(macroexp--compiler-macro): Bind symbol-with-pos-enabled to t around the call
to `handler'.
(internal-macroexpand-for-load): Strip symbol positions from the form being
eagerly expanded for macros.
* src/comp.c (F_SYMBOLS_WITH_POS_ENABLED_RELOC_SYM): New macro for a
relocation symbol.
(comp_t): New elements bool_ptr_type, f_symbols_with_pos_enabled_ref,
lisp_symbol_with_position, lisp_symbol_with_position_header,
lisp_symbol_with_position_sym, lisp_symbol_with_position_pos,
lisp_symbol_with_position_type, lisp_symbol_with_position_ptr_type,
get_symbol_with_position.
(helper_GET_SYMBOL_WITH_POSITION): New function.
(emit_BASE_EQ): Function rename from emit_EQ.
(emit_AND, emit_OR, emit_BARE_SYMBOL_P, emit_SYMBOL_WITH_POS_P)
(emit_SYMBOL_WITH_POS_SYM): New functions.
(emit_EQ): New function which handles symbols with position correctly.
(emit_NILP): Use emit_BASE_EQ rather than emit_EQ.
(emit_limple_insn): When emitting a conditional branch, check each operand for
being a literal Qnil, and if one of them is, use emit_BASE_EQ rather than
emit_EQ.
(declare_runtime_imported_funcs): Declare helper_GET_SYMBOL_WITH_POSITION.
(emit_ctxt_code): Export the global F_SYMBOLS_WITH_POS_ENABLED_RELOC_SYM.
(define_lisp_symbol_with_position, define_GET_SYMBOL_WITH_POSITION): New
functions.
(Fcomp__init_ctxt): Initialise comp.bool_ptr_type, call the two new
define_.... functions.
(load_comp_unit): Initialise **f_symbols_with_pos_enabled_reloc.
* src/fns.c (Fput): Strip positions from symbols in PROPNAME and VALUE.
2021-12-30 10:14:58 +00:00
|
|
|
(let ((symbols-with-pos-enabled t))
|
|
|
|
(apply handler form (cdr form)))
|
2014-04-21 02:34:21 -07:00
|
|
|
(error
|
Make symbols with positions work with native compilation
This version of the software should bootstrap Emacs successfully with native
compilation enabled.
* lisp/emacs-lisp/bytecomp.el (byte-compile-strip-s-p-1)
(byte-compile-strip-symbol-positions): Rename and move to macroexp.el. Rename
calls to these functions throughout the file.
(byte-compile-initial-macro-environment): In the code sections for
eval-when-compile and eval-and-compile, call macroexp-strip-symbol-positions
before evaluating code.
(byte-compile-file, byte-compile-output-file-form)
(byte-compile-file-form-defmumble, byte-compile, batch-byte-compile): Call
macroexp-strip-symbol-positions from code being passed to the native compiler.
* lisp/emacs-lisp/cl-macs.el (cl-macs--strip-s-p-1)
(cl-macs--strip-symbol-positions): Remove, replacing them with the renamed
functions in macroexp.el.
(cl-define-compiler-macro): Apply macroexp-strip-symbol-positions to ARGS and
BODY.
* lisp/emacs-lisp/comp.el (comp-limplify-lap-inst): Use `null' to compile
byte-not rather than a compilation of `eq'.
(comp--native-compile): bind symbols-with-pos-enabled to t.
* lisp/emacs-lisp/macroexp.el (byte-compile--ssp-conses-seen)
(byte-compile--ssp-vectors-seen, byte-compile--ssp-records-seen): Provisional
auxiliary variables to support the following functions.
(macroexp--strip-s-p-2, byte-compile-strip-s-p-1)
(macroexp-strip-symbol-positions): Functions moved from bytecomp.el, renamed,
and further developed.
(macroexp--compiler-macro): Bind symbol-with-pos-enabled to t around the call
to `handler'.
(internal-macroexpand-for-load): Strip symbol positions from the form being
eagerly expanded for macros.
* src/comp.c (F_SYMBOLS_WITH_POS_ENABLED_RELOC_SYM): New macro for a
relocation symbol.
(comp_t): New elements bool_ptr_type, f_symbols_with_pos_enabled_ref,
lisp_symbol_with_position, lisp_symbol_with_position_header,
lisp_symbol_with_position_sym, lisp_symbol_with_position_pos,
lisp_symbol_with_position_type, lisp_symbol_with_position_ptr_type,
get_symbol_with_position.
(helper_GET_SYMBOL_WITH_POSITION): New function.
(emit_BASE_EQ): Function rename from emit_EQ.
(emit_AND, emit_OR, emit_BARE_SYMBOL_P, emit_SYMBOL_WITH_POS_P)
(emit_SYMBOL_WITH_POS_SYM): New functions.
(emit_EQ): New function which handles symbols with position correctly.
(emit_NILP): Use emit_BASE_EQ rather than emit_EQ.
(emit_limple_insn): When emitting a conditional branch, check each operand for
being a literal Qnil, and if one of them is, use emit_BASE_EQ rather than
emit_EQ.
(declare_runtime_imported_funcs): Declare helper_GET_SYMBOL_WITH_POSITION.
(emit_ctxt_code): Export the global F_SYMBOLS_WITH_POS_ENABLED_RELOC_SYM.
(define_lisp_symbol_with_position, define_GET_SYMBOL_WITH_POSITION): New
functions.
(Fcomp__init_ctxt): Initialise comp.bool_ptr_type, call the two new
define_.... functions.
(load_comp_unit): Initialise **f_symbols_with_pos_enabled_reloc.
* src/fns.c (Fput): Strip positions from symbols in PROPNAME and VALUE.
2021-12-30 10:14:58 +00:00
|
|
|
(message "Compiler-macro error for %S: Handler: %S\n%S" (car form) handler err)
|
|
|
|
form)))
|
2012-06-14 23:18:14 -04:00
|
|
|
|
2012-09-19 15:59:52 -04:00
|
|
|
(defun macroexp--funcall-if-compiled (_form)
|
2012-09-04 13:40:25 -04:00
|
|
|
"Pseudo function used internally by macroexp to delay warnings.
|
|
|
|
The purpose is to delay warnings to bytecomp.el, so they can use things
|
2016-09-03 20:37:47 +02:00
|
|
|
like `byte-compile-warn' to get better file-and-line-number data
|
2012-09-04 13:40:25 -04:00
|
|
|
and also to avoid outputting the warning during normal execution."
|
|
|
|
nil)
|
2012-09-19 15:59:52 -04:00
|
|
|
(put 'macroexp--funcall-if-compiled 'byte-compile
|
2012-09-04 13:40:25 -04:00
|
|
|
(lambda (form)
|
2012-09-19 15:59:52 -04:00
|
|
|
(funcall (eval (cadr form)))
|
2012-09-04 13:40:25 -04:00
|
|
|
(byte-compile-constant nil)))
|
|
|
|
|
2021-02-24 13:52:45 -05:00
|
|
|
(defun macroexp-compiling-p ()
|
2013-06-04 22:35:40 -04:00
|
|
|
"Return non-nil if we're macroexpanding for the compiler."
|
|
|
|
;; FIXME: ¡¡Major Ugly Hack!! To determine whether the output of this
|
|
|
|
;; macro-expansion will be processed by the byte-compiler, we check
|
|
|
|
;; circumstantial evidence.
|
|
|
|
(member '(declare-function . byte-compile-macroexpand-declare-function)
|
|
|
|
macroexpand-all-environment))
|
|
|
|
|
2021-02-24 13:52:45 -05:00
|
|
|
(defun macroexp-file-name ()
|
|
|
|
"Return the name of the file from which the code comes.
|
|
|
|
Returns nil when we do not know.
|
|
|
|
A non-nil result is expected to be reliable when called from a macro in order
|
|
|
|
to find the file in which the macro's call was found, and it should be
|
|
|
|
reliable as well when used at the top-level of a file.
|
|
|
|
Other uses risk returning non-nil value that point to the wrong file."
|
2021-02-24 17:16:00 -05:00
|
|
|
;; `eval-buffer' binds `current-load-list' but not `load-file-name',
|
|
|
|
;; so prefer using it over using `load-file-name'.
|
|
|
|
(let ((file (car (last current-load-list))))
|
|
|
|
(or (if (stringp file) file)
|
|
|
|
(bound-and-true-p byte-compile-current-file))))
|
2021-02-24 13:52:45 -05:00
|
|
|
|
2015-07-07 02:14:16 -04:00
|
|
|
(defvar macroexp--warned (make-hash-table :test #'equal :weakness 'key))
|
2013-06-04 22:35:40 -04:00
|
|
|
|
Several amendments to scratch/correct-warning-pos.
The position return by read-positioning-symbols is now the position in the
buffer, rather than the offset from the start of a form, enabling warning
positions in other parts of the buffer to be output.
* src/lisp.h (lisp_h_EQ): Add XLI casts so that it compiles cleanly.
* src/data.c (Fremove_pos_from_symbol): New DEFUN.
* src/lread.c (readchar_count): renamed to readchar_offset.
(read_internal_start) Initialize readchar_offset to the buffer's point when
STREAM is a buffer.
* lisp/emacs-lisp/bytecomp.el (byte-compile-warning-prefix): Amend to use
OFFSET as a buffer position, not an offset from the start of a form.
(byte-compile-warn): Remove symbol positions from any shape of ARGS, not just
a symbol with position.
* lisp/emacs-lisp/cconv.c (cconv-convert): In the :unused case, position the
new IGNORE symbol with the VAR it has replaced.
* lisp/emacs-lisp/macroexp.el (macroexp--warn-wrap, macroexp-warn-and-return):
Add an extra position parameter to each.
* lisp/emacs-lisp/bindat.el (bindat-type), lisp/emacs-lisp/byte-run.el
(defmacro, defun), lisp/emacs-lisp/cconv.el (cconv--convert-func-body)
(cconv-convert), lisp/emacs-lisp/cl-generic.el (cl-defmethod),
lisp/emacs-lisp/cl-macs.el (cl-symbol-macrolet, cl-defstruct),
lisp/emacs-lisp/easy-mmode.el (define-minor-mode),
lisp/emacs-lisp/eieio-core.el (eieio-oref, eieio-oref-default)
(eieio-oset-default), lisp/emacs-lisp/eieio.el (defclass),
lisp/emacs-lisp/gv.el (gv-ref), lisp/emacs-lisp/macroexp.el
(macroexp-macroexpand, macroexp--unfold-lambda, macroexp--expand-all),
lisp/emacs-lisp/pcase.el (pcase-compile-patterns, pcase--u1): Add an extra
position argument to each call of macroexp-warn-and-return.
2021-12-01 20:03:44 +00:00
|
|
|
(defun macroexp--warn-wrap (arg msg form category)
|
2021-12-02 16:47:42 +01:00
|
|
|
(let ((when-compiled
|
|
|
|
(lambda ()
|
|
|
|
(when (if (consp category)
|
|
|
|
(apply #'byte-compile-warning-enabled-p category)
|
|
|
|
(byte-compile-warning-enabled-p category))
|
2022-01-11 21:57:54 +00:00
|
|
|
(byte-compile-warn-x arg "%s" msg)))))
|
2021-02-26 20:24:52 -05:00
|
|
|
`(progn
|
|
|
|
(macroexp--funcall-if-compiled ',when-compiled)
|
|
|
|
,form)))
|
|
|
|
|
|
|
|
(define-obsolete-function-alias 'macroexp--warn-and-return
|
|
|
|
#'macroexp-warn-and-return "28.1")
|
2022-02-19 14:20:02 -05:00
|
|
|
(defun macroexp-warn-and-return (msg form &optional category compile-only arg)
|
2021-07-22 10:31:14 +03:00
|
|
|
"Return code equivalent to FORM labeled with warning MSG.
|
2021-07-21 11:11:50 -04:00
|
|
|
CATEGORY is the category of the warning, like the categories that
|
|
|
|
can appear in `byte-compile-warnings'.
|
2021-07-22 10:31:14 +03:00
|
|
|
COMPILE-ONLY non-nil means no warning should be emitted if the code
|
2022-02-19 14:20:02 -05:00
|
|
|
is executed without being compiled first.
|
|
|
|
ARG is a symbol (or a form) giving the source code position for the message.
|
|
|
|
It should normally be a symbol with position and it defaults to FORM."
|
2021-02-26 20:24:52 -05:00
|
|
|
(cond
|
|
|
|
((null msg) form)
|
|
|
|
((macroexp-compiling-p)
|
|
|
|
(if (and (consp form) (gethash form macroexp--warned))
|
|
|
|
;; Already wrapped this exp with a warning: avoid inf-looping
|
|
|
|
;; where we keep adding the same warning onto `form' because
|
|
|
|
;; macroexpand-all gets right back to macroexpanding `form'.
|
|
|
|
form
|
|
|
|
(puthash form form macroexp--warned)
|
2022-02-19 14:20:02 -05:00
|
|
|
(macroexp--warn-wrap (or arg form) msg form category)))
|
2021-02-26 20:24:52 -05:00
|
|
|
(t
|
|
|
|
(unless compile-only
|
|
|
|
(message "%sWarning: %s"
|
|
|
|
(if (stringp load-file-name)
|
|
|
|
(concat (file-relative-name load-file-name) ": ")
|
|
|
|
"")
|
|
|
|
msg))
|
|
|
|
form)))
|
2012-09-20 09:46:36 -04:00
|
|
|
|
|
|
|
(defun macroexp--obsolete-warning (fun obsolescence-data type)
|
|
|
|
(let ((instead (car obsolescence-data))
|
|
|
|
(asof (nth 2 obsolescence-data)))
|
More-conservative ‘format’ quote restyling
Instead of restyling curved quotes for every call to ‘format’,
create a new function ‘format-message’ that does the restyling,
and using the new function instead of ‘format’ only in contexts
where this seems appropriate.
Problem reported by Dmitry Gutov and Andreas Schwab in:
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00826.html
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00827.html
* doc/lispref/commands.texi (Using Interactive):
* doc/lispref/control.texi (Signaling Errors, Signaling Errors):
* doc/lispref/display.texi (Displaying Messages, Progress):
* doc/lispref/elisp.texi:
* doc/lispref/help.texi (Keys in Documentation):
* doc/lispref/minibuf.texi (Minibuffer Misc):
* doc/lispref/strings.texi (Formatting Strings):
* etc/NEWS:
Document the changes.
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/apropos.el (apropos-library):
* lisp/calc/calc-ext.el (calc-record-message)
(calc-user-function-list):
* lisp/calc/calc-help.el (calc-describe-key, calc-full-help):
* lisp/calc/calc-lang.el (math-read-big-balance):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--add-diary-entry):
* lisp/cedet/mode-local.el (mode-local-print-binding)
(mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-completion-message):
* lisp/cedet/semantic/edit.el (semantic-parse-changes-failed):
* lisp/cedet/semantic/wisent/comp.el (wisent-log):
* lisp/cedet/srecode/insert.el (srecode-insert-show-error-report):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dframe.el (dframe-message):
* lisp/dired-aux.el (dired-query):
* lisp/emacs-lisp/byte-opt.el (byte-compile-log-lap-1):
* lisp/emacs-lisp/bytecomp.el (byte-compile-log)
(byte-compile-log-file, byte-compile-warn, byte-compile-form):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use)
(cconv-analyze-form):
* lisp/emacs-lisp/check-declare.el (check-declare-warn):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/cl-macs.el (cl-symbol-macrolet):
* lisp/emacs-lisp/edebug.el (edebug-format):
* lisp/emacs-lisp/eieio-core.el (eieio-oref):
* lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message)
(eldoc-message):
* lisp/emacs-lisp/elint.el (elint-file, elint-log):
* lisp/emacs-lisp/find-func.el (find-function-library):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring):
* lisp/emacs-lisp/package.el (package-compute-transaction)
(package-install-button-action, package-delete-button-action)
(package-menu--list-to-prompt):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emacs-lisp/warnings.el (lwarn, warn):
* lisp/emulation/viper-cmd.el:
(viper-toggle-parse-sexp-ignore-comments)
(viper-kill-buffer, viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/facemenu.el (facemenu-add-new-face):
* lisp/faces.el (face-documentation, read-face-name)
(face-read-string, read-face-font, describe-face):
* lisp/files.el (find-alternate-file, hack-local-variables)
(hack-one-local-variable--obsolete, write-file)
(basic-save-buffer, delete-directory):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--obsolete)
(help-fns--interactive-only, describe-function-1)
(describe-variable):
* lisp/help.el (describe-mode):
* lisp/info-xref.el (info-xref-output):
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
* lisp/international/kkc.el (kkc-error):
* lisp/international/mule-cmds.el:
(select-safe-coding-system-interactively)
(select-safe-coding-system, describe-input-method):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/international/quail.el (quail-error):
* lisp/minibuffer.el (minibuffer-message):
* lisp/mpc.el (mpc--debug):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-message):
* lisp/net/gnutls.el (gnutls-message-maybe):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/nsm.el (nsm-query-user):
* lisp/net/rlogin.el (rlogin):
* lisp/net/soap-client.el (soap-warning):
* lisp/net/tramp.el (tramp-debug-message):
* lisp/nxml/nxml-outln.el (nxml-report-outline-error):
* lisp/nxml/nxml-parse.el (nxml-parse-error):
* lisp/nxml/rng-cmpct.el (rng-c-error):
* lisp/nxml/rng-match.el (rng-compile-error):
* lisp/nxml/rng-uri.el (rng-uri-error):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/org/org-ctags.el:
(org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/proced.el (proced-log):
* lisp/progmodes/ebnf2ps.el (ebnf-log):
* lisp/progmodes/flymake.el (flymake-log):
* lisp/progmodes/vhdl-mode.el (vhdl-warning-when-idle):
* lisp/replace.el (occur-1):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, define-alternatives):
* lisp/startup.el (command-line):
* lisp/subr.el (error, user-error, add-to-list):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* src/callint.c (Fcall_interactively):
* src/editfns.c (Fmessage, Fmessage_box):
Restyle the quotes of format strings intended for use as a
diagnostic, when restyling seems appropriate.
* lisp/subr.el (format-message): New function.
* src/doc.c (Finternal__text_restyle): New function.
(syms_of_doc): Define it.
2015-08-23 22:38:02 -07:00
|
|
|
(format-message
|
Go back to grave quoting in source-code docstrings etc.
This reverts almost all my recent changes to use curved quotes
in docstrings and/or strings used for error diagnostics.
There are a few exceptions, e.g., Bahá’í proper names.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet)
(outlineify-sticky):
* lisp/apropos.el (apropos-library):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-ext.el (calc-user-function-list):
* lisp/calc/calc-graph.el (calc-graph-show-dumb):
* lisp/calc/calc-help.el (calc-describe-key)
(calc-describe-thing, calc-full-help):
* lisp/calc/calc-lang.el (calc-c-language)
(math-parse-fortran-vector-end, math-parse-tex-sum)
(math-parse-eqn-matrix, math-parse-eqn-prime)
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-read-giac-subscr, math-read-math-subscr)
(math-read-big-rec, math-read-big-balance):
* lisp/calc/calc-misc.el (calc-help, report-calc-bug):
* lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes)
(calc-auto-recompute):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part, calc-user-define-invocation)
(math-do-arg-check):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-vec.el (math-read-brackets):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calc/calc.el (calc, calc-do, calc-user-invocation):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/diary-lib.el (diary-check-diary-file)
(diary-mail-entries, diary-from-outlook):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--convert-float-to-ical)
(icalendar--convert-date-to-ical)
(icalendar--convert-ical-to-diary)
(icalendar--convert-recurring-to-diary)
(icalendar--add-diary-entry):
* lisp/calendar/time-date.el (format-seconds):
* lisp/calendar/timeclock.el (timeclock-mode-line-display)
(timeclock-make-hours-explicit, timeclock-log-data):
* lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category)
(todo-item-mark, todo-check-format)
(todo-insert-item--next-param, todo-edit-item--next-key)
(todo-mode):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/mode-local.el (describe-mode-local-overload)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-start.el (standard):
* lisp/cus-theme.el (describe-theme-1):
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dired-x.el (dired-do-run-mail):
* lisp/dired.el (dired-log):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-enable-advice)
(ad-disable-advice, ad-remove-advice, ad-set-argument)
(ad-set-arguments, ad--defalias-fset, ad-activate)
(ad-deactivate):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand)
(byte-compile-unfold-lambda, byte-optimize-form-code-walker)
(byte-optimize-while, byte-optimize-apply):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode)
(byte-compile-log-file, byte-compile-format-warn)
(byte-compile-nogroup-warn, byte-compile-arglist-warn)
(byte-compile-cl-warn)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file, byte-compile--declare-var)
(byte-compile-file-form-defmumble, byte-compile-form)
(byte-compile-normal-call, byte-compile-check-variable)
(byte-compile-variable-ref, byte-compile-variable-set)
(byte-compile-subr-wrong-args, byte-compile-setq-default)
(byte-compile-negation-optimizer)
(byte-compile-condition-case--old)
(byte-compile-condition-case--new, byte-compile-save-excursion)
(byte-compile-defvar, byte-compile-autoload)
(byte-compile-lambda-form)
(byte-compile-make-variable-buffer-local, display-call-tree)
(batch-byte-compile):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use):
* lisp/emacs-lisp/chart.el (chart-space-usage):
* lisp/emacs-lisp/check-declare.el (check-declare-scan)
(check-declare-warn, check-declare-file)
(check-declare-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-message-text-engine):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer)
(cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl--generic-describe, cl-generic-generalizers):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody)
(cl-symbol-macrolet):
* lisp/emacs-lisp/cl.el (cl-unload-function, flet):
* lisp/emacs-lisp/copyright.el (copyright)
(copyright-update-directory):
* lisp/emacs-lisp/edebug.el (edebug-read-list):
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-core.el (eieio--slot-override)
(eieio-oref):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/eieio-speedbar.el:
(eieio-speedbar-child-make-tag-lines)
(eieio-speedbar-child-description):
* lisp/emacs-lisp/eieio.el (defclass, change-class):
* lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms)
(elint-init-form, elint-check-defalias-form)
(elint-check-let-form):
* lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol)
(find-function-library):
* lisp/emacs-lisp/generator.el (iter-yield):
* lisp/emacs-lisp/gv.el (gv-define-simple-setter):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring)
(advice--make, define-advice):
* lisp/emacs-lisp/package-x.el (package-upload-file):
* lisp/emacs-lisp/package.el (package-version-join)
(package-disabled-p, package-activate-1, package-activate)
(package--download-one-archive)
(package--download-and-read-archives)
(package-compute-transaction, package-install-from-archive)
(package-install, package-install-selected-packages)
(package-delete, package-autoremove, describe-package-1)
(package-install-button-action, package-delete-button-action)
(package-menu-hide-package, package-menu--list-to-prompt)
(package-menu--perform-transaction)
(package-menu--find-and-notify-upgrades):
* lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1):
* lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode):
* lisp/emacs-lisp/ring.el (ring-previous, ring-next):
* lisp/emacs-lisp/rx.el (rx-check, rx-anything)
(rx-check-any-string, rx-check-any, rx-check-not, rx-=)
(rx-repeat, rx-check-backref, rx-syntax, rx-check-category)
(rx-form):
* lisp/emacs-lisp/smie.el (smie-config-save):
* lisp/emacs-lisp/subr-x.el (internal--check-binding):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/testcover.el (testcover-1value):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments)
(viper-toggle-search-style, viper-kill-buffer)
(viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/env.el (setenv):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp)
(eshell-glob-entries):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (read-face-name, read-face-font, describe-face)
(x-resolve-font-name):
* lisp/files-x.el (modify-file-local-variable):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, hack-one-local-variable--obsolete)
(dir-locals-set-directory-class, write-file, basic-save-buffer)
(delete-directory, copy-directory, recover-session)
(recover-session-finish, insert-directory)
(file-modes-char-to-who, file-modes-symbolic-to-number)
(move-file-to-trash):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/finder.el (finder-commentary):
* lisp/font-lock.el (font-lock-fontify-buffer):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/frame.el (get-device-terminal, select-frame-by-name):
* lisp/fringe.el (fringe--check-style):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode)
(describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/ccl.el (ccl-dump):
* lisp/international/fontset.el (x-must-resolve-font-name):
* lisp/international/mule-cmds.el (prefer-coding-system)
(select-safe-coding-system-interactively)
(select-safe-coding-system, activate-input-method)
(toggle-input-method, describe-current-input-method)
(describe-language-environment):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/imap.el (imap-interactive-login):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/rlogin.el (rlogin):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/proced.el (proced-log):
* lisp/progmodes/ada-mode.el (ada-get-indent-case)
(ada-check-matching-start, ada-goto-matching-start):
* lisp/progmodes/ada-prj.el (ada-prj-display-page):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/ebrowse.el (ebrowse-tags-apropos):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-shell-get-process-or-error)
(python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate):
* lisp/recentf.el (recentf-open-files):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/server.el (server-get-auth-key):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, list-processes--refresh)
(compose-mail, set-variable, choose-completion-string)
(define-alternatives):
* lisp/startup.el (site-run-file, tty-handle-args, command-line)
(command-line-1):
* lisp/subr.el (noreturn, define-error, add-to-list)
(read-char-choice, version-to-list):
* lisp/term/common-win.el (x-handle-xrm-switch)
(x-handle-name-switch, x-handle-args):
* lisp/term/x-win.el (x-handle-parent-id, x-handle-smid):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/textmodes/two-column.el (2C-split):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
(wdired-do-perm-changes):
* lisp/whitespace.el (whitespace-report-region):
Prefer grave quoting in source-code strings used to generate help
and diagnostics.
* lisp/faces.el (face-documentation):
No need to convert quotes, since the result is a docstring.
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
Simplify by generating only curved quotes, since info files are
typically that ways nowadays anyway.
* lisp/international/mule-diag.el (list-input-methods):
Don’t assume text quoting style is curved.
* lisp/org/org-bibtex.el (org-bibtex-fields):
Revert my recent changes, going back to the old quoting style.
2015-09-07 08:41:44 -07:00
|
|
|
"`%s' is an obsolete %s%s%s" fun type
|
More-conservative ‘format’ quote restyling
Instead of restyling curved quotes for every call to ‘format’,
create a new function ‘format-message’ that does the restyling,
and using the new function instead of ‘format’ only in contexts
where this seems appropriate.
Problem reported by Dmitry Gutov and Andreas Schwab in:
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00826.html
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00827.html
* doc/lispref/commands.texi (Using Interactive):
* doc/lispref/control.texi (Signaling Errors, Signaling Errors):
* doc/lispref/display.texi (Displaying Messages, Progress):
* doc/lispref/elisp.texi:
* doc/lispref/help.texi (Keys in Documentation):
* doc/lispref/minibuf.texi (Minibuffer Misc):
* doc/lispref/strings.texi (Formatting Strings):
* etc/NEWS:
Document the changes.
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/apropos.el (apropos-library):
* lisp/calc/calc-ext.el (calc-record-message)
(calc-user-function-list):
* lisp/calc/calc-help.el (calc-describe-key, calc-full-help):
* lisp/calc/calc-lang.el (math-read-big-balance):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--add-diary-entry):
* lisp/cedet/mode-local.el (mode-local-print-binding)
(mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-completion-message):
* lisp/cedet/semantic/edit.el (semantic-parse-changes-failed):
* lisp/cedet/semantic/wisent/comp.el (wisent-log):
* lisp/cedet/srecode/insert.el (srecode-insert-show-error-report):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dframe.el (dframe-message):
* lisp/dired-aux.el (dired-query):
* lisp/emacs-lisp/byte-opt.el (byte-compile-log-lap-1):
* lisp/emacs-lisp/bytecomp.el (byte-compile-log)
(byte-compile-log-file, byte-compile-warn, byte-compile-form):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use)
(cconv-analyze-form):
* lisp/emacs-lisp/check-declare.el (check-declare-warn):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/cl-macs.el (cl-symbol-macrolet):
* lisp/emacs-lisp/edebug.el (edebug-format):
* lisp/emacs-lisp/eieio-core.el (eieio-oref):
* lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message)
(eldoc-message):
* lisp/emacs-lisp/elint.el (elint-file, elint-log):
* lisp/emacs-lisp/find-func.el (find-function-library):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring):
* lisp/emacs-lisp/package.el (package-compute-transaction)
(package-install-button-action, package-delete-button-action)
(package-menu--list-to-prompt):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emacs-lisp/warnings.el (lwarn, warn):
* lisp/emulation/viper-cmd.el:
(viper-toggle-parse-sexp-ignore-comments)
(viper-kill-buffer, viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/facemenu.el (facemenu-add-new-face):
* lisp/faces.el (face-documentation, read-face-name)
(face-read-string, read-face-font, describe-face):
* lisp/files.el (find-alternate-file, hack-local-variables)
(hack-one-local-variable--obsolete, write-file)
(basic-save-buffer, delete-directory):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--obsolete)
(help-fns--interactive-only, describe-function-1)
(describe-variable):
* lisp/help.el (describe-mode):
* lisp/info-xref.el (info-xref-output):
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
* lisp/international/kkc.el (kkc-error):
* lisp/international/mule-cmds.el:
(select-safe-coding-system-interactively)
(select-safe-coding-system, describe-input-method):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/international/quail.el (quail-error):
* lisp/minibuffer.el (minibuffer-message):
* lisp/mpc.el (mpc--debug):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-message):
* lisp/net/gnutls.el (gnutls-message-maybe):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/nsm.el (nsm-query-user):
* lisp/net/rlogin.el (rlogin):
* lisp/net/soap-client.el (soap-warning):
* lisp/net/tramp.el (tramp-debug-message):
* lisp/nxml/nxml-outln.el (nxml-report-outline-error):
* lisp/nxml/nxml-parse.el (nxml-parse-error):
* lisp/nxml/rng-cmpct.el (rng-c-error):
* lisp/nxml/rng-match.el (rng-compile-error):
* lisp/nxml/rng-uri.el (rng-uri-error):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/org/org-ctags.el:
(org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/proced.el (proced-log):
* lisp/progmodes/ebnf2ps.el (ebnf-log):
* lisp/progmodes/flymake.el (flymake-log):
* lisp/progmodes/vhdl-mode.el (vhdl-warning-when-idle):
* lisp/replace.el (occur-1):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, define-alternatives):
* lisp/startup.el (command-line):
* lisp/subr.el (error, user-error, add-to-list):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* src/callint.c (Fcall_interactively):
* src/editfns.c (Fmessage, Fmessage_box):
Restyle the quotes of format strings intended for use as a
diagnostic, when restyling seems appropriate.
* lisp/subr.el (format-message): New function.
* src/doc.c (Finternal__text_restyle): New function.
(syms_of_doc): Define it.
2015-08-23 22:38:02 -07:00
|
|
|
(if asof (concat " (as of " asof ")") "")
|
2015-08-31 00:04:11 -07:00
|
|
|
(cond ((stringp instead) (concat "; " (substitute-command-keys instead)))
|
Go back to grave quoting in source-code docstrings etc.
This reverts almost all my recent changes to use curved quotes
in docstrings and/or strings used for error diagnostics.
There are a few exceptions, e.g., Bahá’í proper names.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet)
(outlineify-sticky):
* lisp/apropos.el (apropos-library):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-ext.el (calc-user-function-list):
* lisp/calc/calc-graph.el (calc-graph-show-dumb):
* lisp/calc/calc-help.el (calc-describe-key)
(calc-describe-thing, calc-full-help):
* lisp/calc/calc-lang.el (calc-c-language)
(math-parse-fortran-vector-end, math-parse-tex-sum)
(math-parse-eqn-matrix, math-parse-eqn-prime)
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-read-giac-subscr, math-read-math-subscr)
(math-read-big-rec, math-read-big-balance):
* lisp/calc/calc-misc.el (calc-help, report-calc-bug):
* lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes)
(calc-auto-recompute):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part, calc-user-define-invocation)
(math-do-arg-check):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-vec.el (math-read-brackets):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calc/calc.el (calc, calc-do, calc-user-invocation):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/diary-lib.el (diary-check-diary-file)
(diary-mail-entries, diary-from-outlook):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--convert-float-to-ical)
(icalendar--convert-date-to-ical)
(icalendar--convert-ical-to-diary)
(icalendar--convert-recurring-to-diary)
(icalendar--add-diary-entry):
* lisp/calendar/time-date.el (format-seconds):
* lisp/calendar/timeclock.el (timeclock-mode-line-display)
(timeclock-make-hours-explicit, timeclock-log-data):
* lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category)
(todo-item-mark, todo-check-format)
(todo-insert-item--next-param, todo-edit-item--next-key)
(todo-mode):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/mode-local.el (describe-mode-local-overload)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-start.el (standard):
* lisp/cus-theme.el (describe-theme-1):
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dired-x.el (dired-do-run-mail):
* lisp/dired.el (dired-log):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-enable-advice)
(ad-disable-advice, ad-remove-advice, ad-set-argument)
(ad-set-arguments, ad--defalias-fset, ad-activate)
(ad-deactivate):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand)
(byte-compile-unfold-lambda, byte-optimize-form-code-walker)
(byte-optimize-while, byte-optimize-apply):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode)
(byte-compile-log-file, byte-compile-format-warn)
(byte-compile-nogroup-warn, byte-compile-arglist-warn)
(byte-compile-cl-warn)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file, byte-compile--declare-var)
(byte-compile-file-form-defmumble, byte-compile-form)
(byte-compile-normal-call, byte-compile-check-variable)
(byte-compile-variable-ref, byte-compile-variable-set)
(byte-compile-subr-wrong-args, byte-compile-setq-default)
(byte-compile-negation-optimizer)
(byte-compile-condition-case--old)
(byte-compile-condition-case--new, byte-compile-save-excursion)
(byte-compile-defvar, byte-compile-autoload)
(byte-compile-lambda-form)
(byte-compile-make-variable-buffer-local, display-call-tree)
(batch-byte-compile):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use):
* lisp/emacs-lisp/chart.el (chart-space-usage):
* lisp/emacs-lisp/check-declare.el (check-declare-scan)
(check-declare-warn, check-declare-file)
(check-declare-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-message-text-engine):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer)
(cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl--generic-describe, cl-generic-generalizers):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody)
(cl-symbol-macrolet):
* lisp/emacs-lisp/cl.el (cl-unload-function, flet):
* lisp/emacs-lisp/copyright.el (copyright)
(copyright-update-directory):
* lisp/emacs-lisp/edebug.el (edebug-read-list):
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-core.el (eieio--slot-override)
(eieio-oref):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/eieio-speedbar.el:
(eieio-speedbar-child-make-tag-lines)
(eieio-speedbar-child-description):
* lisp/emacs-lisp/eieio.el (defclass, change-class):
* lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms)
(elint-init-form, elint-check-defalias-form)
(elint-check-let-form):
* lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol)
(find-function-library):
* lisp/emacs-lisp/generator.el (iter-yield):
* lisp/emacs-lisp/gv.el (gv-define-simple-setter):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring)
(advice--make, define-advice):
* lisp/emacs-lisp/package-x.el (package-upload-file):
* lisp/emacs-lisp/package.el (package-version-join)
(package-disabled-p, package-activate-1, package-activate)
(package--download-one-archive)
(package--download-and-read-archives)
(package-compute-transaction, package-install-from-archive)
(package-install, package-install-selected-packages)
(package-delete, package-autoremove, describe-package-1)
(package-install-button-action, package-delete-button-action)
(package-menu-hide-package, package-menu--list-to-prompt)
(package-menu--perform-transaction)
(package-menu--find-and-notify-upgrades):
* lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1):
* lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode):
* lisp/emacs-lisp/ring.el (ring-previous, ring-next):
* lisp/emacs-lisp/rx.el (rx-check, rx-anything)
(rx-check-any-string, rx-check-any, rx-check-not, rx-=)
(rx-repeat, rx-check-backref, rx-syntax, rx-check-category)
(rx-form):
* lisp/emacs-lisp/smie.el (smie-config-save):
* lisp/emacs-lisp/subr-x.el (internal--check-binding):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/testcover.el (testcover-1value):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments)
(viper-toggle-search-style, viper-kill-buffer)
(viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/env.el (setenv):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp)
(eshell-glob-entries):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (read-face-name, read-face-font, describe-face)
(x-resolve-font-name):
* lisp/files-x.el (modify-file-local-variable):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, hack-one-local-variable--obsolete)
(dir-locals-set-directory-class, write-file, basic-save-buffer)
(delete-directory, copy-directory, recover-session)
(recover-session-finish, insert-directory)
(file-modes-char-to-who, file-modes-symbolic-to-number)
(move-file-to-trash):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/finder.el (finder-commentary):
* lisp/font-lock.el (font-lock-fontify-buffer):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/frame.el (get-device-terminal, select-frame-by-name):
* lisp/fringe.el (fringe--check-style):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode)
(describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/ccl.el (ccl-dump):
* lisp/international/fontset.el (x-must-resolve-font-name):
* lisp/international/mule-cmds.el (prefer-coding-system)
(select-safe-coding-system-interactively)
(select-safe-coding-system, activate-input-method)
(toggle-input-method, describe-current-input-method)
(describe-language-environment):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/imap.el (imap-interactive-login):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/rlogin.el (rlogin):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/proced.el (proced-log):
* lisp/progmodes/ada-mode.el (ada-get-indent-case)
(ada-check-matching-start, ada-goto-matching-start):
* lisp/progmodes/ada-prj.el (ada-prj-display-page):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/ebrowse.el (ebrowse-tags-apropos):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-shell-get-process-or-error)
(python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate):
* lisp/recentf.el (recentf-open-files):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/server.el (server-get-auth-key):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, list-processes--refresh)
(compose-mail, set-variable, choose-completion-string)
(define-alternatives):
* lisp/startup.el (site-run-file, tty-handle-args, command-line)
(command-line-1):
* lisp/subr.el (noreturn, define-error, add-to-list)
(read-char-choice, version-to-list):
* lisp/term/common-win.el (x-handle-xrm-switch)
(x-handle-name-switch, x-handle-args):
* lisp/term/x-win.el (x-handle-parent-id, x-handle-smid):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/textmodes/two-column.el (2C-split):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
(wdired-do-perm-changes):
* lisp/whitespace.el (whitespace-report-region):
Prefer grave quoting in source-code strings used to generate help
and diagnostics.
* lisp/faces.el (face-documentation):
No need to convert quotes, since the result is a docstring.
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
Simplify by generating only curved quotes, since info files are
typically that ways nowadays anyway.
* lisp/international/mule-diag.el (list-input-methods):
Don’t assume text quoting style is curved.
* lisp/org/org-bibtex.el (org-bibtex-fields):
Revert my recent changes, going back to the old quoting style.
2015-09-07 08:41:44 -07:00
|
|
|
(instead (format-message "; use `%s' instead." instead))
|
More-conservative ‘format’ quote restyling
Instead of restyling curved quotes for every call to ‘format’,
create a new function ‘format-message’ that does the restyling,
and using the new function instead of ‘format’ only in contexts
where this seems appropriate.
Problem reported by Dmitry Gutov and Andreas Schwab in:
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00826.html
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00827.html
* doc/lispref/commands.texi (Using Interactive):
* doc/lispref/control.texi (Signaling Errors, Signaling Errors):
* doc/lispref/display.texi (Displaying Messages, Progress):
* doc/lispref/elisp.texi:
* doc/lispref/help.texi (Keys in Documentation):
* doc/lispref/minibuf.texi (Minibuffer Misc):
* doc/lispref/strings.texi (Formatting Strings):
* etc/NEWS:
Document the changes.
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/apropos.el (apropos-library):
* lisp/calc/calc-ext.el (calc-record-message)
(calc-user-function-list):
* lisp/calc/calc-help.el (calc-describe-key, calc-full-help):
* lisp/calc/calc-lang.el (math-read-big-balance):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--add-diary-entry):
* lisp/cedet/mode-local.el (mode-local-print-binding)
(mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-completion-message):
* lisp/cedet/semantic/edit.el (semantic-parse-changes-failed):
* lisp/cedet/semantic/wisent/comp.el (wisent-log):
* lisp/cedet/srecode/insert.el (srecode-insert-show-error-report):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dframe.el (dframe-message):
* lisp/dired-aux.el (dired-query):
* lisp/emacs-lisp/byte-opt.el (byte-compile-log-lap-1):
* lisp/emacs-lisp/bytecomp.el (byte-compile-log)
(byte-compile-log-file, byte-compile-warn, byte-compile-form):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use)
(cconv-analyze-form):
* lisp/emacs-lisp/check-declare.el (check-declare-warn):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/cl-macs.el (cl-symbol-macrolet):
* lisp/emacs-lisp/edebug.el (edebug-format):
* lisp/emacs-lisp/eieio-core.el (eieio-oref):
* lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message)
(eldoc-message):
* lisp/emacs-lisp/elint.el (elint-file, elint-log):
* lisp/emacs-lisp/find-func.el (find-function-library):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring):
* lisp/emacs-lisp/package.el (package-compute-transaction)
(package-install-button-action, package-delete-button-action)
(package-menu--list-to-prompt):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emacs-lisp/warnings.el (lwarn, warn):
* lisp/emulation/viper-cmd.el:
(viper-toggle-parse-sexp-ignore-comments)
(viper-kill-buffer, viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/facemenu.el (facemenu-add-new-face):
* lisp/faces.el (face-documentation, read-face-name)
(face-read-string, read-face-font, describe-face):
* lisp/files.el (find-alternate-file, hack-local-variables)
(hack-one-local-variable--obsolete, write-file)
(basic-save-buffer, delete-directory):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--obsolete)
(help-fns--interactive-only, describe-function-1)
(describe-variable):
* lisp/help.el (describe-mode):
* lisp/info-xref.el (info-xref-output):
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
* lisp/international/kkc.el (kkc-error):
* lisp/international/mule-cmds.el:
(select-safe-coding-system-interactively)
(select-safe-coding-system, describe-input-method):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/international/quail.el (quail-error):
* lisp/minibuffer.el (minibuffer-message):
* lisp/mpc.el (mpc--debug):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-message):
* lisp/net/gnutls.el (gnutls-message-maybe):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/nsm.el (nsm-query-user):
* lisp/net/rlogin.el (rlogin):
* lisp/net/soap-client.el (soap-warning):
* lisp/net/tramp.el (tramp-debug-message):
* lisp/nxml/nxml-outln.el (nxml-report-outline-error):
* lisp/nxml/nxml-parse.el (nxml-parse-error):
* lisp/nxml/rng-cmpct.el (rng-c-error):
* lisp/nxml/rng-match.el (rng-compile-error):
* lisp/nxml/rng-uri.el (rng-uri-error):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/org/org-ctags.el:
(org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/proced.el (proced-log):
* lisp/progmodes/ebnf2ps.el (ebnf-log):
* lisp/progmodes/flymake.el (flymake-log):
* lisp/progmodes/vhdl-mode.el (vhdl-warning-when-idle):
* lisp/replace.el (occur-1):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, define-alternatives):
* lisp/startup.el (command-line):
* lisp/subr.el (error, user-error, add-to-list):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* src/callint.c (Fcall_interactively):
* src/editfns.c (Fmessage, Fmessage_box):
Restyle the quotes of format strings intended for use as a
diagnostic, when restyling seems appropriate.
* lisp/subr.el (format-message): New function.
* src/doc.c (Finternal__text_restyle): New function.
(syms_of_doc): Define it.
2015-08-23 22:38:02 -07:00
|
|
|
(t ".")))))
|
2012-09-19 09:09:43 -07:00
|
|
|
|
2014-10-31 17:35:35 -04:00
|
|
|
(defun macroexpand-1 (form &optional environment)
|
|
|
|
"Perform (at most) one step of macroexpansion."
|
|
|
|
(cond
|
|
|
|
((consp form)
|
|
|
|
(let* ((head (car form))
|
|
|
|
(env-expander (assq head environment)))
|
|
|
|
(if env-expander
|
|
|
|
(if (cdr env-expander)
|
|
|
|
(apply (cdr env-expander) (cdr form))
|
|
|
|
form)
|
|
|
|
(if (not (and (symbolp head) (fboundp head)))
|
|
|
|
form
|
|
|
|
(let ((def (autoload-do-load (symbol-function head) head 'macro)))
|
|
|
|
(cond
|
|
|
|
;; Follow alias, but only for macros, otherwise we may end up
|
|
|
|
;; skipping an important compiler-macro (e.g. cl--block-wrapper).
|
|
|
|
((and (symbolp def) (macrop def)) (cons def (cdr form)))
|
|
|
|
((not (consp def)) form)
|
|
|
|
(t
|
|
|
|
(if (eq 'macro (car def))
|
|
|
|
(apply (cdr def) (cdr form))
|
|
|
|
form))))))))
|
|
|
|
(t form)))
|
|
|
|
|
2015-01-20 15:40:29 -05:00
|
|
|
(defun macroexp-macroexpand (form env)
|
|
|
|
"Like `macroexpand' but checking obsolescence."
|
2021-01-23 16:04:36 -05:00
|
|
|
(let* ((macroexpand-all-environment env)
|
|
|
|
(new-form
|
|
|
|
(macroexpand form env)))
|
2015-01-20 15:40:29 -05:00
|
|
|
(if (and (not (eq form new-form)) ;It was a macro call.
|
|
|
|
(car-safe form)
|
|
|
|
(symbolp (car form))
|
2021-07-21 11:11:50 -04:00
|
|
|
(get (car form) 'byte-obsolete-info))
|
2015-01-20 15:40:29 -05:00
|
|
|
(let* ((fun (car form))
|
|
|
|
(obsolete (get fun 'byte-obsolete-info)))
|
2021-02-26 20:24:52 -05:00
|
|
|
(macroexp-warn-and-return
|
2015-01-20 15:40:29 -05:00
|
|
|
(macroexp--obsolete-warning
|
|
|
|
fun obsolete
|
|
|
|
(if (symbolp (symbol-function fun))
|
|
|
|
"alias" "macro"))
|
2022-02-19 14:20:02 -05:00
|
|
|
new-form (list 'obsolete fun) nil fun))
|
2015-01-20 15:40:29 -05:00
|
|
|
new-form)))
|
|
|
|
|
2021-02-09 12:02:25 -05:00
|
|
|
(defun macroexp--unfold-lambda (form &optional name)
|
|
|
|
;; In lexical-binding mode, let and functions don't bind vars in the same way
|
|
|
|
;; (let obey special-variable-p, but functions don't). But luckily, this
|
|
|
|
;; doesn't matter here, because function's behavior is underspecified so it
|
|
|
|
;; can safely be turned into a `let', even though the reverse is not true.
|
|
|
|
(or name (setq name "anonymous lambda"))
|
|
|
|
(let* ((lambda (car form))
|
|
|
|
(values (cdr form))
|
|
|
|
(arglist (nth 1 lambda))
|
|
|
|
(body (cdr (cdr lambda)))
|
|
|
|
optionalp restp
|
|
|
|
bindings)
|
|
|
|
(if (and (stringp (car body)) (cdr body))
|
|
|
|
(setq body (cdr body)))
|
|
|
|
(if (and (consp (car body)) (eq 'interactive (car (car body))))
|
|
|
|
(setq body (cdr body)))
|
|
|
|
;; FIXME: The checks below do not belong in an optimization phase.
|
|
|
|
(while arglist
|
|
|
|
(cond ((eq (car arglist) '&optional)
|
|
|
|
;; ok, I'll let this slide because funcall_lambda() does...
|
2021-09-14 07:55:56 +02:00
|
|
|
;; (if optionalp (error "Multiple &optional keywords in %s" name))
|
2021-02-09 12:02:25 -05:00
|
|
|
(if restp (error "&optional found after &rest in %s" name))
|
|
|
|
(if (null (cdr arglist))
|
2021-09-14 07:55:56 +02:00
|
|
|
(error "Nothing after &optional in %s" name))
|
2021-02-09 12:02:25 -05:00
|
|
|
(setq optionalp t))
|
|
|
|
((eq (car arglist) '&rest)
|
|
|
|
;; ...but it is by no stretch of the imagination a reasonable
|
|
|
|
;; thing that funcall_lambda() allows (&rest x y) and
|
|
|
|
;; (&rest x &optional y) in arglists.
|
|
|
|
(if (null (cdr arglist))
|
2021-09-14 07:55:56 +02:00
|
|
|
(error "Nothing after &rest in %s" name))
|
2021-02-09 12:02:25 -05:00
|
|
|
(if (cdr (cdr arglist))
|
2021-09-14 07:55:56 +02:00
|
|
|
(error "Multiple vars after &rest in %s" name))
|
2021-02-09 12:02:25 -05:00
|
|
|
(setq restp t))
|
|
|
|
(restp
|
|
|
|
(setq bindings (cons (list (car arglist)
|
|
|
|
(and values (cons 'list values)))
|
|
|
|
bindings)
|
|
|
|
values nil))
|
|
|
|
((and (not optionalp) (null values))
|
|
|
|
(setq arglist nil values 'too-few))
|
|
|
|
(t
|
|
|
|
(setq bindings (cons (list (car arglist) (car values))
|
|
|
|
bindings)
|
|
|
|
values (cdr values))))
|
|
|
|
(setq arglist (cdr arglist)))
|
|
|
|
(if values
|
2021-02-26 20:24:52 -05:00
|
|
|
(macroexp-warn-and-return
|
2021-02-09 12:02:25 -05:00
|
|
|
(format (if (eq values 'too-few)
|
|
|
|
"attempt to open-code `%s' with too few arguments"
|
|
|
|
"attempt to open-code `%s' with too many arguments")
|
|
|
|
name)
|
2022-02-19 14:20:02 -05:00
|
|
|
form nil nil arglist)
|
2021-02-09 12:02:25 -05:00
|
|
|
|
|
|
|
;; The following leads to infinite recursion when loading a
|
|
|
|
;; file containing `(defsubst f () (f))', and then trying to
|
|
|
|
;; byte-compile that file.
|
|
|
|
;;(setq body (mapcar 'byte-optimize-form body)))
|
|
|
|
|
|
|
|
(if bindings
|
|
|
|
`(let ,(nreverse bindings) . ,body)
|
|
|
|
(macroexp-progn body)))))
|
|
|
|
|
2021-12-11 21:39:19 +01:00
|
|
|
(defun macroexp--dynamic-variable-p (var)
|
|
|
|
"Whether the variable VAR is dynamically scoped.
|
|
|
|
Only valid during macro-expansion."
|
|
|
|
(defvar byte-compile-bound-variables)
|
|
|
|
(or (not lexical-binding)
|
|
|
|
(special-variable-p var)
|
|
|
|
(memq var macroexp--dynvars)
|
|
|
|
(and (boundp 'byte-compile-bound-variables)
|
|
|
|
(memq var byte-compile-bound-variables))))
|
|
|
|
|
2012-06-06 14:08:00 -04:00
|
|
|
(defun macroexp--expand-all (form)
|
2004-02-10 01:52:31 +00:00
|
|
|
"Expand all macros in FORM.
|
|
|
|
This is an internal version of `macroexpand-all'.
|
|
|
|
Assumes the caller has bound `macroexpand-all-environment'."
|
2022-01-14 19:06:04 +00:00
|
|
|
(push form byte-compile-form-stack)
|
|
|
|
(prog1
|
|
|
|
(if (eq (car-safe form) 'backquote-list*)
|
|
|
|
;; Special-case `backquote-list*', as it is normally a macro that
|
|
|
|
;; generates exceedingly deep expansions from relatively shallow input
|
|
|
|
;; forms. We just process it `in reverse' -- first we expand all the
|
|
|
|
;; arguments, _then_ we expand the top-level definition.
|
|
|
|
(macroexpand (macroexp--all-forms form 1)
|
|
|
|
macroexpand-all-environment)
|
|
|
|
;; Normal form; get its expansion, and then expand arguments.
|
|
|
|
(setq form (macroexp-macroexpand form macroexpand-all-environment))
|
|
|
|
;; FIXME: It'd be nice to use `byte-optimize--pcase' here, but when
|
|
|
|
;; I tried it, it broke the bootstrap :-(
|
Byte compiler: Prevent special forms' symbols being replaced by bare symbols
These are symbols with position from source code, which should not be replaced
by bare symbols in, e.g., optimization functions.
* lisp/Makefile.in: (BYTE_COMPILE_FLAGS, compile-first case): Set
max-specpdl-size to 5000 for the benefit of lisp/emacs-lisp/comp.el.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker)
(byte-optimize--rename-var, byte-optimize-if, byte-optimize-letX)
* lisp/emacs-lisp/bytecomp.el (byte-compile-recurse-toplevel)
(byte-compile-lambda)
* lisp/emacs-lisp/cconv.el (cconv-convert)
* lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Preserve, e.g., (car
form) in the byte compiler, when this form's car is a symbol with position of
a special form, rather than replacing the symbol with a bare symbol, e.g.
'cond.
2022-04-22 19:11:31 +00:00
|
|
|
(let ((fn (car-safe form)))
|
|
|
|
(pcase form
|
|
|
|
(`(cond . ,clauses)
|
|
|
|
(macroexp--cons fn (macroexp--all-clauses clauses) form))
|
|
|
|
(`(condition-case . ,(or `(,err ,body . ,handlers) pcase--dontcare))
|
2022-01-14 19:06:04 +00:00
|
|
|
(macroexp--cons
|
Byte compiler: Prevent special forms' symbols being replaced by bare symbols
These are symbols with position from source code, which should not be replaced
by bare symbols in, e.g., optimization functions.
* lisp/Makefile.in: (BYTE_COMPILE_FLAGS, compile-first case): Set
max-specpdl-size to 5000 for the benefit of lisp/emacs-lisp/comp.el.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker)
(byte-optimize--rename-var, byte-optimize-if, byte-optimize-letX)
* lisp/emacs-lisp/bytecomp.el (byte-compile-recurse-toplevel)
(byte-compile-lambda)
* lisp/emacs-lisp/cconv.el (cconv-convert)
* lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Preserve, e.g., (car
form) in the byte compiler, when this form's car is a symbol with position of
a special form, rather than replacing the symbol with a bare symbol, e.g.
'cond.
2022-04-22 19:11:31 +00:00
|
|
|
fn
|
|
|
|
(macroexp--cons err
|
|
|
|
(macroexp--cons (macroexp--expand-all body)
|
|
|
|
(macroexp--all-clauses handlers 1)
|
|
|
|
(cddr form))
|
|
|
|
(cdr form))
|
|
|
|
form))
|
|
|
|
(`(,(or 'defvar 'defconst) ,(and name (pred symbolp)) . ,_)
|
|
|
|
(push name macroexp--dynvars)
|
|
|
|
(macroexp--all-forms form 2))
|
|
|
|
(`(function ,(and f `(lambda . ,_)))
|
|
|
|
(let ((macroexp--dynvars macroexp--dynvars))
|
|
|
|
(macroexp--cons fn
|
|
|
|
(macroexp--cons (macroexp--all-forms f 2)
|
|
|
|
nil
|
|
|
|
(cdr form))
|
|
|
|
form)))
|
|
|
|
(`(,(or 'function 'quote) . ,_) form)
|
|
|
|
(`(,(and fun (or 'let 'let*)) . ,(or `(,bindings . ,body)
|
|
|
|
pcase--dontcare))
|
|
|
|
(let ((macroexp--dynvars macroexp--dynvars))
|
|
|
|
(macroexp--cons
|
|
|
|
fun
|
|
|
|
(macroexp--cons
|
|
|
|
(macroexp--all-clauses bindings 1)
|
|
|
|
(if (null body)
|
|
|
|
(macroexp-unprogn
|
|
|
|
(macroexp-warn-and-return
|
|
|
|
(format "Empty %s body" fun)
|
|
|
|
nil nil 'compile-only fun))
|
|
|
|
(macroexp--all-forms body))
|
|
|
|
(cdr form))
|
|
|
|
form)))
|
2022-06-03 20:31:10 +02:00
|
|
|
(`(setq ,(and var (pred symbolp)
|
|
|
|
(pred (not booleanp)) (pred (not keywordp)))
|
|
|
|
,expr)
|
|
|
|
;; Fast path for the setq common case.
|
|
|
|
(let ((new-expr (macroexp--expand-all expr)))
|
|
|
|
(if (eq new-expr expr)
|
|
|
|
form
|
|
|
|
`(,fn ,var ,new-expr))))
|
|
|
|
(`(setq . ,args)
|
|
|
|
;; Normalise to a sequence of (setq SYM EXPR).
|
|
|
|
;; Malformed code is translated to code that signals an error
|
|
|
|
;; at run time.
|
|
|
|
(let ((nargs (length args)))
|
|
|
|
(if (/= (logand nargs 1) 0)
|
|
|
|
(macroexp-warn-and-return
|
|
|
|
"odd number of arguments in `setq' form"
|
|
|
|
`(signal 'wrong-number-of-arguments '(setq ,nargs))
|
|
|
|
nil 'compile-only fn)
|
|
|
|
(let ((assignments nil))
|
|
|
|
(while (consp (cdr-safe args))
|
|
|
|
(let* ((var (car args))
|
|
|
|
(expr (cadr args))
|
|
|
|
(new-expr (macroexp--expand-all expr))
|
|
|
|
(assignment
|
|
|
|
(if (and (symbolp var)
|
|
|
|
(not (booleanp var)) (not (keywordp var)))
|
|
|
|
`(,fn ,var ,new-expr)
|
|
|
|
(macroexp-warn-and-return
|
|
|
|
(format-message "attempt to set %s `%s'"
|
|
|
|
(if (symbolp var)
|
|
|
|
"constant"
|
|
|
|
"non-variable")
|
|
|
|
var)
|
|
|
|
(cond
|
|
|
|
((keywordp var)
|
|
|
|
;; Accept `(setq :a :a)' for compatibility.
|
|
|
|
`(if (eq ,var ,new-expr)
|
|
|
|
,var
|
|
|
|
(signal 'setting-constant (list ',var))))
|
|
|
|
((symbolp var)
|
|
|
|
`(signal 'setting-constant (list ',var)))
|
|
|
|
(t
|
|
|
|
`(signal 'wrong-type-argument
|
|
|
|
(list 'symbolp ',var))))
|
|
|
|
nil 'compile-only var))))
|
|
|
|
(push assignment assignments))
|
|
|
|
(setq args (cddr args)))
|
|
|
|
(cons 'progn (nreverse assignments))))))
|
Byte compiler: Prevent special forms' symbols being replaced by bare symbols
These are symbols with position from source code, which should not be replaced
by bare symbols in, e.g., optimization functions.
* lisp/Makefile.in: (BYTE_COMPILE_FLAGS, compile-first case): Set
max-specpdl-size to 5000 for the benefit of lisp/emacs-lisp/comp.el.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker)
(byte-optimize--rename-var, byte-optimize-if, byte-optimize-letX)
* lisp/emacs-lisp/bytecomp.el (byte-compile-recurse-toplevel)
(byte-compile-lambda)
* lisp/emacs-lisp/cconv.el (cconv-convert)
* lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Preserve, e.g., (car
form) in the byte compiler, when this form's car is a symbol with position of
a special form, rather than replacing the symbol with a bare symbol, e.g.
'cond.
2022-04-22 19:11:31 +00:00
|
|
|
(`(,(and fun `(lambda . ,_)) . ,args)
|
|
|
|
;; Embedded lambda in function position.
|
|
|
|
;; If the byte-optimizer is loaded, try to unfold this,
|
|
|
|
;; i.e. rewrite it to (let (<args>) <body>). We'd do it in the optimizer
|
|
|
|
;; anyway, but doing it here (i.e. earlier) can sometimes avoid the
|
|
|
|
;; creation of a closure, thus resulting in much better code.
|
|
|
|
(let ((newform (macroexp--unfold-lambda form)))
|
|
|
|
(if (eq newform form)
|
|
|
|
;; Unfolding failed for some reason, avoid infinite recursion.
|
|
|
|
(macroexp--cons (macroexp--all-forms fun 2)
|
|
|
|
(macroexp--all-forms args)
|
|
|
|
form)
|
|
|
|
(macroexp--expand-all newform))))
|
|
|
|
(`(funcall ,exp . ,args)
|
|
|
|
(let ((eexp (macroexp--expand-all exp))
|
|
|
|
(eargs (macroexp--all-forms args)))
|
|
|
|
;; Rewrite (funcall #'foo bar) to (foo bar), in case `foo'
|
|
|
|
;; has a compiler-macro, or to unfold it.
|
|
|
|
(pcase eexp
|
|
|
|
((and `#',f
|
|
|
|
(guard (not (or (special-form-p f) (macrop f))))) ;; bug#46636
|
|
|
|
(macroexp--expand-all `(,f . ,eargs)))
|
|
|
|
(_ `(funcall ,eexp . ,eargs)))))
|
|
|
|
(`(funcall . ,_) form) ;bug#53227
|
|
|
|
(`(,func . ,_)
|
|
|
|
(let ((handler (function-get func 'compiler-macro))
|
|
|
|
(funargs (function-get func 'funarg-positions)))
|
|
|
|
;; Check functions quoted with ' rather than with #'
|
|
|
|
(dolist (funarg funargs)
|
|
|
|
(let ((arg (nth funarg form)))
|
|
|
|
(when (and (eq 'quote (car-safe arg))
|
|
|
|
(eq 'lambda (car-safe (cadr arg))))
|
|
|
|
(setcar (nthcdr funarg form)
|
|
|
|
(macroexp-warn-and-return
|
|
|
|
(format "%S quoted with ' rather than with #'"
|
|
|
|
(let ((f (cadr arg)))
|
|
|
|
(if (symbolp f) f `(lambda ,(nth 1 f) ...))))
|
|
|
|
arg nil nil (cadr arg))))))
|
|
|
|
;; Macro expand compiler macros. This cannot be delayed to
|
|
|
|
;; byte-optimize-form because the output of the compiler-macro can
|
|
|
|
;; use macros.
|
|
|
|
(if (null handler)
|
|
|
|
;; No compiler macro. We just expand each argument (for
|
|
|
|
;; setq/setq-default this works alright because the variable names
|
|
|
|
;; are symbols).
|
|
|
|
(macroexp--all-forms form 1)
|
|
|
|
;; If the handler is not loaded yet, try (auto)loading the
|
|
|
|
;; function itself, which may in turn load the handler.
|
|
|
|
(unless (functionp handler)
|
|
|
|
(with-demoted-errors "macroexp--expand-all: %S"
|
|
|
|
(autoload-do-load (indirect-function func) func)))
|
|
|
|
(let ((newform (macroexp--compiler-macro handler form)))
|
|
|
|
(if (eq form newform)
|
|
|
|
;; The compiler macro did not find anything to do.
|
|
|
|
(if (equal form (setq newform (macroexp--all-forms form 1)))
|
|
|
|
form
|
|
|
|
;; Maybe after processing the args, some new opportunities
|
|
|
|
;; appeared, so let's try the compiler macro again.
|
|
|
|
(setq form (macroexp--compiler-macro handler newform))
|
|
|
|
(if (eq newform form)
|
|
|
|
newform
|
|
|
|
(macroexp--expand-all newform)))
|
|
|
|
(macroexp--expand-all newform))))))
|
|
|
|
(_ form))))
|
2022-01-14 19:06:04 +00:00
|
|
|
(pop byte-compile-form-stack)))
|
2004-02-10 01:52:31 +00:00
|
|
|
|
2021-02-27 20:22:58 -05:00
|
|
|
;; Record which arguments expect functions, so we can warn when those
|
|
|
|
;; are accidentally quoted with ' rather than with #'
|
2021-04-11 23:47:14 -04:00
|
|
|
(dolist (f '( funcall apply mapcar mapatoms mapconcat mapc cl-mapcar maphash
|
|
|
|
map-char-table map-keymap map-keymap-internal))
|
2021-02-27 20:22:58 -05:00
|
|
|
(put f 'funarg-positions '(1)))
|
|
|
|
(dolist (f '( add-hook remove-hook advice-remove advice--remove-function
|
|
|
|
defalias fset global-set-key run-after-idle-timeout
|
|
|
|
set-process-filter set-process-sentinel sort))
|
|
|
|
(put f 'funarg-positions '(2)))
|
|
|
|
(dolist (f '( advice-add define-key
|
|
|
|
run-at-time run-with-idle-timer run-with-timer ))
|
|
|
|
(put f 'funarg-positions '(3)))
|
|
|
|
|
2004-02-10 01:52:31 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun macroexpand-all (form &optional environment)
|
|
|
|
"Return result of expanding macros at all levels in FORM.
|
|
|
|
If no macros are expanded, FORM is returned unchanged.
|
|
|
|
The second optional arg ENVIRONMENT specifies an environment of macro
|
|
|
|
definitions to shadow the loaded ones for use in file byte-compilation."
|
2021-12-11 21:39:19 +01:00
|
|
|
(let ((macroexpand-all-environment environment)
|
|
|
|
(macroexp--dynvars macroexp--dynvars))
|
|
|
|
(macroexp--expand-all form)))
|
|
|
|
|
|
|
|
;; This function is like `macroexpand-all' but for use with top-level
|
|
|
|
;; forms. It does not dynbind `macroexp--dynvars' because we want
|
|
|
|
;; top-level `defvar' declarations to be recorded in that variable.
|
|
|
|
(defun macroexpand--all-toplevel (form &optional environment)
|
2004-02-10 01:52:31 +00:00
|
|
|
(let ((macroexpand-all-environment environment))
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--expand-all form)))
|
2004-02-10 01:52:31 +00:00
|
|
|
|
2012-06-07 15:25:48 -04:00
|
|
|
;;; Handy functions to use in macros.
|
|
|
|
|
2015-02-22 23:50:03 -05:00
|
|
|
(defun macroexp-parse-body (body)
|
|
|
|
"Parse a function BODY into (DECLARATIONS . EXPS)."
|
|
|
|
(let ((decls ()))
|
|
|
|
(while (and (cdr body)
|
|
|
|
(let ((e (car body)))
|
|
|
|
(or (stringp e)
|
|
|
|
(memq (car-safe e)
|
|
|
|
'(:documentation declare interactive cl-declare)))))
|
|
|
|
(push (pop body) decls))
|
|
|
|
(cons (nreverse decls) body)))
|
2015-02-09 10:05:44 +08:00
|
|
|
|
2012-06-07 15:25:48 -04:00
|
|
|
(defun macroexp-progn (exps)
|
2019-08-03 13:47:40 +02:00
|
|
|
"Return EXPS (a list of expressions) with `progn' prepended.
|
|
|
|
If EXPS is a list with a single expression, `progn' is not
|
|
|
|
prepended, but that expression is returned instead."
|
2012-06-07 15:25:48 -04:00
|
|
|
(if (cdr exps) `(progn ,@exps) (car exps)))
|
|
|
|
|
2012-06-07 22:54:35 -04:00
|
|
|
(defun macroexp-unprogn (exp)
|
2015-10-28 13:59:42 -04:00
|
|
|
"Turn EXP into a list of expressions to execute in sequence.
|
|
|
|
Never returns an empty list."
|
|
|
|
(if (eq (car-safe exp) 'progn) (or (cdr exp) '(nil)) (list exp)))
|
2012-06-07 22:54:35 -04:00
|
|
|
|
2012-06-07 15:25:48 -04:00
|
|
|
(defun macroexp-let* (bindings exp)
|
2019-08-02 23:11:28 +02:00
|
|
|
"Return an expression equivalent to \\=`(let* ,BINDINGS ,EXP)."
|
2012-06-07 15:25:48 -04:00
|
|
|
(cond
|
|
|
|
((null bindings) exp)
|
|
|
|
((eq 'let* (car-safe exp)) `(let* (,@bindings ,@(cadr exp)) ,@(cddr exp)))
|
|
|
|
(t `(let* ,bindings ,exp))))
|
|
|
|
|
|
|
|
(defun macroexp-if (test then else)
|
2018-04-01 23:33:16 +02:00
|
|
|
"Return an expression equivalent to \\=`(if ,TEST ,THEN ,ELSE)."
|
2012-06-07 15:25:48 -04:00
|
|
|
(cond
|
|
|
|
((eq (car-safe else) 'if)
|
2015-10-28 13:59:42 -04:00
|
|
|
(cond
|
|
|
|
;; Drop this optimization: It's unsafe (it assumes that `test' is
|
|
|
|
;; pure, or at least idempotent), and it's not used even a single
|
|
|
|
;; time while compiling Emacs's sources.
|
|
|
|
;;((equal test (nth 1 else))
|
|
|
|
;; ;; Doing a test a second time: get rid of the redundancy.
|
|
|
|
;; (message "macroexp-if: sharing 'test' %S" test)
|
|
|
|
;; `(if ,test ,then ,@(nthcdr 3 else)))
|
|
|
|
((equal then (nth 2 else))
|
|
|
|
;; (message "macroexp-if: sharing 'then' %S" then)
|
|
|
|
`(if (or ,test ,(nth 1 else)) ,then ,@(nthcdr 3 else)))
|
|
|
|
((equal (macroexp-unprogn then) (nthcdr 3 else))
|
|
|
|
;; (message "macroexp-if: sharing 'then' with not %S" then)
|
|
|
|
`(if (or ,test (not ,(nth 1 else)))
|
|
|
|
,then ,@(macroexp-unprogn (nth 2 else))))
|
|
|
|
(t
|
|
|
|
`(cond (,test ,@(macroexp-unprogn then))
|
|
|
|
(,(nth 1 else) ,@(macroexp-unprogn (nth 2 else)))
|
2021-01-27 18:53:58 -05:00
|
|
|
,@(let ((def (nthcdr 3 else))) (if def `((t ,@def))))))))
|
2012-06-07 15:25:48 -04:00
|
|
|
((eq (car-safe else) 'cond)
|
2015-10-28 13:59:42 -04:00
|
|
|
`(cond (,test ,@(macroexp-unprogn then)) ,@(cdr else)))
|
2012-06-07 15:25:48 -04:00
|
|
|
;; Invert the test if that lets us reduce the depth of the tree.
|
|
|
|
((memq (car-safe then) '(if cond)) (macroexp-if `(not ,test) else then))
|
2021-01-27 17:35:28 -05:00
|
|
|
(t `(if ,test ,then ,@(if else (macroexp-unprogn else))))))
|
2012-06-07 15:25:48 -04:00
|
|
|
|
2015-06-27 08:34:44 -07:00
|
|
|
(defmacro macroexp-let2 (test sym exp &rest body)
|
|
|
|
"Evaluate BODY with SYM bound to an expression for EXP's value.
|
|
|
|
The intended usage is that BODY generates an expression that
|
|
|
|
will refer to EXP's value multiple times, but will evaluate
|
|
|
|
EXP only once. As BODY generates that expression, it should
|
|
|
|
use SYM to stand for the value of EXP.
|
|
|
|
|
|
|
|
If EXP is a simple, safe expression, then SYM's value is EXP itself.
|
|
|
|
Otherwise, SYM's value is a symbol which holds the value produced by
|
|
|
|
evaluating EXP. The return value incorporates the value of BODY, plus
|
|
|
|
additional code to evaluate EXP once and save the result so SYM can
|
|
|
|
refer to it.
|
|
|
|
|
|
|
|
If BODY consists of multiple forms, they are all evaluated
|
|
|
|
but only the last one's value matters.
|
|
|
|
|
|
|
|
TEST is a predicate to determine whether EXP qualifies as simple and
|
|
|
|
safe; if TEST is nil, only constant expressions qualify.
|
|
|
|
|
|
|
|
Example:
|
|
|
|
(macroexp-let2 nil foo EXP
|
|
|
|
\\=`(* ,foo ,foo))
|
|
|
|
generates an expression that evaluates EXP once,
|
|
|
|
then returns the square of that value.
|
|
|
|
You could do this with
|
|
|
|
(let ((foovar EXP))
|
|
|
|
(* foovar foovar))
|
|
|
|
but using `macroexp-let2' produces more efficient code in
|
|
|
|
cases where EXP is a constant."
|
2012-06-23 11:38:23 -04:00
|
|
|
(declare (indent 3) (debug (sexp sexp form body)))
|
2012-06-07 15:25:48 -04:00
|
|
|
(let ((bodysym (make-symbol "body"))
|
|
|
|
(expsym (make-symbol "exp")))
|
|
|
|
`(let* ((,expsym ,exp)
|
2015-06-27 08:34:44 -07:00
|
|
|
(,sym (if (funcall #',(or test #'macroexp-const-p) ,expsym)
|
|
|
|
,expsym (make-symbol ,(symbol-name sym))))
|
|
|
|
(,bodysym ,(macroexp-progn body)))
|
|
|
|
(if (eq ,sym ,expsym) ,bodysym
|
|
|
|
(macroexp-let* (list (list ,sym ,expsym))
|
2012-06-07 15:25:48 -04:00
|
|
|
,bodysym)))))
|
|
|
|
|
2014-11-24 22:57:53 +08:00
|
|
|
(defmacro macroexp-let2* (test bindings &rest body)
|
2019-08-04 14:43:43 +02:00
|
|
|
"Multiple binding version of `macroexp-let2'.
|
|
|
|
|
2022-04-11 15:10:51 -04:00
|
|
|
BINDINGS is a list of elements of the form (SYM EXP) or just SYM,
|
|
|
|
which then stands for (SYM SYM).
|
|
|
|
Each EXP can refer to symbols specified earlier in the binding list.
|
|
|
|
|
|
|
|
TEST has to be a symbol, and if it is nil it can be omitted."
|
2014-11-24 22:57:53 +08:00
|
|
|
(declare (indent 2) (debug (sexp (&rest (sexp form)) body)))
|
2022-04-11 15:10:51 -04:00
|
|
|
(when (consp test) ;; `test' was omitted.
|
|
|
|
(push bindings body)
|
|
|
|
(setq bindings test)
|
|
|
|
(setq test nil))
|
2014-11-24 22:57:53 +08:00
|
|
|
(pcase-exhaustive bindings
|
2018-11-05 01:22:15 +01:00
|
|
|
('nil (macroexp-progn body))
|
2022-04-11 15:10:51 -04:00
|
|
|
(`(,(or `(,var ,exp) (and (pred symbolp) var (let exp var)))
|
|
|
|
. ,tl)
|
2014-11-24 22:57:53 +08:00
|
|
|
`(macroexp-let2 ,test ,var ,exp
|
|
|
|
(macroexp-let2* ,test ,tl ,@body)))))
|
|
|
|
|
Provide generalized variables in core Elisp.
* lisp/emacs-lisp/gv.el: New file.
* lisp/subr.el (push, pop): Extend to generalized variables.
* lisp/loadup.el (macroexp): Unload if preloaded and uncompiled.
* lisp/emacs-lisp/cl-lib.el (cl-pop, cl-push, cl--set-nthcdr): Remove.
* lisp/emacs-lisp/cl-macs.el: Require gv. Use gv-define-setter,
gv-define-simple-setter, and gv-define-expander.
Remove setf-methods defined in gv. Rename cl-setf -> setf.
(cl-setf, cl-do-pop, cl-get-setf-method): Remove.
(cl-letf, cl-letf*, cl-define-modify-macro, cl-defsetf)
(cl-define-setf-expander, cl-struct-setf-expander): Move to cl.el.
(cl-remf, cl-shiftf, cl-rotatef, cl-callf, cl-callf2): Rewrite with
gv-letplace.
(cl-defstruct): Don't define setf-method any more.
* lisp/emacs-lisp/cl.el (flet): Don't autoload.
(cl--letf, letf, cl--letf*, letf*, cl--gv-adapt)
(define-setf-expander, defsetf, define-modify-macro)
(cl-struct-setf-expander): Move from cl-lib.el.
* lisp/emacs-lisp/syntax.el:
* lisp/emacs-lisp/ewoc.el:
* lisp/emacs-lisp/smie.el:
* lisp/emacs-lisp/cconv.el:
* lisp/emacs-lisp/timer.el: Rename cl-setf -> setf, cl-push -> push.
(timer--time): Use gv-define-simple-setter.
* lisp/emacs-lisp/macroexp.el (macroexp-let2): Rename from macroexp-let²
to avoid coding-system problems in subr.el. Adjust all users.
(macroexp--maxsize, macroexp-small-p): New functions.
* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Don't use cl-letf.
* lisp/scroll-bar.el (scroll-bar-mode):
* lisp/simple.el (auto-fill-mode, overwrite-mode, binary-overwrite-mode)
(normal-erase-is-backspace-mode): Don't use the `eq' place.
* lisp/winner.el (winner-configuration, winner-make-point-alist)
(winner-set-conf, winner-get-point, winner-set): Don't abuse letf.
* lisp/files.el (locate-file-completion-table): Avoid list*.
Fixes: debbugs:11657
2012-06-22 09:42:38 -04:00
|
|
|
(defun macroexp--maxsize (exp size)
|
|
|
|
(cond ((< size 0) size)
|
|
|
|
((symbolp exp) (1- size))
|
|
|
|
((stringp exp) (- size (/ (length exp) 16)))
|
|
|
|
((vectorp exp)
|
|
|
|
(dotimes (i (length exp))
|
|
|
|
(setq size (macroexp--maxsize (aref exp i) size)))
|
|
|
|
(1- size))
|
|
|
|
((consp exp)
|
|
|
|
;; We could try to be more clever with quote&function,
|
|
|
|
;; but it is difficult to do so correctly, and it's not obvious that
|
|
|
|
;; it would be worth the effort.
|
|
|
|
(dolist (e exp)
|
|
|
|
(setq size (macroexp--maxsize e size)))
|
|
|
|
(1- size))
|
|
|
|
(t -1)))
|
|
|
|
|
|
|
|
(defun macroexp-small-p (exp)
|
|
|
|
"Return non-nil if EXP can be considered small."
|
|
|
|
(> (macroexp--maxsize exp 10) 0))
|
|
|
|
|
2012-06-07 15:25:48 -04:00
|
|
|
(defsubst macroexp--const-symbol-p (symbol &optional any-value)
|
|
|
|
"Non-nil if SYMBOL is constant.
|
|
|
|
If ANY-VALUE is nil, only return non-nil if the value of the symbol is the
|
|
|
|
symbol itself."
|
|
|
|
(or (memq symbol '(nil t))
|
|
|
|
(keywordp symbol)
|
|
|
|
(if any-value
|
|
|
|
(or (memq symbol byte-compile-const-variables)
|
|
|
|
;; FIXME: We should provide a less intrusive way to find out
|
|
|
|
;; if a variable is "constant".
|
|
|
|
(and (boundp symbol)
|
|
|
|
(condition-case nil
|
|
|
|
(progn (set symbol (symbol-value symbol)) nil)
|
|
|
|
(setting-constant t)))))))
|
|
|
|
|
|
|
|
(defun macroexp-const-p (exp)
|
|
|
|
"Return non-nil if EXP will always evaluate to the same value."
|
|
|
|
(cond ((consp exp) (or (eq (car exp) 'quote)
|
|
|
|
(and (eq (car exp) 'function)
|
|
|
|
(symbolp (cadr exp)))))
|
|
|
|
;; It would sometimes make sense to pass `any-value', but it's not
|
|
|
|
;; always safe since a "constant" variable may not actually always have
|
|
|
|
;; the same value.
|
|
|
|
((symbolp exp) (macroexp--const-symbol-p exp))
|
|
|
|
(t t)))
|
|
|
|
|
|
|
|
(defun macroexp-copyable-p (exp)
|
|
|
|
"Return non-nil if EXP can be copied without extra cost."
|
|
|
|
(or (symbolp exp) (macroexp-const-p exp)))
|
|
|
|
|
2014-10-25 01:02:25 +02:00
|
|
|
(defun macroexp-quote (v)
|
2014-11-02 01:46:04 -04:00
|
|
|
"Return an expression E such that `(eval E)' is V.
|
2014-10-25 01:02:25 +02:00
|
|
|
|
|
|
|
E is either V or (quote V) depending on whether V evaluates to
|
|
|
|
itself or not."
|
|
|
|
(if (and (not (consp v))
|
|
|
|
(or (keywordp v)
|
|
|
|
(not (symbolp v))
|
|
|
|
(memq v '(nil t))))
|
|
|
|
v
|
|
|
|
(list 'quote v)))
|
|
|
|
|
2021-01-08 17:57:26 -05:00
|
|
|
(defun macroexp--fgrep (bindings sexp)
|
|
|
|
"Return those of the BINDINGS which might be used in SEXP.
|
|
|
|
It is used as a poor-man's \"free variables\" test. It differs from a true
|
|
|
|
test of free variables in the following ways:
|
|
|
|
- It does not distinguish variables from functions, so it can be used
|
|
|
|
both to detect whether a given variable is used by SEXP and to
|
|
|
|
detect whether a given function is used by SEXP.
|
|
|
|
- It does not actually know ELisp syntax, so it only looks for the presence
|
|
|
|
of symbols in SEXP and can't distinguish if those symbols are truly
|
|
|
|
references to the given variable (or function). That can make the result
|
|
|
|
include bindings which actually aren't used.
|
|
|
|
- For the same reason it may cause the result to fail to include bindings
|
|
|
|
which will be used if SEXP is not yet fully macro-expanded and the
|
|
|
|
use of the binding will only be revealed by macro expansion."
|
2021-02-10 16:06:24 -05:00
|
|
|
(let ((res '())
|
|
|
|
;; Cyclic code should not happen, but code can contain cyclic data :-(
|
|
|
|
(seen (make-hash-table :test #'eq))
|
|
|
|
(sexpss (list (list sexp))))
|
|
|
|
;; Use a nested while loop to reduce the amount of heap allocations for
|
|
|
|
;; pushes to `sexpss' and the `gethash' overhead.
|
|
|
|
(while (and sexpss bindings)
|
|
|
|
(let ((sexps (pop sexpss)))
|
|
|
|
(unless (gethash sexps seen)
|
|
|
|
(puthash sexps t seen) ;; Using `setf' here causes bootstrap problems.
|
|
|
|
(if (vectorp sexps) (setq sexps (mapcar #'identity sexps)))
|
|
|
|
(let ((tortoise sexps) (skip t))
|
|
|
|
(while sexps
|
|
|
|
(let ((sexp (if (consp sexps) (pop sexps)
|
|
|
|
(prog1 sexps (setq sexps nil)))))
|
|
|
|
(if skip
|
|
|
|
(setq skip nil)
|
|
|
|
(setq tortoise (cdr tortoise))
|
|
|
|
(if (eq tortoise sexps)
|
|
|
|
(setq sexps nil) ;; Found a cycle: we're done!
|
|
|
|
(setq skip t)))
|
|
|
|
(cond
|
|
|
|
((or (consp sexp) (vectorp sexp)) (push sexp sexpss))
|
|
|
|
(t
|
|
|
|
(let ((tmp (assq sexp bindings)))
|
|
|
|
(when tmp
|
|
|
|
(push tmp res)
|
|
|
|
(setq bindings (remove tmp bindings))))))))))))
|
|
|
|
res))
|
2021-01-08 17:57:26 -05:00
|
|
|
|
2012-09-04 13:40:25 -04:00
|
|
|
;;; Load-time macro-expansion.
|
|
|
|
|
|
|
|
;; Because macro-expansion used to be more lazy, eager macro-expansion
|
|
|
|
;; tends to bump into previously harmless/unnoticeable cyclic-dependencies.
|
|
|
|
;; So, we have to delay macro-expansion like we used to when we detect
|
|
|
|
;; such a cycle, and we also want to help coders resolve those cycles (since
|
|
|
|
;; they can be non-obvious) by providing a usefully trimmed backtrace
|
|
|
|
;; (hopefully) highlighting the problem.
|
|
|
|
|
|
|
|
(defun macroexp--backtrace ()
|
|
|
|
"Return the Elisp backtrace, more recent frames first."
|
|
|
|
(let ((bt ())
|
|
|
|
(i 0))
|
|
|
|
(while
|
|
|
|
(let ((frame (backtrace-frame i)))
|
|
|
|
(when frame
|
|
|
|
(push frame bt)
|
|
|
|
(setq i (1+ i)))))
|
|
|
|
(nreverse bt)))
|
|
|
|
|
|
|
|
(defun macroexp--trim-backtrace-frame (frame)
|
|
|
|
(pcase frame
|
|
|
|
(`(,_ macroexpand (,head . ,_) . ,_) `(macroexpand (,head …)))
|
|
|
|
(`(,_ internal-macroexpand-for-load (,head ,second . ,_) . ,_)
|
|
|
|
(if (or (symbolp second)
|
|
|
|
(and (eq 'quote (car-safe second))
|
|
|
|
(symbolp (cadr second))))
|
|
|
|
`(macroexpand-all (,head ,second …))
|
|
|
|
'(macroexpand-all …)))
|
|
|
|
(`(,_ load-with-code-conversion ,name . ,_)
|
|
|
|
`(load ,(file-name-nondirectory name)))))
|
|
|
|
|
|
|
|
(defvar macroexp--pending-eager-loads nil
|
|
|
|
"Stack of files currently undergoing eager macro-expansion.")
|
|
|
|
|
2015-03-18 10:31:07 -04:00
|
|
|
(defvar macroexp--debug-eager nil)
|
|
|
|
|
2014-04-22 00:04:34 -07:00
|
|
|
(defun internal-macroexpand-for-load (form full-p)
|
2012-09-04 13:40:25 -04:00
|
|
|
;; Called from the eager-macroexpansion in readevalloop.
|
2022-01-14 19:06:04 +00:00
|
|
|
(let ((symbols-with-pos-enabled t)
|
|
|
|
(print-symbols-bare t))
|
|
|
|
(cond
|
|
|
|
;; Don't repeat the same warning for every top-level element.
|
|
|
|
((eq 'skip (car macroexp--pending-eager-loads)) form)
|
|
|
|
;; If we detect a cycle, skip macro-expansion for now, and output a warning
|
|
|
|
;; with a trimmed backtrace.
|
|
|
|
((and load-file-name (member load-file-name macroexp--pending-eager-loads))
|
|
|
|
(let* ((bt (delq nil
|
|
|
|
(mapcar #'macroexp--trim-backtrace-frame
|
|
|
|
(macroexp--backtrace))))
|
|
|
|
(elem `(load ,(file-name-nondirectory load-file-name)))
|
|
|
|
(tail (member elem (cdr (member elem bt)))))
|
|
|
|
(if tail (setcdr tail (list '…)))
|
|
|
|
(if (eq (car-safe (car bt)) 'macroexpand-all) (setq bt (cdr bt)))
|
|
|
|
(if macroexp--debug-eager
|
|
|
|
(debug 'eager-macroexp-cycle)
|
|
|
|
(message "Warning: Eager macro-expansion skipped due to cycle:\n %s"
|
|
|
|
(mapconcat #'prin1-to-string (nreverse bt) " => ")))
|
|
|
|
(push 'skip macroexp--pending-eager-loads)
|
|
|
|
form))
|
|
|
|
(t
|
|
|
|
(condition-case err
|
|
|
|
(let ((macroexp--pending-eager-loads
|
|
|
|
(cons load-file-name macroexp--pending-eager-loads)))
|
|
|
|
(if full-p
|
|
|
|
(macroexpand--all-toplevel form)
|
|
|
|
(macroexpand form)))
|
|
|
|
(error
|
|
|
|
;; Hopefully this shouldn't happen thanks to the cycle detection,
|
|
|
|
;; but in case it does happen, let's catch the error and give the
|
|
|
|
;; code a chance to macro-expand later.
|
|
|
|
(message "Eager macro-expansion failure: %S" err)
|
|
|
|
form))))))
|
2012-09-04 13:40:25 -04:00
|
|
|
|
|
|
|
;; ¡¡¡ Big Ugly Hack !!!
|
|
|
|
;; src/bootstrap-emacs is mostly used to compile .el files, so it needs
|
|
|
|
;; macroexp, bytecomp, cconv, and byte-opt to be fast. Generally this is done
|
|
|
|
;; by compiling those files first, but this only makes a difference if those
|
|
|
|
;; files are not preloaded. But macroexp.el is preloaded so we reload it if
|
|
|
|
;; the current version is interpreted and there's a compiled version available.
|
|
|
|
(eval-when-compile
|
|
|
|
(add-hook 'emacs-startup-hook
|
|
|
|
(lambda ()
|
|
|
|
(and (not (byte-code-function-p
|
|
|
|
(symbol-function 'macroexpand-all)))
|
|
|
|
(locate-library "macroexp.elc")
|
|
|
|
(load "macroexp.elc")))))
|
|
|
|
|
2004-02-10 01:52:31 +00:00
|
|
|
(provide 'macroexp)
|
|
|
|
|
|
|
|
;;; macroexp.el ends here
|