summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/authors.el1366
-rw-r--r--lisp/emacs-lisp/byte-opt.el9
-rw-r--r--lisp/emacs-lisp/byte-run.el70
-rw-r--r--lisp/emacs-lisp/bytecomp.el73
-rw-r--r--lisp/emacs-lisp/cl-extra.el51
-rw-r--r--lisp/emacs-lisp/cl-indent.el62
-rw-r--r--lisp/emacs-lisp/cl-lib.el12
-rw-r--r--lisp/emacs-lisp/cl-macs.el108
-rw-r--r--lisp/emacs-lisp/cl-seq.el6
-rw-r--r--lisp/emacs-lisp/eldoc.el34
-rw-r--r--lisp/emacs-lisp/ert.el61
-rw-r--r--lisp/emacs-lisp/find-func.el3
-rw-r--r--lisp/emacs-lisp/gulp.el178
-rw-r--r--lisp/emacs-lisp/lisp-mode.el120
-rw-r--r--lisp/emacs-lisp/lisp.el116
-rw-r--r--lisp/emacs-lisp/macroexp.el11
-rw-r--r--lisp/emacs-lisp/nadvice.el11
-rw-r--r--lisp/emacs-lisp/package.el23
-rw-r--r--lisp/emacs-lisp/regexp-opt.el7
-rw-r--r--lisp/emacs-lisp/tabulated-list.el3
20 files changed, 535 insertions, 1789 deletions
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
deleted file mode 100644
index 3a552c6c1ef..00000000000
--- a/lisp/emacs-lisp/authors.el
+++ /dev/null
@@ -1,1366 +0,0 @@
-;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*-coding: utf-8 -*-
-
-;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
-
-;; Author: Gerd Moellmann <gerd@gnu.org>
-;; Maintainer: Kim F. Storm <storm@cua.dk>
-;; Keywords: maint
-;; Package: emacs
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; 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
-;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Use M-x authors RET to create an *Authors* buffer that can used as
-;; or merged with Emacs's AUTHORS file.
-
-;;; Code:
-
-(defvar authors-coding-system 'utf-8
- "Coding system used in the AUTHORS file.")
-
-(defconst authors-many-files 20
- "Maximum number of files for which to print individual information.
-If an author has modified more files, only the names of the most
-frequently modified files are printed and a count of the additional
-files.")
-
-(defconst authors-aliases
- '(
- ("Aaron S. Hawley" "Aaron Hawley")
- ("Alexandru Harsanyi" "Alex Harsanyi")
- ("Andrew Csillag" "Drew Csillag")
- ("Anna M. Bigatti" "Anna Bigatti")
- ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc."
- "Barry A. Warsaw, ITB" "Barry Warsaw")
- ("Bill Carpenter" "WJ Carpenter")
- ("Bill Mann" "William F. Mann")
- ("Bill Rozas" "Guillermo J. Rozas")
- ("Björn Torkelsson" "Bjorn Torkelsson")
- ("Brian Fox" "Brian J. Fox")
- ("Brian P Templeton" "BT Templeton")
- ("Brian Sniffen" "Brian T. Sniffen")
- ("David Abrahams" "Dave Abrahams")
- ("David J. Biesack" "David Biesack")
- ("David De La Harpe Golden" "David Golden")
- ("David Gillespie" "Dave Gillespie")
- ("David Kågedal" "David K..edal")
- ("David M. Koppelman" "David Koppelman")
- ("David M. Smith" "David Smith" "David M Smith")
- ("David O'Toole" "David T. O'Toole")
- ("Deepak Goel" "D. Goel")
- ("Ed L. Cashin" "Ed L Cashin")
- ("Edward M. Reingold" "Ed\\(ward\\( M\\)?\\)? Reingold" "Reingold Edward M")
- ("Emilio C. Lopes" "Emilio Lopes")
- ("Eric M. Ludlam" "Eric Ludlam")
- ("Eric S. Raymond" "Eric Raymond")
- ("Fabián Ezequiel Gallina" "Fabian Ezequiel Gallina" "Fabi.n E\\. Gallina")
- ("Francis J. Wright" "Dr Francis J. Wright" "Francis Wright")
- ("François Pinard" "Francois Pinard")
- ("Francesco Potortì" "Francesco Potorti" "Francesco Potorti`")
- ("Frederic Pierresteguy" "Fred Pierresteguy")
- ("Gerd Möllmann" "Gerd Moellmann")
- ("Hallvard B. Furuseth" "Hallvard B Furuseth" "Hallvard Furuseth")
- ("Hrvoje Nikšić" "Hrvoje Niksic")
- ;; lisp/org/ChangeLog 2010-11-11.
- (nil "aaa bbb")
- (nil "Code Extracted") ; lisp/newcomment.el's "Author:" header
- ("Jaeyoun Chung" "Jae-youn Chung" "Jae-you Chung" "Chung Jae-youn")
- ("Jan Djärv" "Jan D." "Jan Djarv")
- ("Jay K. Adams" "Jay Adams")
- ("Jérôme Marant" "Jérôme Marant" "Jerome Marant")
- ("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen")
- ("Jeremy Bertram Maitin-Shepard" "Jeremy Maitin-Shepard")
- ("Johan Bockgård" "Johan Bockgard")
- ("John J Foerch" "John Foerch")
- ("John W. Eaton" "John Eaton")
- ("Jonathan I. Kamens" "Jonathan Kamens")
- ("Jorgen Schäfer" "Jorgen Schaefer")
- ("Joseph Arceneaux" "Joe Arceneaux")
- ("Joseph M. Kelsey" "Joe Kelsey") ; FIXME ?
- ("Juan León Lahoz García" "Juan-Leon Lahoz Garcia")
- ("K. Shane Hartman" "Shane Hartman")
- ("Kai Großjohann" "Kai Grossjohann")
- ("Karl Berry" "K. Berry")
- ("Károly Lőrentey" "Károly Lőrentey" "Lőrentey Károly")
- ("Kazushi Marukawa" "Kazushi (Jam) Marukawa")
- ("Ken Manheimer" "Kenneth Manheimer")
- ("Kenichi Handa" "Ken'ichi Handa" "Kenichi HANDA" "K\\. Handa")
- ("Kevin Greiner" "Kevin J. Greiner")
- ("Kim F. Storm" "Kim Storm")
- ("Kyle Jones" "Kyle E. Jones")
- ("Lars Magne Ingebrigtsen" "Lars Ingebrigtsen")
- ("Marcus G. Daniels" "Marcus Daniels")
- ("Mark D. Baushke" "Mark D Baushke")
- ("Mark E. Shoulson" "Mark Shoulson")
- ("Marko Kohtala" "Kohtala Marko")
- ("Agustín Martín" "Agustin Martin" "Agustín Martín Domingo")
- ("Martin Lorentzon" "Martin Lorentzson")
- ("Matt Swift" "Matthew Swift")
- ("Maxime Edouard Robert Froumentin" "Max Froumentin")
- ("Michael R. Mauger" "Michael Mauger")
- ("Michael D. Ernst" "Michael Ernst")
- ("Michaël Cadilhac" "Michael Cadilhac")
- ("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, p/BSG")
- ("Michael R. Cook" "Michael Cook")
- ("Michael Sperber" "Michael Sperber \\[Mr. Preprocessor\\]")
- ("Mikio Nakajima" "Nakajima Mikio")
- ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira")
- ("Noorul Islam" "Noorul Islam K M")
- ("Paul Eggert" "Paul R\\. Eggert")
- ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik")
- ("Pavel Kobiakov" "Pavel Kobyakov")
- ("Per Abrahamsen" "Per Abhiddenware")
- ("Per Starbäck" "Per Starback")
- ("Peter J. Weisberg" "PJ Weisberg")
- ("Peter S. Galbraith" "Peter S Galbraith" "Peter Galbraith")
- ("Peter Runestig" "Peter 'luna' Runestig")
- ("Piotr Zieliński" "Piotr Zielinski")
- ("Rainer Schöpf" "Rainer Schoepf")
- ("Raja R. Harinath" "Raja R Harinath")
- ("Richard G. Bielawski" "Richard G Bielawski" "Richard Bielawski")
- ("Richard King" "Dick King")
- ("Richard M. Stallman" "Richard Stallman" "rms@gnu.org")
- ("Robert J. Chassell" "Bob Chassell")
- ("Roberto Huelga Díaz" "Roberto Huelga")
- ("Roland B. Roberts" "Roland B Roberts" "Roland Roberts")
- ("Rui-Tao Dong" "Rui-Tao Dong ~{6-HpLN~}")
- ("Sacha Chua" "Sandra Jean Chua")
- ("Sam Steingold" "Sam Shteingold")
- ("Satyaki Das" "Indexed search by Satyaki Das")
- ("Sébastien Vauban" "Sebastien Vauban")
- ;; There are other Stefans.
-;;; ("Stefan Monnier" "Stefan")
- ("Steven L. Baur" "SL Baur" "Steven L Baur")
- ("Stewart M. Clamen" "Stewart Clamen")
- ("Stuart D. Herring" "Stuart Herring" "Davis Herring")
- ("T.V. Raman" "T\\. V\\. Raman")
- ("Taichi Kawabata" "KAWABATA,? Taichi")
- ("Takaaki Ota" "Tak Ota")
- ("Takahashi Naoto" "Naoto Takahashi")
- ("Teodor Zlatanov" "Ted Zlatanov")
- ("Thomas Dye" "Tom Dye")
- ("Thomas Horsley" "Tom Horsley") ; FIXME ?
- ("Thomas Wurgler" "Tom Wurgler")
- ("Toby Cubitt" "Toby S\\. Cubitt")
- ("Tomohiko Morioka" "MORIOKA Tomohiko")
- ("Torbjörn Axelsson" "Torbjvrn Axelsson")
- ("Torbjörn Einarsson" "Torbj.*rn Einarsson")
- ("Toru Tomabechi" "Toru TOMABECHI")
- ("Tsugutomo Enami" "enami tsugutomo")
- ("Ulrich Müller" "Ulrich Mueller")
- ("Vincent Del Vecchio" "Vince Del Vecchio")
- ("William M. Perry" "Bill Perry")
- ("Wlodzimierz Bzyl" "W.*dek Bzyl")
- ("Yoni Rabkin" "Yoni Rabkin Katzenell")
- ("Yoshinori Koseki" "KOSEKI Yoshinori" "小関 吉則")
- ("Yutaka NIIBE" "NIIBE Yutaka")
- )
- "Alist of author aliases.
-
-Each entry is of the form (REALNAME REGEXP...). If an author's name
-matches one of the REGEXPs, use REALNAME instead.
-If REALNAME is nil, ignore that author.")
-
-;; FIXME seems it would be less fragile to check for O', Mc, etc.
-(defconst authors-fixed-case
- '("Brian van den Broek"
- "Bryan O'Sullivan"
- "Christian von Roques"
- "Christophe de Dinechin"
- "Craig McDaniel"
- "David J. MacKenzie"
- "David McCabe"
- "David O'Toole"
- "Devon Sean McCullough"
- "Dominique de Waleffe"
- "Edward O'Connor"
- "Exal de Jesus Garcia Carrillo"
- "Greg McGary"
- "Hans de Graaff"
- "James TD Smith"
- "Jay McCarthy"
- "Joel N. Weber II"
- "Matt McClure"
- "Michael McNamara"
- "Mike McEwan"
- "Nelson Jose dos Santos Ferreira"
- "Peter von der Ahe"
- "Peter O'Gorman"
- "Piet van Oostrum"
- "Roland McGrath"
- "Sean O'Halpin"
- "Sean O'Rourke"
- "Thomas DeWeese"
- "Tijs van Bakel")
- "List of authors whose names cannot be simply capitalized.")
-
-(defvar authors-public-domain-files
- '("emerge\\.el"
- "vi\\.el"
- "feedmail\\.el"
- "mailpost\\.el"
- "hanoi\\.el"
- "meese\\.el"
- "studly\\.el"
- "modula2\\.el"
- "nnmaildir\\.el"
- "nnil\\.el"
- "b2m\\.c"
- "unexhp9k800\\.c"
- "emacsclient\\.1"
- "check-doc-strings")
- "List of regexps matching files for which the FSF doesn't need papers.")
-
-
-(defvar authors-obsolete-files-regexps
- '(".*loaddefs.el$" ; not obsolete, but auto-generated
- "\\.\\(cvs\\|git\\)ignore$" ; obsolete or uninteresting
- "\\.arch-inventory$"
- ;; TODO lib/? Matches other things?
- "build-aux/" "m4/" "Emacs.xcodeproj" "mapfiles" "\\.map\\'"
- "preferences\\.\\(nib\\|gorm\\)"
- ;; Generated files that have since been removed.
- "\\(refcard\\(-de\\|-pl\\)?\\|calccard\\|dired-ref\\|orgcard\\|\
-gnus-booklet\\|fr-drdref\\)\\.p\\(df\\|s\\)\\'")
- "List of regexps matching obsolete files.
-Changes to files matching one of the regexps in this list are not listed.")
-
-(defconst authors-ignored-files
- '("external-lisp"
- "lock" "share-lib" "local-lisp"
- "noleim-Makefile.in"
- "NEWS" "ORDERS" "PROBLEMS" "FAQ" "AUTHORS" "FOR-RELEASE" "TODO" "todo"
- "MACHINES" "SERVICE"
- "README.unicode" "README.multi-tty" "TUTORIAL.translators"
- "NEWS.unicode" "COPYING.DJ" "Makefile.old" "Makefile.am"
- "NEWS.1" "OOOOONEWS...OONEWS" "OOOONEWS" "etc/NEWS"
- "NEWS.1-17" "NEWS.18" "NEWS.19" "NEWS.20" "NEWS.21" "NEWS.22"
- "MAINTAINERS" "MH-E-NEWS"
- "install.sh" "install-sh" "missing" "mkinstalldirs"
- "termcap.dat" "termcap.src" "termcap.ucb" "termcap"
- "ChangeLog.nextstep" "Emacs.clr" "spec.txt"
- "gfdl.1"
- "texi/Makefile.in"
- "Imakefile" "icons/sink.ico" "aixcc.lex"
- "nxml/char-name/unicode"
- "spec.txt"
- "js2-mode.el" ; only installed very briefly, replaced by js.el
- ;; In the old imported lisp/url ChangeLog, but never in Emacs.
- "mule-sysdp.el"
- ;; Only briefly present.
- "tests/gnustest-nntp.el" "tests/gnustest-registry.el"
- "cedet/tests/testtemplates.cpp"
- "cedet/tests/testusing.cpp"
- "cedet/tests/scopetest.cpp"
- "cedet/tests/scopetest.java"
- "cedet/tests/test.cpp"
- "cedet/tests/test.py"
- "cedet/tests/teststruct.cpp"
- "*.el"
- ;; Autogen:
- "cus-load.el" "finder-inf.el" "ldefs-boot.el" "loaddefs-boot.el"
- "compile" "config.guess" "config.sub" "depcomp"
- "autogen/compile" "autogen/config.guess" "autogen/config.in"
- "autogen/config.sub" "autogen/depcomp" "autogen/install-sh"
- "autogen/missing" "autogen"
- "autogen/copy_autogen" ; not generated, but trivial and now removed
- "dir_top"
- ;; Only existed briefly, then renamed:
- "images/icons/allout-widgets-dark-bg"
- "images/icons/allout-widgets-light-bg"
- ;; Never had any meaningful changes logged, now deleted:
- "unidata/bidimirror.awk" "unidata/biditype.awk"
- "split-man" "Xkeymap.txt" "ms-7bkermit" "ulimit.hack"
- "gnu-hp300" "refcard.bit" "ledit.l" "forms.README" "forms-d2.dat"
- "CXTERM-DIC/PY.tit" "CXTERM-DIC/ZIRANMA.tit"
- "CXTERM-DIC/CTLau.tit" "CXTERM-DIC/CTLauB.tit"
- "copying.paper" "celibacy.1" "condom.1" "echo.msg" "sex.6"
- "COOKIES" "INTERVIEW" "MAILINGLISTS" "MOTIVATION"
- "NICKLES.WORTH" "INTERVAL.IDEAS" "RCP"
- "3B-MAXMEM" "AIX.DUMP" "SUN-SUPPORT" "XENIX"
- "CODINGS" "CHARSETS"
- "calc/INSTALL" "calc/Makefile" "calc/README.prev"
- "vms-pp.trans" "_emacs" "batcomp.com" "notes/cpp" ; admin/
- "emacsver.texi.in"
- "vpath.sed"
- "Cocoa/Emacs.base/Contents/Info.plist"
- "Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings"
- "GNUstep/Emacs.base/Resources/Info-gnustep.plist"
- "GNUstep/Emacs.base/Resources/Emacs.desktop"
- "Cocoa/Emacs.base/Contents/Resources/English.lproj"
- ;; Only existed briefly, then deleted:
- "coccinelle/overlay.cocci" "coccinelle/symbol.cocci"
- ;; MH-E stuff not in Emacs:
- "import-emacs" "release-utils"
- ;; Erc stuff not in Emacs:
- "ChangeLog.2001" "ChangeLog.2002" "ChangeLog.2003" "ChangeLog.2004"
- "ChangeLog.2005"
- "README.extras" "dir-template" "mkChangeLog" "MkChangeLog" "erc-auto.in"
- "CREDITS" "HACKING"
- "debian/changelog"
- "debian/control"
- "debian/copyright"
- "debian/maint/conffiles"
- "debian/maint/conffiles.in"
- "debian/maint/postinst"
- "debian/maint/postinst.in"
- "debian/maint/prerm"
- "debian/maint/prerm.in"
- "debian/README.Debian"
- "debian/README.erc-speak"
- "debian/rules"
- "debian/scripts/install"
- "debian/scripts/install.in"
- "debian/scripts/remove"
- "debian/scripts/remove.in"
- "debian/scripts/startup"
- "debian/scripts/startup.erc"
- "debian/scripts/startup.erc-speak"
- ;; Used to be in admin, not very interesting.
- "emacs-pretesters" "make-announcement" "make-changelog-diff"
- ;; Textual comments that are not files.
- "All" "Version" "Everywhere" "Many" "Various" "files"
- ;; Directories.
- "vms" "mac" "url" "tree-widget"
- )
- "List of files and directories to ignore.
-Changes to files in this list are not listed.")
-
-;; List via: find . -name '*.el' | sed 's/.*\///g' | sort | uniq -d
-;; FIXME It would be better to discover these dynamically.
-(defconst authors-ambiguous-files
- '("Makefile.in"
- "makefile.w32-in"
- "chart.el"
- "cl-lib.el"
- "compile.el"
- "complete.el"
- "cpp.el"
- "ctxt.el"
- "custom.el"
- "cyrillic.el"
- "czech.el"
- "debug.el"
- "dired.el"
- "el.el"
- "eshell.el"
- "ethiopic.el"
- "f90.el"
- "files.el"
- "find.el"
- "format.el"
- "generic.el"
- "georgian.el"
- "grammar.el"
- "greek.el"
- "grep.el"
- "hebrew.el"
- "imenu.el"
- "indian.el"
- "info-xref.el"
- "japanese.el"
- "java.el"
- "lao.el"
- "linux.el"
- "locate.el"
- "make.el"
- "mode.el"
- "mule-util.el"
- "python.el"
- "rmailmm.el"
- "semantic.el"
- "shell.el"
- "simple.el"
- "slovak.el"
- "sort.el"
- "speedbar.el"
- "srecode.el"
- "table.el"
- "texi.el"
- "thai.el"
- "thingatpt.el"
- "tibetan.el"
- "util.el"
- "vc-bzr.el"
- "wisent.el")
- "List of basenames occurring more than once in the source.")
-
-;; FIXME :cowrote entries here can be overwritten by :wrote entries
-;; derived from a file's Author: header (eg mh-e). This really means
-;; the Author: header is erroneous.
-(defconst authors-fixed-entries
- '(("Richard M. Stallman" :wrote "[The original GNU Emacs and numerous files]")
- ("Joseph Arceneaux" :wrote "xrdb.c")
- ;; This refers to the obsolete Willisson (qv) version.
-;;; ("Blitz Product Development Corporation" :wrote "ispell.el")
- ("Frank Bresz" :wrote "diff.el")
- ("David M. Brown" :wrote "array.el")
- ;; No longer distributed.
-;;; ("Gary Byers" :changed "xenix.h")
- ;; No longer distributed: freebsd.h
- ;; Only trivial pieces remain, merged into configure.ac.
- ("Shawn M. Carey" :wrote "[some early FreeBSD support]")
- ;; hp800.h renamed from hp9000s800.h, hpux.h merged into hpux10-20.h.
- ;; FIXME overwritten by Author:.
- ("Satyaki Das" :cowrote "mh-search.el")
- ;; No longer distributed: hp800.h, hpux10-20.h.
- ;; Only trivial pieces remain, merged into configure.ac.
- ("Eric Decker" :changed "sysdep.c (and other files for HP-UX support)")
- ("Lawrence R. Dodd" :cowrote "dired-x.el")
- ;; No longer distributed.
-;;; ("Viktor Dukhovni" :wrote "unexsunos4.c")
- ("Paul Eggert" :wrote "rcs2log") ; "vcdiff"
- ("Fred Fish" :changed "unexcoff.c")
- ;; No longer distributed.
-;;; ("Tim Fleehart" :wrote "makefile.nt")
- ("Keith Gabryelski" :wrote "hexl.c")
- ("Kevin Gallagher" :wrote "flow-ctrl.el")
- ;; Also wrote an earlier version of disp-table.el, since replaced
- ;; by Erik Naggum's version; also iso-syntax.el, later renamed to
- ;; latin-1.el, since deleted.
- ("Howard Gayle" :wrote "casetab.c")
- ;; :wrote mh-pick.el, since merged into mh-search.el.
- ;; Originally wrote mh-funcs.el, but it has been rewritten since.
- ("Stephen Gildea" :wrote "refcard.tex"
- :cowrote "mh-funcs.el" "mh-search.el")
- ;; cl.texinfo renamed to cl.texi.
- ("David Gillespie" :wrote "cl.texi")
- ;; No longer distributed: emacsserver.c.
- ("Hewlett-Packard" :changed "emacsclient.c" "server.el" "keyboard.c")
- ;; No longer distributed.
-;;; ("Thomas Horsley" :wrote "cxux.h" "cxux7.h")
- ("Indiana University Foundation" :changed "buffer.c" "buffer.h"
- "indent.c" "search.c" "xdisp.c" "region-cache.c" "region-cache.h")
- ;; ibmrt.h, ibmrt-aix.h no longer distributed.
- ("International Business Machines" :changed "emacs.c" "fileio.c"
- "process.c" "sysdep.c" "unexcoff.c")
- ;; No longer distributed.
-;;; ("Ishikawa Chiaki" :changed "aviion.h" "dgux.h")
- ;; No longer distributed: ymakefile, intel386.h, mem-limits.h, template.h,
- ;; linux.h (was renamed to lignux.h, then to gnu-linux.h, then removed)
- ("Michael K. Johnson" :changed "configure.ac" "emacs.c"
- "process.c" "sysdep.c" "syssignal.h" "systty.h" "unexcoff.c")
- ;; No longer distributed.
-;;; ("Kyle Jones" :wrote "mldrag.el")
- ("Henry Kautz" :wrote "bib-mode.el")
- ;; No longer distributed: vms-pwd.h, vmsfns.c, uaf.h,
- ;; dir.h (was renamed to vmsdir.h, then removed)
- ("Joseph M. Kelsey" :changed "fileio.c")
- ("Sam Kendall" :changed "etags.c" "etags.el")
- ;; ack.texi: "We're not using his backquote.el any more."
- ("Richard King" :wrote "userlock.el" "filelock.c")
- ("Sebastian Kremer" :changed "add-log.el")
- ("Mark Lambert" :changed "process.c" "process.h")
- ("Aaron Larson" :changed "bibtex.el")
- ;; It was :wrote, but it has been rewritten since.
- ("James R. Larus" :cowrote "mh-e.el")
- ("Lars Lindberg" :changed "dabbrev.el" :cowrote "imenu.el")
- ;; No longer distributed: lselect.el.
- ("Lucid, Inc." :changed "bytecode.c" "byte-opt.el" "byte-run.el"
- "bytecomp.el" "delsel.el" "disass.el" "faces.el" "font-lock.el"
- "lmenu.el" "mailabbrev.el" "select.el" "xfaces.c" "xselect.c")
- ;; MCC. No longer distributed: emacsserver.c.
- ("Microelectronics and Computer Technology Corporation"
- :changed "etags.c" "emacsclient.c" "movemail.c"
- "rmail.el" "rmailedit.el" "rmailkwd.el"
- "rmailmsc.el" "rmailout.el" "rmailsum.el" "scribe.el"
- ;; It was :wrote for xmenu.c, but it has been rewritten since.
- "server.el" "lisp.h" "sysdep.c" "unexcoff.c" "xmenu.c")
- ("Niall Mansfield" :changed "etags.c")
- ("Brian Marick" :cowrote "hideif.el")
- ("Marko Kohtala" :changed "info.el")
- ("Sidney Markowitz" :changed "doctor.el")
- ;; No longer distributed: env.c.
- ("Richard Mlynarik" :wrote "ehelp.el")
- ("Mosur Mohan" :changed "etags.c")
- ("Jeff Morgenthaler" :changed "flow-ctrl.el" "vt200.el" "vt201.el"
- "vt220.el" "vt240.el")
- ("Motorola" :changed "buff-menu.el")
- ("Hiroshi Nakano" :changed "ralloc.c")
- ;; File removed in Emacs 24.1.
-;;; ("Sundar Narasimhan" :changed "rnewspost.el")
- ;; No longer distributed.
-;;; ("NeXT, Inc." :wrote "unexnext.c")
- ("Mark Neale" :changed "fortran.el")
- ;; Renamed from sc.el.
- ("Martin Neitzel" :changed "supercite.el")
- ("Andrew Oram" :changed "calendar.texi (and other doc files)")
- ("Frederic Pierresteguy" :wrote "widget.c")
- ("Michael D. Prange" :changed "tex-mode.el")
- ;; No longer distributed (dgux5-4r3.h was renamed to dgux5-4-3.h).
-;;; ("Paul Reilly" :wrote "gux5-4r2.h" "dgux5-4-3.h")
- ("Rob Riepel" :wrote "tpu-edt.doc")
- ("Roland B. Roberts" :changed "files.el" "sort.el"
- "buffer.h" "callproc.c" "dired.c" "process.c" "sysdep.c" "systty.h")
- ;; No longer distributed.
-;;; "vmspaths.h" "build.com" "compile.com" "kepteditor.com" "precomp.com"
-;;; "vmsproc.el" :wrote "logout.com" "mailemacs.com")
-;;; ("Guillermo J. Rozas" :wrote "fakemail.c")
- ("Wolfgang Rupprecht" :changed "lisp-mode.el" "loadup.el"
- "sort.el" "alloc.c" "callint.c"
- ;; config.in renamed from config.h.in, now a generated file.
- ;; ecrt0.c renamed from crt0.c, then removed.
- "data.c" "fns.c"
- "lisp.h" "lread.c" ; "sun3.h" "ymakefile" - no longer distributed
- "print.c" :wrote "float-sup.el" "floatfns.c")
- ("Schlumberger Technology Corporation" :changed "gud.el")
- ;; Replaced by tcl.el.
-;;; ("Gregor Schmid" :wrote "tcl-mode.el")
- ;; No longer distributed since 24.1.
-;;; ("Rainer Schöpf" :wrote "alpha.h" "unexalpha.c")
- ;; No longer distributed: emacsserver.c.
- ("William Sommerfeld" :wrote "emacsclient.c" "scribe.el")
- ;; No longer distributed: emacsserver.c.
- ("Leigh Stoller" :changed "emacsclient.c" "server.el")
- ("Steve Strassmann" :wrote "spook.el")
- ("Shinichirou Sugou" :changed "etags.c")
- ;; No longer distributed: emacsserver.c.
- ("Sun Microsystems, Inc" :changed "emacsclient.c" "server.el"
- :wrote "emacs.icon" "sun.el")
- ;; No longer distributed.
-;;; "emacstool.1" "emacstool.c" "sun-curs.el"
-;;; "sun-fns.el" "sun-mouse.el" "sunfns.c")
- ;; Renamed from sc.el.
- ("Kayvan Sylvan" :changed "supercite.el")
- ;; No longer distributed: emacsserver.c, tcp.c.
- ("Spencer Thomas" :changed "emacsclient.c" "server.el"
- "dabbrev.el" "unexcoff.c" "gnus.texi")
- ("Jonathan Vail" :changed "vc.el")
- ;; No longer distributed: usg5-4.h
- ("James Van Artsdalen" :changed "unexcoff.c")
- ;; No longer distributed: src/makefile.nt, lisp/makefile.nt
- ;; winnt.el renamed to w32-fns.el; nt.[ch] to w32.[ch];
- ;; ntheap.[ch] to w32heap.[ch]; ntinevt.c to w32inevt.c;
- ;; ntproc.c to w32proc.c; ntterm.c to w32term.c;
- ;; windowsnt.h to ms-w32.h.
- ("Geoff Voelker" :wrote "w32-fns.el" "w32.c" "w32.h" "w32heap.c"
- "w32heap.h" "w32inevt.c" "w32proc.c" "w32term.c" "ms-w32.h")
- ("Morten Welinder" :wrote "dosfns.c" "[many MS-DOS files]" "msdos.h")
- ("Eli Zaretskii" :wrote "bidi.c" "[bidirectional display in xdisp.c]"
- "[tty menus in term.c]")
- ;; Not using this version any more.
-;;; ("Pace Willisson" :wrote "ispell.el")
- ;; FIXME overwritten by Author:.
- ("Bill Wohler" :cowrote "mh-e.el")
- ("Garrett Wollman" :changed "sendmail.el")
- ("Dale R. Worley" :changed "mail-extr.el")
- ("Jamie Zawinski" :changed "bytecode.c" :wrote "tar-mode.el"
- :cowrote "disass.el"))
- "Actions taken from the original, manually (un)maintained AUTHORS file.")
-
-
-(defconst authors-valid-file-names
- '("aclocal.m4"
- "build-ins.in"
- "Makefile"
- "Makefile.noleim"
- "makedist.bat"
- "makefile.def"
- "makefile.nt"
- "ns.mk"
- "README"
- ;; There were a few of these, not just the generated top-level one.
- "configure" "config.h"
- ;; nt/
- "ebuild.bat" "install.bat" "fast-install.bat"
- "debug.bat.in" "emacs.bat.in"
- "inc/sys/dir.h" "inc/gettext.h"
- ".gdbinit-union"
- "alloca.s"
- "make-delta"
- "config.w95"
- "msysconfig.sh"
- "emacstool.1"
- "align.umax"
- "cxux-crt0.s"
- "gould-sigvec.s"
- "getdate.y"
- "ymakefile"
- "permute-index" "index.perm"
- "ibmrs6000.inp"
- "b2m.c" "b2m.1" "b2m.pl" "rcs-checkin.1"
- "emacs.bash" "emacs.csh" "ms-kermit"
- "emacs.ico"
- "emacs21.ico"
- "emacs.py" "emacs2.py" "emacs3.py"
- "BABYL" "LPF" "LEDIT" "OTHER.EMACSES"
- "emacs16_mac.png" "emacs24_mac.png"
- "emacs256_mac.png" "emacs32_mac.png"
- "emacs48_mac.png" "emacs512_mac.png"
- "ps-prin2.ps" "ps-prin3.ps"
- "emacs.xbm" "gnu.xpm" "gnus-pointer.xbm" "gnus-pointer.xpm"
- ;; Moved from etc/ to etc/images, and/or removed.
- "gnus.pbm" "gnus.xbm" "gnus.xpm" "letter.pbm" "letter.xbm" "letter.xpm"
- "splash.pbm" "splash.xbm" "splash.xpm" "splash8.xpm"
- "images/execute.pbm" "images/execute.xpm" "images/fld-open.pbm"
- "images/fld-open.xpm" "images/highlight.pbm" "images/highlight.xpm"
- "images/mail.pbm" "images/mail.xpm" "images/mail/alias.pbm"
- "images/mail/alias.xpm" "images/mail/refile.pbm"
- "images/mail/refile.xpm" "images/page-down.pbm"
- "images/page-down.xpm" "images/widen.pbm" "images/widen.xpm"
- "images/gnus/bar.xbm" "images/gnus/bar.xpm"
- "images/gnus/reverse-smile.xpm"
- "revdiff" ; admin/
- "vcdiff" "rcs-checkin" "tindex.pl"
- "mainmake" "sed1.inp" "sed2.inp" "sed3.inp" ; msdos/
- "mac-fix-env.m"
- ;; Deleted vms stuff:
- "temacs.opt" "descrip.mms" "compile.com" "link.com"
- "compact.el" "fadr.el"
- "calc/calc-maint.el"
- "emacs-lisp/cl-specs.el"
- "emacs-lisp/eieio-comp.el"
- "erc-hecomplete.el"
- "eshell/esh-maint.el"
- "language/persian.el"
- "ledit.el" "meese.el" "iswitchb.el" "longlines.el"
- "mh-exec.el" "mh-init.el" "mh-customize.el"
- "net/zone-mode.el" "xesam.el"
- "term/mac-win.el" "sup-mouse.el"
- "url-https.el"
- "org-mac-message.el" "org-mew.el" "org-w3m.el" "org-vm.el" "org-wl.el"
- "org-mks.el" "org-remember.el" "org-xoxo.el" "org-docbook.el"
- "org-freemind.el" "ox-jsinfo.el"
- "org-exp-blocks.el" ; maybe this is ob-exp now? dunno
- "org-lparse.el"
- "org-special-blocks.el" "org-taskjuggler.el"
- ;; gnus
- "nnwfm.el" "nnlistserv.el" "nnkiboze.el" "nndb.el" "nnsoup.el"
- "netrc.el" "password.el" "sasl-cram.el" "sasl-digest.el" "sasl-ntlm.el"
- "sasl.el" "dig.el" "dns.el" "hex-util.el" "sha1.el" "md4.el"
- "hmac-def.el" "hmac-md5.el" "ntlm.el" "hashcash.el" "smime-ldap.el"
- "assistant.el" "gnus-utils.el" "tls.el" "pgg-def.el" "pgg-gpg.el"
- "gnus-compat.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" "pgg.el"
- "dns-mode.el" "run-at-time.el" "gnus-encrypt.el" "sha1-el.el"
- "gnus-gl.el" "gnus.sum.el" "proto-stream.el" "color.el" "color-lab.el"
- "eww.el" "shr-color.el" "shr.el" "earcon.el" "gnus-audio.el" "encrypt.el"
- "format-spec.el" "gnus-move.el"
- ;; doc
- "getopt.c" "texindex.c" "news.texi" "vc.texi" "vc2-xtra.texi"
- "back.texi" "vol1.texi" "vol2.texi" "elisp-covers.texi" "two.el"
- "front-cover-1.texi" "locals.texi" "calendar.texi" "info-stnd.texi"
- "tasks.texi"
- "advice.texi" "picture.texi" "texinfo.tex"
- ;; lwlib:
- "dispatch.c" "dispatch.h" "xrdb-cpp.c" "xrdb.c"
- "lwlib-Xol.c" "lwlib-Xol.h" "lwlib-Xolmb.c" "lwlib-Xolmb.h"
- "lwlib-XolmbP.h"
- ;; lib/
- "lib/stdio.c" "lib/gl_openssl.h" "lib/sigprocmask.c"
- "lib/pthread_sigprocmask.c" "lib/ldtoastr.c" "lib/dummy.c"
- "lib/ignore-value.h"
- ;; lib-src/
- "cvtmail.c" "digest-doc.c" "emacsserver.c" "emacstool.c" "env.c"
- "etags-vmslib.c" "fakemail.c" "getdate.c" "getopt.h" "getopt1.c"
- "getopt_.h" "getopt_int.h" "gettext.h" "leditcfns.c" "loadst.c"
- "make-path.c" "qsort.c" "sorted-doc.c" "tcp.c" "timer.c" "wakeup.c"
- "yow.c"
- ;; etc/
- "emacsclient.c" "etags.c" "hexl.c" "make-docfile.c" "movemail.c"
- "test-distrib.c" "testfile"
- "tpu-edt.doc" ; see below
- )
- "File names which are valid, but no longer exist (or cannot be found)
-in the repository.")
-
-;; Note that any directory part on the RHS is retained.
-;; Cf authors-renamed-files-regexps.
-;; NB So only add a directory if needed to disambiguate.
-;; FIXME?
-;; Although perhaps we could let authors-disambiguate-file-name do that?
-(defconst authors-renamed-files-alist
- '(("nt.c" . "w32.c") ("nt.h" . "w32.h")
- ("ntheap.c" . "w32heap.c") ("ntheap.h" . "w32heap.h")
- ("ntinevt.c" . "w32inevt.c") ("ntinevt.h" . "w32inevt.h")
- ("ntproc.c" . "w32proc.c")
- ("w32console.c" . "w32term.c")
- ("unexnt.c" . "unexw32.c")
- ("s/windowsnt.h" . "s/ms-w32.h")
- ("s/ms-w32.h" . "inc/ms-w32.h")
- ("src/config.h" . "config.h")
- ("winnt.el" . "w32-fns.el")
- ("linux.h" . "gnu-linux.h")
- ("emacs.manifest" . "emacs-x86.manifest")
- ("config.emacs" . "configure")
- ("configure.in" . "configure.ac")
- ("config.h.dist" . "config.in")
- ("config.h-dist" . "config.in")
- ("config.h.in" . "config.in")
- ("debug.bat" . "debug.bat.in")
- ("emacs.bat" . "emacs.bat.in")
- ;; paths.h.dist -> paths.h-dist -> paths.h.in -> paths.in -> epaths.in.
- ("paths.h.dist" . "epaths.in")
- ("paths.h-dist" . "epaths.in")
- ("paths.h.in" . "epaths.in")
- ("paths.in" . "epaths.in")
- ("patch1" . "sed1.inp")
- ("INSTALL.MSYS" . "INSTALL")
- ("server.c" . "emacsserver.c")
- ("lib-src/etags.c" . "etags.c")
- ;; msdos/
- ("is-exec.c" . "is_exec.c")
- ("enriched.doc" . "enriched.txt")
- ("GETTING.GNU.SOFTWARE" . "FTP")
- ("etc/MACHINES" . "MACHINES")
- ("ONEWS" . "NEWS.19")
- ("ONEWS.1" . "NEWS.1-17")
- ("ONEWS.2" . "NEWS.1-17")
- ("ONEWS.3" . "NEWS.18")
- ("ONEWS.4" . "NEWS.18")
- ("ORDERS.USA" . "ORDERS")
- ("EUROPE" . "ORDERS")
- ("DIFF" . "OTHER.EMACSES")
- ("CCADIFF" . "OTHER.EMACSES")
- ("GOSDIFF" . "OTHER.EMACSES")
- ;; Moved from lisp/tpu-doc.el to etc/tpu-edt.doc in Emacs 19.29.
- ;; Removed in Emacs 19.30, replaced by new file etc/edt-user.doc
- ;; (no associated ChangeLog entry).
- ("tpu-doc.el" . "tpu-edt.doc")
- ("Makefile.in.in" . "Makefile.in")
- ("leim-Makefile" . "leim/Makefile")
- ("leim-Makefile.in" . "leim/Makefile.in")
- ("emacs-lisp/testcover-ses.el" . "tcover-ses.el")
- ("emacs-lisp/testcover-unsafep.el" . "tcover-unsafep.el")
- ("progmodes/dos.el" . "bat-mode.el")
- ;; index and pick merged into search.
- ("mh-index.el" . "mh-search.el")
- ("mh-pick.el" . "mh-search.el")
- ("font-setting.el" . "dynamic-setting.el")
- ("help-funs.el" . "help-fns.el")
- ("erc-notifications.el" . "erc-desktop-notifications.el")
- ("org-complete.el" . "org-pcomplete.el")
- ("org-export.el" . "ox.el") ; ?
- ;; Was definitely renamed to org-latex.el, then... ?
- ("org-export-latex.el" . "ox-latex.el") ; ?
- ("org-exp.el" . "ox.el") ; ?
- ("progmodes/cfengine3.el" . "cfengine.el")
- ("progmodes/delphi.el" . "opascal.el")
- ("octave-inf.el" . "octave.el")
- ("octave-mod.el" . "octave.el")
- ("progmodes/octave-inf.el" . "octave.el")
- ("progmodes/octave-mod.el" . "octave.el")
- ;; Obsolete.
- ("emacs-lisp/assoc.el" . "assoc.el")
- ("emacs-lisp/cust-print.el" . "cust-print.el")
- ("mail/mailpost.el" . "mailpost.el")
- ("play/bruce.el" . "bruce.el")
- ("play/yow.el" . "yow.el")
- ("patcomp.el" . "patcomp.el")
- ;; From lisp to etc/forms.
- ("forms-d2.el" . "forms-d2.el")
- ("forms-pass.el" . "forms-pass.el")
- ;; From lisp/ to etc/nxml.
- ("nxml/test.invalid.xml" . "test-invalid.xml")
- ("nxml/test.valid.xml" . "test-valid.xml")
- ;; The one in lisp is eshell/eshell.el.
- ("eshell.el" . "automated/eshell.el")
- ("eshell/esh-test.el" . "automated/eshell.el")
- ;; INSTALL-CVS -> .CVS -> .BZR -> .REPO
- ("INSTALL-CVS" . "INSTALL.REPO")
- ("INSTALL.CVS" . "INSTALL.REPO")
- ("INSTALL.BZR" . "INSTALL.REPO")
- ("gnus-logo.eps" . "gnus-logo.eps") ; moved to refcards/
- ("build-install" . "build-ins.in")
- ("build-install.in" . "build-ins.in")
- ("unidata/Makefile" . "unidata/Makefile.in")
- ("mac/uvs.el" . "unidata/uvs.el")
- ;; Moved from top to etc/
- ("CONTRIBUTE" . "CONTRIBUTE")
- ("FTP" . "FTP")
- ;; Moved from top to build-aux/
- ("move-if-change" . "move-if-change")
- ("update-subdirs" . "update-subdirs")
- ("emacs.tex" . "emacs.texi")
- ("faq.texi" . "efaq.texi")
- ("major.texi" . "modes.texi")
- ;; And from emacs/ to misc/ and back again.
- ("ns-emacs.texi" . "macos.texi")
- ("overrides.texi" . "gnus-overrides.texi")
- ("xresmini.texi" . "xresources.texi")
- ;; Not renamed, but we only have the latter in the Emacs repo.
- ("trampver.texi.in" . "trampver.texi")
- ;; Renamed with same directory.
- ("e/eterm" . "eterm-color")
- ("e/eterm.ti" . "eterm-color.ti")
- ("README.txt" . "README")
- ("emacs.names" . "JOKES")
- ("ED.WORSHIP" . "JOKES")
- ("GNU.JOKES" . "JOKES")
- ("CHARACTERS" . "TODO")
- ("images/gnus/mail_send.xpm" . "mail-send.xpm") ; still in images/gnus
- ;; Renamed within same directory.
- ("schema/xhtml-basic-form.rnc" . "xhtml-bform.rnc" )
- ("schema/xhtml-basic-table.rnc" . "xhtml-btable.rnc")
- ("schema/xhtml-list.rnc" . "xhtml-lst.rnc")
- ("schema/xhtml-target.rnc" . "xhtml-tgt.rnc")
- ("schema/xhtml-style.rnc" . "xhtml-xstyle.rnc")
- ("schema/docbook-dyntbl.rnc" . "docbk-dyntbl.rnc")
- ("schema/docbook-soextbl.rnc" . "docbk-soextbl.rn" )
- ("edt-user.doc" . "edt.texi")
- ("DEV-NOTES" . "nextstep")
- ("org/COPYRIGHT-AND-LICENSE" . "org/README")
- ;; Moved to different directories.
- ("ctags.1" . "ctags.1")
- ("etags.1" . "etags.1")
- ("emacs.1" . "emacs.1")
- ("emacsclient.1" . "emacsclient.1")
- ("icons/emacs21.ico" . "emacs21.ico")
- ("ja-dic" . "leim/ja-dic")
- ("quail" . "leim/quail")
- ;; Moved from autogen/ to admin/.
- ("autogen/update_autogen" . "update_autogen")
- ;; Moved from etc/ to admin/.
- ("grammars" . "grammars")
- ;; From etc to lisp/cedet/semantic/.
- ("grammars/bovine-grammar.el" . "bovine/grammar.el")
- ("grammars/wisent-grammar.el" . "wisent/grammar.el")
- ;; Moved from admin/nt/ to nt/.
- ("nt/README.W32" . "README.W32")
- )
- "Alist of files which have been renamed during their lifetime.
-Elements are (OLDNAME . NEWNAME).")
-
-;; Should still test that the renamed file exists. Does it?
-;; But it might be relative to a different ChangeLog...
-;;
-;; Note that only the basename of the RHS is used.
-;; Cf authors-renamed-files-alist.
-(defconst authors-renamed-files-regexps
- '(("\\`\\(arg-nonnull\\|c\\+\\+defs\\|warn-on-use\\)\\.h\\'"
- "build-aux/snippet/\\&")
- ("\\`\\(ebuild\\|emacs\\|install\\|fast-install\\)\\.cmd\\'" "\\1.bat")
- ("\\`\\(book-spine\\|cl\\|forms\\|functions\\|gnus\\|sc\\|texinfo\\|vip\\)\
-\\.texinfo\\'" "\\1.texi")
- ("\\`\\(\\(calc\\|org\\|vip\\)card\\|viperCard\\|\
-\\(\\(cs\\|fr\\|sk\\)-\\)?dired-ref\\|\
-\\(\\(cs\\|de\\|fr\\|gnus\\|pl\\|pt-br\\|ru\\|sk\\)-\\)?refcard\\|\
-\\(\\(cs\\|fr\\|sk\\)-\\)?survival\\)\\.tex\\'" "refcards/\\&")
- ("\\`refcard-\\(de\\|pl\\)\\.tex\\'" "refcards/\\1-refcard.tex")
- ("\\`\\(refcards/\\)?fr-drdref\\.tex\\'" "refcards/fr-dired-ref.tex")
- ("^\\(TUTORIAL[^/]*\\)" "tutorials/\\1")
- ("\\`themes/dev-\\(tsdh-\\(?:light\\|dark\\)-theme\\.el\\)\\'"
- "themes/\\1")
- ;; Moved from lisp/toolbar to etc/images.
- ("\\`toolbar/\\(back\\|fwd\\|left\\|right\\|up\\)_arrow\
-\\(\\.\\(?:pb\\|xp\\)m\\)\\'" "images/\\1-arrow\\2")
- ("\\`toolbar/lc-\\(back\\|fwd\\|left\\|right\\|up\\)_arrow\
-\\(\\.\\(?:pb\\|xp\\)m\\)\\'" "images/low-color/\\1-arrow\\2")
- ("\\`toolbar/mail_\\(compose\\|send\\)\\(\\.[xp]bm\\)\\'"
- "images/mail/\\1")
- ("\\`toolbar/jump_to\\(\\.\\(?:pb\\|xp\\)m\\)\\'" "images/jump-to\\1")
- ("\\`toolbar/lc-jump_to\\(\\.\\(?:pb\\|xp\\)m\\)\\'"
- "images/low-color/jump-to\\1")
- ("\\`toolbar/\\(attach\\|cancel\\|close\\|copy\\|cut\\|\
-diropen\\|exit\\|help\\|home\\|index\\|info\\|mail\\|new\\|open\\|\
-paste\\|preferences\\|print\\|save\\|saveas\\|search\\|search-replace\\|\
-spell\\|undo\\)\\(\\.\\(?:pb\\|xp\\)m\\)\\'" "images/\\1\\2")
- ("\\`toolbar/gud-\\(break\\|cont\\|down\\|finish\\|print\\|pstar\\|\
-remove\\|run\\|until\\|up\\|watch\\)\\(\\.\\(?:pb\\|xp\\)m\\)\\'"
- "images/gud/\\1\\2")
- ("\\`\\(toolbar/gud-\\|images/gud/\\)n\\(i\\)?\\(\\.\\(?:pb\\|xp\\)m\\)\\'"
- "images/gud/next\\2\\3")
- ("\\`\\(toolbar/gud-\\|images/gud/\\)s\\(i\\)?\\(\\.\\(?:pb\\|xp\\)m\\)\\'"
- "images/gud/step\\2\\3")
- ("\\`toolbar/lc-\\([-a-z]+\\.xpm\\)\\'" "images/low-color/\\1")
- ("^\\(tree-widget/\\(?:default\\|folder\\)/[-a-z]+\\.\\(png\\|xpm\\)\\)$"
- "images/\\1")
- ("^\\(images/icons/\\)mac\\(emacs\\)_\\([0-9]+\\)\\(\\.png\\)"
- "\\1\\2\\3_mac\\4")
- ("\\(images/icons/\\)emacs_\\([0-9][0-9]\\)\\.png"
- "\\1hicolor/\\2x\\2/apps/emacs.png")
- ;; Moved from leim/ to lisp/leim/.
- ("\\`quail/[-a-z0-9]+\\.el\\'" "leim/\\&")
- ("\\`ja-dic/ja-dic\\.el\\'" "leim/\\&")
- ("\\`vc-\\(rcs\\|cvs\\|sccs\\)-hooks\\.el\\'" "vc/vc-\\1.el")
- ("\\`vc-\\(annotate\\|arch\\|bzr\\|cvs\\|dav\\|dir\\|dispatcher\\|\
-git\\|hg\\|hooks\\|mtn\\|rcs\\|sccs\\|svn\\)\\.el\\'" "vc/\\&")
- ("\\`ediff-\\(diff\\|help\\|hook\\|init\\|merg\\|mult\\|ptch\\|util\\|\
-vers\\|wind\\)\\.el\\'" "vc/\\&")
- ("\\`pcvs-\\(defs\\|info\\|parse\\|util\\)\\.el\\'" "vc/\\&")
- ("\\`\\(add-log\\|compare-w\\|cvs-status\\|diff-mode\\|diff\\|\
-ediff\\|emerge\\|log-edit\\|log-view\\|pcvs\\|smerge-mode\\|vc\\)\\.el\\'"
- "vc/\\&")
- ("\\`\\(emacs-lisp/\\)?helpers\\.el\\'" "emacs-lisp/subr-x.el")
- ;; I assume this is (essentially) what happened, org/ChangeLog is vague.
- ("\\`org-\\(ascii\\|beamer\\|html\\|icalendar\\|jsinfo\\|latex\
-\\|odt\\|publish\\)\\.el\\'" "ox-\\1.el")
- ;; From test/ to test/automated/.
- ("comint-testsuite.el" "automated/\\&")
- ("\\`\\(bytecomp\\|font-parse\\|icalendar\\|occur\\|newsticker\\)\
--testsuite\\.el" "automated/\\1-tests.el")
- ;; NB lax rules should come last.
- ("^m/m-\\(.*\\.h\\)$" "m/\\1" t)
- ("^m-\\(.*\\.h\\)$" "\\1" t)
- ("^s/s-\\(.*\\.h\\)$" "s/\\1" t)
- ("^s-\\(.*\\.h\\)$" "\\1" t)
- ("\\.\\(el\\|[ch]\\|x[pb]m\\|pbm\\)\\'" t t)
- )
- "List of regexps and rewriting rules for renamed files.
-Elements are (REGEXP REPLACE [LAX]). If REPLACE is a string, the file
-name matching REGEXP is replaced by REPLACE using `replace-string'.
-Otherwise, the file name is accepted as is.
-Elements with LAX non-nil are only used in `authors-lax-changelogs'.")
-
-;; It's really not worth trying to make these old logs fully valid.
-;; All the obvious real errors are gone.
-;; The main issue is _lots_ of moving around of files.
-;; Eg the progmodes/ (etc) directories did not exist before 1997.
-;; Also, lib-src/ did not exist, the files were in etc/.
-;; And various other things.
-;; Maybe this should just be any ChangeLog with a . extension,
-;; assuming we always fix logs fully before rotating them?
-(defconst authors-lax-changelogs
- '("erc/ChangeLog\\.0[1-8]\\'"
- "gnus/ChangeLog\\.[1-2]\\'"
- "lisp/ChangeLog\\.\\([1-9]\\|1[0-5]\\)\\'"
- "mh-e/ChangeLog\\.1\\'"
- "src/ChangeLog\\.\\([1-9]\\|1[0-2]\\)\\'")
- "List of regexps matching ChangeLogs that we do not print errors from.
-These are older ChangeLogs that have various issues.
-Additionally, for these logs we apply the `lax' elements of
-`authors-renamed-files-regexps'.")
-
-
-(defvar authors-checked-files-alist)
-(defvar authors-invalid-file-names)
-
-;; This has become rather yucky. :(
-(defun authors-disambiguate-file-name (fullname)
- "Convert FULLNAME to an unambiguous relative-name."
- (let ((relname (file-name-nondirectory fullname))
- dir parent)
- (if (and (member relname authors-ambiguous-files)
- ;; Try to identify the top-level directory.
- ;; FIXME should really use ROOT from M-x authors.
- (not (and (file-directory-p
- (expand-file-name
- "lib-src"
- (setq dir (file-name-directory fullname))))
- (file-directory-p (expand-file-name "etc" dir)))))
- ;; I think it looks weird to see eg "lisp/simple.el".
- ;; But for eg Makefile.in, we do want to say "lisp/Makefile.in".
- (if (and (string-equal "lisp"
- (setq parent (file-name-nondirectory
- (directory-file-name dir))))
- ;; TODO better to simply have hard-coded list?
- ;; Only really Makefile.in where this applies.
- (not (file-exists-p
- (expand-file-name (concat "../" relname) dir))))
- relname
- ;; In case of ambiguity, just prepend the parent directory.
- ;; FIXME obviously this is not a perfect solution.
- (format "%s/%s" (file-name-nondirectory (directory-file-name dir))
- relname))
- relname)))
-
-(defun authors-lax-changelog-p (file)
- "Return non-nil if FILE matches `authors-lax-changelogs'."
- (let ((list authors-lax-changelogs)
- found)
- (while list
- (setq list (if (setq found (string-match-p (car list) file))
- nil
- (cdr list))))
- found))
-
-(defun authors-canonical-file-name (file log-file pos author)
- "Return canonical file name for FILE found in LOG-FILE.
-Checks whether FILE is a valid (existing) file name, has been renamed,
-or is on the list of removed files. Returns the non-directory part of
-the file name. Only uses the LOG-FILE position POS and associated AUTHOR
-to print a message if FILE is not found."
- ;; FILE should be re-checked in every different directory associated
- ;; with a LOG-FILE. Eg configure.ac from src/ChangeLog is not the
- ;; same as that from top-level/ChangeLog.
- (let* ((fullname (expand-file-name file (file-name-directory log-file)))
- (entry (assoc fullname authors-checked-files-alist))
- laxlog relname valid)
- (if entry
- (cdr entry)
- (setq relname (file-name-nondirectory file))
- (if (or (member file authors-valid-file-names)
- (member relname authors-valid-file-names)
- (file-exists-p file)
- (file-exists-p relname) ; FIXME? appropriate?
- )
- (setq valid (authors-disambiguate-file-name fullname))
- (if (setq valid (assoc file authors-renamed-files-alist))
- (setq valid (cdr valid))
- (setq laxlog (authors-lax-changelog-p log-file))
- (let ((rules authors-renamed-files-regexps)
- rule)
- (while rules
- (setq rule (car rules))
- (if (and (or laxlog (not (nth 2 rule)))
- (string-match (car rule) file))
- (setq valid (if (stringp (nth 1 rule))
- (file-name-nondirectory
- (replace-match (nth 1 rule) t nil file))
- relname)
- rules nil)
- (setq rules (cdr rules)))))))
- (setq authors-checked-files-alist
- (cons (cons fullname valid) authors-checked-files-alist))
- (unless (or valid
- (member file authors-ignored-files)
- (authors-obsolete-file-p file)
- (string-match "[*]" file)
- (string-match "^[0-9.]+$" file)
- laxlog)
- (setq authors-invalid-file-names
- (cons (format "%s:%d: unrecognized `%s' for %s"
- log-file
- (1+ (count-lines (point-min) pos))
- file author)
- authors-invalid-file-names)))
- valid)))
-
-(defun authors-add-fixed-entries (table)
- "Add actions from `authors-fixed-entries' to TABLE."
- (dolist (entry authors-fixed-entries)
- (let ((author (car entry))
- action)
- (dolist (item (cdr entry))
- (if (symbolp item)
- (setq action item)
- (authors-add author item action table))))))
-
-
-(defun authors-obsolete-file-p (file)
- "Return non-nil if FILE is obsolete.
-FILE is considered obsolete if it matches one of the regular expressions
-from `authors-obsolete-files-regexps'."
- (let (obsolete-p
- (regexps authors-obsolete-files-regexps))
- (while (and regexps (not obsolete-p))
- (setq obsolete-p (string-match (car regexps) file)
- regexps (cdr regexps)))
- obsolete-p))
-
-
-(defun authors-add (author file action table)
- "Record that AUTHOR worked on FILE.
-ACTION is a keyword symbol describing what he did. Record file,
-author and what he did in hash table TABLE. See the description of
-`authors-scan-change-log' for the structure of the hash table."
- (unless (or (member file authors-ignored-files)
- (authors-obsolete-file-p file)
- (equal author ""))
- (let* ((value (gethash author table))
- (entry (assoc file value))
- slot)
- (if (null entry)
- (puthash author (cons (list file (cons action 1)) value) table)
- (if (setq slot (assoc action (cdr entry)))
- (setcdr slot (1+ (cdr slot)))
- (nconc entry (list (cons action 1))))))))
-
-
-(defun authors-canonical-author-name (author)
- "Return a canonicalized form of AUTHOR, an author name.
-If AUTHOR has an entry in `authors-aliases', use that. Remove
-email addresses. Capitalize words in the author's name, unless
-it is found in `authors-fixed-case'."
- (let* ((aliases authors-aliases)
- regexps realname)
- (while aliases
- (setq realname (car (car aliases))
- regexps (cdr (car aliases))
- aliases (cdr aliases))
- (while regexps
- (if (string-match (car regexps) author)
- (setq author realname
- regexps nil
- aliases nil)
- (setq regexps (cdr regexps))))))
- (when author
- (setq author (replace-regexp-in-string "[ \t]*[(<].*$" "" author))
- (setq author (replace-regexp-in-string "\`[ \t]+" "" author))
- (setq author (replace-regexp-in-string "[ \t]+$" "" author))
- (setq author (replace-regexp-in-string "[ \t]+" " " author))
- (unless (string-match "[-, \t]" author)
- (setq author ""))
- (or (car (member author authors-fixed-case))
- (capitalize author))))
-
-(defun authors-scan-change-log (log-file table)
- "Scan change log LOG-FILE for author information.
-
-For each change mentioned in the log, add an entry to hash table TABLE
-under the author's canonical name.
-
-Keys of TABLE are author names. Values are alists of entries (FILE
-\(ACTION . COUNT) ...). FILE is one file the author worked on. The
-rest of the entry is a list of keyword symbols describing what he did
-with the file and the number of each action:
-
-:wrote means the author wrote the file
-:cowrote means he wrote the file in collaboration with others
-:changed means he changed the file COUNT times."
-
- (let* ((enable-local-variables :safe) ; for find-file, hence let*
- (enable-local-eval nil)
- (existing-buffer (get-file-buffer log-file))
- (buffer (find-file-noselect log-file))
- authors pos)
- (with-current-buffer buffer
- (save-restriction
- (widen)
- (goto-char (point-min))
- (while (re-search-forward "^[0-9]\\|^[ \t]+\\* " nil t)
- (beginning-of-line)
- (setq pos (point))
- (cond ((looking-at "^[0-9]+-[0-9]+-[0-9]+")
- ;; Handle joint authorship of changes.
- ;; This can be a bit fragile, and is not too common.
- (setq authors nil)
- (while (progn
- (skip-chars-forward " \t+:0-9-")
- (not (looking-at "\\($\\|\\*\\|\
-Suggested\\|Trivial\\|Version\\|Originally\\|From:\\|Patch[ \t]+[Bb]y\\)")))
- (push (authors-canonical-author-name
- (buffer-substring-no-properties
- (point) (line-end-position))) authors)
- (forward-line 1)))
- ((looking-at "^[ \t]+\\*")
- (let ((line (buffer-substring-no-properties
- (match-end 0) (line-end-position))))
- (while (and (not (string-match ":" line))
- (forward-line 1)
- (not (looking-at ":\\|^[ \t]*$")))
- (setq line (concat line
- (buffer-substring-no-properties
- (line-beginning-position)
- (line-end-position)))))
- (when (string-match ":" line)
- (setq line (substring line 0 (match-beginning 0)))
- (setq line (replace-regexp-in-string "[[(<{].*$" "" line))
- (setq line (replace-regexp-in-string "," "" line))
- (dolist (file (split-string line))
- (when (setq file (authors-canonical-file-name file log-file pos (car authors)))
- (dolist (author authors)
- ;;(message "%s changed %s" author file)
- (authors-add author file :changed table)))))
- (forward-line 1)))))))
- (unless existing-buffer
- (kill-buffer buffer))))
-
-
-(defun authors-scan-el (file table)
- "Scan Lisp file FILE for author information.
-TABLE is a hash table to add author information to."
- (let* ((existing-buffer (get-file-buffer file))
- (enable-local-variables :safe) ; for find-file, hence let*
- (enable-local-eval nil)
- (buffer (find-file-noselect file)))
- (setq file (authors-disambiguate-file-name (expand-file-name file)))
- (with-current-buffer buffer
- (save-restriction
- (widen)
- (goto-char (point-min))
- (while (and (re-search-forward
- "^;+[ \t]*\\(Authors?\\|Commentary\\|Code\\):[ \t]*" nil t)
- (not (member (match-string 1) '("Commentary" "Code"))))
- (let ((continue t)
- (action :wrote)
- authors)
- (while continue
- ;; Some entries contain a year range in front of the
- ;; author's name.
- (skip-chars-forward "-0-9 \t")
- (push (authors-canonical-author-name
- (buffer-substring-no-properties
- (point) (line-end-position))) authors)
- ;; tips.texi says the continuation line should begin
- ;; with a tab, but often spaces are used.
- (setq continue
- (and (zerop (forward-line 1))
- (looking-at ";;;?\\(\t+ *\\| +\\)[[:alnum:]]")
- (goto-char (1- (match-end 0)))
- (not (looking-at "[[:upper:]][-[:alpha:]]+:[ \t]")))))
- (and (> (length authors) 1)
- (setq action :cowrote))
- (mapc (lambda (author)
- (authors-add author file action table))
- authors)))))
- (unless existing-buffer
- (kill-buffer buffer))))
-
-
-(defun authors-public-domain-p (file)
- "Return t if FILE is a file that was put in public domain."
- (let ((public-domain-p nil)
- (list authors-public-domain-files))
- (while (and list (not public-domain-p))
- (when (string-match (car list) file)
- (setq public-domain-p t))
- (setq list (cdr list)))
- public-domain-p))
-
-(defvar authors-author-list)
-
-(defun authors-add-to-author-list (author changes)
- "Insert information about AUTHOR's work on Emacs into `authors-author-list'.
-CHANGES is an alist of entries (FILE (ACTION . COUNT) ...), as produced by
-`authors-scan-change-log'.
-The element added to `authors-author-list' is (AUTHOR WROTE CO-WROTE CHANGED),
-where WROTE, CO-WROTE, and CHANGED are lists of the files written, co-written
-and changed by AUTHOR."
- (when author
- (let ((nchanged 0)
- wrote-list
- cowrote-list
- changed-list)
- (dolist (change changes)
- (let* ((actions (cdr change))
- (file (car change))
- (filestat (if (authors-public-domain-p file)
- (concat file " (public domain)")
- file)))
- (cond ((assq :wrote actions)
- (setq wrote-list (cons filestat wrote-list)))
- ((assq :cowrote actions)
- (setq cowrote-list (cons filestat cowrote-list)))
- (t
- (setq changed-list
- (cons (cons file (cdr (assq :changed actions)))
- changed-list))))))
- (if wrote-list
- (setq wrote-list (sort wrote-list 'string-lessp)))
- (if cowrote-list
- (setq cowrote-list (sort cowrote-list 'string-lessp)))
- (when changed-list
- (setq changed-list (sort changed-list
- (lambda (a b)
- (if (= (cdr a) (cdr b))
- (string-lessp (car a) (car b))
- (> (cdr a) (cdr b))))))
- (setq nchanged (length changed-list))
- (setq changed-list (mapcar 'car changed-list)))
- (if (> (- nchanged authors-many-files) 2)
- (setcdr (nthcdr authors-many-files changed-list)
- (list (format "and %d other files" (- nchanged authors-many-files)))))
- (setq authors-author-list
- (cons (list author wrote-list cowrote-list changed-list)
- authors-author-list)))))
-
-(defun authors (root)
- "Extract author information from change logs and Lisp source files.
-ROOT is the root directory under which to find the files. If called
-interactively, ROOT is read from the minibuffer.
-Result is a buffer *Authors* containing authorship information, and a
-buffer *Authors Errors* containing references to unknown files."
- (interactive "DEmacs source directory: ")
- (setq root (expand-file-name root))
- (let ((logs (process-lines find-program root "-name" "ChangeLog*"))
- (table (make-hash-table :test 'equal))
- (buffer-name "*Authors*")
- authors-checked-files-alist
- authors-invalid-file-names)
- (authors-add-fixed-entries table)
- (unless (file-exists-p (expand-file-name "src/emacs.c" root))
- (unless (y-or-n-p
- (format "Not the root directory of Emacs: %s, continue? " root))
- (error "Not the root directory")))
- (dolist (log logs)
- (when (string-match "ChangeLog\\(.[0-9]+\\)?$" log)
- (message "Scanning %s..." log)
- (authors-scan-change-log log table)))
- (let ((els (process-lines find-program root "-name" "*.el")))
- (dolist (file els)
- (message "Scanning %s..." file)
- (authors-scan-el file table)))
- (message "Generating buffer %s..." buffer-name)
- (set-buffer (get-buffer-create buffer-name))
- (erase-buffer)
- (set-buffer-file-coding-system authors-coding-system)
- (insert
-"Many people have contributed code included in the Free Software
-Foundation's distribution of GNU Emacs. To show our appreciation for
-their public spirit, we list here in alphabetical order a condensed
-list of their contributions.\n")
- (let (authors-author-list)
- (maphash #'authors-add-to-author-list table)
- (setq authors-author-list
- (sort authors-author-list
- (lambda (a b) (string-lessp (car a) (car b)))))
- (dolist (a authors-author-list)
- (let ((author (car a))
- (wrote (nth 1 a))
- (cowrote (nth 2 a))
- (changed (nth 3 a)))
- (insert "\n" author ": ")
- (when wrote
- (insert "wrote")
- (dolist (file wrote)
- (if (> (+ (current-column) (length file)) 72)
- (insert "\n "))
- (insert " " file))
- (insert "\n"))
- (when cowrote
- (if wrote
- (insert "and "))
- (insert "co-wrote")
- (dolist (file cowrote)
- (if (> (+ (current-column) (length file)) 72)
- (insert "\n "))
- (insert " " file))
- (insert "\n"))
- (when changed
- (if (or wrote cowrote)
- (insert "and "))
- (insert "changed")
- (dolist (file changed)
- (if (> (+ (current-column) (length file)) 72)
- (insert "\n "))
- (insert " " file))
- (insert "\n")))))
- (insert "\nLocal" " Variables:\ncoding: "
- (symbol-name authors-coding-system) "\nEnd:\n")
- (message "Generating buffer %s... done" buffer-name)
- (unless noninteractive
- (when authors-invalid-file-names
- (with-current-buffer (get-buffer-create "*Authors Errors*")
- (setq buffer-read-only nil)
- (erase-buffer)
- (set-buffer-file-coding-system authors-coding-system)
- (insert "Unrecognized file entries found:\n\n")
- (mapc (lambda (f) (if (not (string-match "^[A-Za-z]+$" f)) (insert f "\n")))
- (sort authors-invalid-file-names 'string-lessp))
- (goto-char (point-min))
- (compilation-mode)
- (message "Errors were found. See buffer %s" (buffer-name))))
- (pop-to-buffer buffer-name))))
-
-
-(defun batch-update-authors ()
- "Produce an AUTHORS file.
-Call this function in batch mode with two command line arguments FILE
-and ROOT. FILE is the file to write, ROOT is the root directory of
-the Emacs source tree, from which to build the file."
- (unless noninteractive
- (error "`batch-update-authors' is to be used only with -batch"))
- (when (/= (length command-line-args-left) 2)
- (error "Call `batch-update-authors' with the name of the file to write"))
- (let* ((file (pop command-line-args-left))
- (root (pop command-line-args-left)))
- (authors root)
- (write-file file)))
-
-(provide 'authors)
-
-;;; authors.el ends here
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index fe6640cc51e..ee0a5a11c7b 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -944,15 +944,6 @@
form
(nth 1 form)))
-(defun byte-optimize-zerop (form)
- (cond ((numberp (nth 1 form))
- (eval form))
- (byte-compile-delete-errors
- (list '= (nth 1 form) 0))
- (form)))
-
-(put 'zerop 'byte-optimizer 'byte-optimize-zerop)
-
(defun byte-optimize-and (form)
;; Simplify if less than 2 args.
;; if there is a literal nil in the args to `and', throw it and following
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 4b9e6d8fd23..0edcf6197b4 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -30,6 +30,17 @@
;;; Code:
+(defalias 'function-put
+ ;; We don't want people to just use `put' because we can't conveniently
+ ;; hook into `put' to remap old properties to new ones. But for now, there's
+ ;; no such remapping, so we just call `put'.
+ #'(lambda (f prop value) (put f prop value))
+ "Set function F's property PROP to VALUE.
+The namespace for PROP is shared with symbols.
+So far, F can only be a symbol, not a lambda expression.")
+(function-put 'defmacro 'doc-string-elt 3)
+(function-put 'defmacro 'lisp-indent-function 2)
+
;; `macro-declaration-function' are both obsolete (as marked at the end of this
;; file) but used in many .elc files.
@@ -69,6 +80,7 @@ The return value of this function is not used."
;; handle declarations in macro definitions and this is the first file
;; loaded by loadup.el that uses declarations in macros.
+;; Add any new entries to info node `(elisp)Declare Form'.
(defvar defun-declarations-alist
(list
;; We can only use backquotes inside the lambdas and not for those
@@ -81,27 +93,47 @@ The return value of this function is not used."
#'(lambda (f _args new-name when)
(list 'make-obsolete
(list 'quote f) (list 'quote new-name) (list 'quote when))))
+ (list 'interactive-only
+ #'(lambda (f _args instead)
+ (list 'function-put (list 'quote f)
+ ''interactive-only (list 'quote instead))))
+ ;; FIXME: Merge `pure' and `side-effect-free'.
+ (list 'pure
+ #'(lambda (f _args val)
+ (list 'function-put (list 'quote f)
+ ''pure (list 'quote val)))
+ "If non-nil, the compiler can replace calls with their return value.
+This may shift errors from run-time to compile-time.")
+ (list 'side-effect-free
+ #'(lambda (f _args val)
+ (list 'function-put (list 'quote f)
+ ''side-effect-free (list 'quote val)))
+ "If non-nil, calls can be ignored if their value is unused.
+If `error-free', drop calls even if `byte-compile-delete-errors' is nil.")
(list 'compiler-macro
#'(lambda (f args compiler-function)
`(eval-and-compile
- (put ',f 'compiler-macro
- ,(if (eq (car-safe compiler-function) 'lambda)
- `(lambda ,(append (cadr compiler-function) args)
- ,@(cddr compiler-function))
- `#',compiler-function)))))
+ (function-put ',f 'compiler-macro
+ ,(if (eq (car-safe compiler-function) 'lambda)
+ `(lambda ,(append (cadr compiler-function) args)
+ ,@(cddr compiler-function))
+ `#',compiler-function)))))
(list 'doc-string
#'(lambda (f _args pos)
- (list 'put (list 'quote f) ''doc-string-elt (list 'quote pos))))
+ (list 'function-put (list 'quote f)
+ ''doc-string-elt (list 'quote pos))))
(list 'indent
#'(lambda (f _args val)
- (list 'put (list 'quote f)
+ (list 'function-put (list 'quote f)
''lisp-indent-function (list 'quote val)))))
"List associating function properties to their macro expansion.
Each element of the list takes the form (PROP FUN) where FUN is
a function. For each (PROP . VALUES) in a function's declaration,
the FUN corresponding to PROP is called with the function name,
the function's arglist, and the VALUES and should return the code to use
-to set this property.")
+to set this property.
+
+This is used by `declare'.")
(defvar macro-declarations-alist
(cons
@@ -115,10 +147,10 @@ to set this property.")
Each element of the list takes the form (PROP FUN) where FUN is a function.
For each (PROP . VALUES) in a macro's declaration, the FUN corresponding
to PROP is called with the macro name, the macro's arglist, and the VALUES
-and should return the code to use to set this property.")
+and should return the code to use to set this property.
+
+This is used by `declare'.")
-(put 'defmacro 'doc-string-elt 3)
-(put 'defmacro 'lisp-indent-function 2)
(defalias 'defmacro
(cons
'macro
@@ -218,7 +250,8 @@ The return value is undefined.
(cons arglist body))))))
(if declarations
(cons 'prog1 (cons def declarations))
- def))))
+ def))))
+
;; Redefined in byte-optimize.el.
;; This is not documented--it's not clear that we should promote it.
@@ -389,13 +422,20 @@ If you think you need this, you're probably making a mistake somewhere."
(defmacro eval-when-compile (&rest body)
"Like `progn', but evaluates the body at compile time if you're compiling.
-Thus, the result of the body appears to the compiler as a quoted constant.
-In interpreted code, this is entirely equivalent to `progn'."
+Thus, the result of the body appears to the compiler as a quoted
+constant. In interpreted code, this is entirely equivalent to
+`progn', except that the value of the expression may be (but is
+not necessarily) computed at load time if eager macro expansion
+is enabled."
(declare (debug (&rest def-form)) (indent 0))
(list 'quote (eval (cons 'progn body) lexical-binding)))
(defmacro eval-and-compile (&rest body)
- "Like `progn', but evaluates the body at compile time and at load time."
+ "Like `progn', but evaluates the body at compile time and at
+load time. In interpreted code, this is entirely equivalent to
+`progn', except that the value of the expression may be (but is
+not necessarily) computed at load time if eager macro expansion
+is enabled."
(declare (debug t) (indent 0))
;; When the byte-compiler expands code, this macro is not used, so we're
;; either about to run `body' (plain interpretation) or we're doing eager
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e5f8a8cc22a..9c52cc44eb4 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -421,31 +421,46 @@ Filled in `cconv-analyse-form' but initialized and consulted here.")
(defvar byte-compiler-error-flag)
+(defun byte-compile-recurse-toplevel (form non-toplevel-case)
+ "Implement `eval-when-compile' and `eval-and-compile'.
+Return the compile-time value of FORM."
+ ;; Macroexpand (not macroexpand-all!) form at toplevel in case it
+ ;; expands into a toplevel-equivalent `progn'. See CLHS section
+ ;; 3.2.3.1, "Processing of Top Level Forms". The semantics are very
+ ;; subtle: see test/automated/bytecomp-tests.el for interesting
+ ;; cases.
+ (setf form (macroexpand form byte-compile-macro-environment))
+ (if (eq (car-safe form) 'progn)
+ (cons 'progn
+ (mapcar (lambda (subform)
+ (byte-compile-recurse-toplevel
+ subform non-toplevel-case))
+ (cdr form)))
+ (funcall non-toplevel-case form)))
+
(defconst byte-compile-initial-macro-environment
- '(
+ `(
;; (byte-compiler-options . (lambda (&rest forms)
;; (apply 'byte-compiler-options-handler forms)))
(declare-function . byte-compile-macroexpand-declare-function)
- (eval-when-compile . (lambda (&rest body)
- (list
- 'quote
- (byte-compile-eval
- (byte-compile-top-level
- (byte-compile-preprocess (cons 'progn body)))))))
- (eval-and-compile . (lambda (&rest body)
- ;; Byte compile before running it. Do it piece by
- ;; piece, in case further expressions need earlier
- ;; ones to be evaluated already, as is the case in
- ;; eieio.el.
- `(progn
- ,@(mapcar (lambda (exp)
- (let ((cexp
- (byte-compile-top-level
- (byte-compile-preprocess
- exp))))
- (eval cexp)
- cexp))
- body)))))
+ (eval-when-compile . ,(lambda (&rest body)
+ (let ((result nil))
+ (byte-compile-recurse-toplevel
+ (cons 'progn body)
+ (lambda (form)
+ (setf result
+ (byte-compile-eval
+ (byte-compile-top-level
+ (byte-compile-preprocess form))))))
+ (list 'quote result))))
+ (eval-and-compile . ,(lambda (&rest body)
+ (byte-compile-recurse-toplevel
+ (cons 'progn body)
+ (lambda (form)
+ (let ((compiled (byte-compile-top-level
+ (byte-compile-preprocess form))))
+ (eval compiled lexical-binding)
+ compiled))))))
"The default macro-environment passed to macroexpand by the compiler.
Placing a macro here will cause a macro to have different semantics when
expanded by the compiler as when expanded by the interpreter.")
@@ -2198,9 +2213,12 @@ list that represents a doc string reference.
(t form)))
;; byte-hunk-handlers cannot call this!
-(defun byte-compile-toplevel-file-form (form)
- (let ((byte-compile-current-form nil)) ; close over this for warnings.
- (byte-compile-file-form (byte-compile-preprocess form t))))
+(defun byte-compile-toplevel-file-form (top-level-form)
+ (byte-compile-recurse-toplevel
+ top-level-form
+ (lambda (form)
+ (let ((byte-compile-current-form nil)) ; close over this for warnings.
+ (byte-compile-file-form (byte-compile-preprocess form t))))))
;; byte-hunk-handlers can call this.
(defun byte-compile-file-form (form)
@@ -2942,8 +2960,11 @@ for symbols generated by the byte compiler itself."
interactive-only))
(t "."))))
(if (eq (car-safe (symbol-function (car form))) 'macro)
- (byte-compile-log-warning
- (format "Forgot to expand macro %s" (car form)) nil :error))
+ (progn
+ (debug)
+ (byte-compile-log-warning
+ (format "Forgot to expand macro %s in %S" (car form) form)
+ nil :error)))
(if (and handler
;; Make sure that function exists.
(and (functionp handler)
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index 9b28289e0b9..3761d04c2c2 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -269,43 +269,20 @@ If so, return the true (non-nil) value returned by PREDICATE.
;;;###autoload
(defun cl--map-overlays (cl-func &optional cl-buffer cl-start cl-end cl-arg)
(or cl-buffer (setq cl-buffer (current-buffer)))
- (if (fboundp 'overlay-lists)
-
- ;; This is the preferred algorithm, though overlay-lists is undocumented.
- (let (cl-ovl)
- (with-current-buffer cl-buffer
- (setq cl-ovl (overlay-lists))
- (if cl-start (setq cl-start (copy-marker cl-start)))
- (if cl-end (setq cl-end (copy-marker cl-end))))
- (setq cl-ovl (nconc (car cl-ovl) (cdr cl-ovl)))
- (while (and cl-ovl
- (or (not (overlay-start (car cl-ovl)))
- (and cl-end (>= (overlay-start (car cl-ovl)) cl-end))
- (and cl-start (<= (overlay-end (car cl-ovl)) cl-start))
- (not (funcall cl-func (car cl-ovl) cl-arg))))
- (setq cl-ovl (cdr cl-ovl)))
- (if cl-start (set-marker cl-start nil))
- (if cl-end (set-marker cl-end nil)))
-
- ;; This alternate algorithm fails to find zero-length overlays.
- (let ((cl-mark (with-current-buffer cl-buffer
- (copy-marker (or cl-start (point-min)))))
- (cl-mark2 (and cl-end (with-current-buffer cl-buffer
- (copy-marker cl-end))))
- cl-pos cl-ovl)
- (while (save-excursion
- (and (setq cl-pos (marker-position cl-mark))
- (< cl-pos (or cl-mark2 (point-max)))
- (progn
- (set-buffer cl-buffer)
- (setq cl-ovl (overlays-at cl-pos))
- (set-marker cl-mark (next-overlay-change cl-pos)))))
- (while (and cl-ovl
- (or (/= (overlay-start (car cl-ovl)) cl-pos)
- (not (and (funcall cl-func (car cl-ovl) cl-arg)
- (set-marker cl-mark nil)))))
- (setq cl-ovl (cdr cl-ovl))))
- (set-marker cl-mark nil) (if cl-mark2 (set-marker cl-mark2 nil)))))
+ (let (cl-ovl)
+ (with-current-buffer cl-buffer
+ (setq cl-ovl (overlay-lists))
+ (if cl-start (setq cl-start (copy-marker cl-start)))
+ (if cl-end (setq cl-end (copy-marker cl-end))))
+ (setq cl-ovl (nconc (car cl-ovl) (cdr cl-ovl)))
+ (while (and cl-ovl
+ (or (not (overlay-start (car cl-ovl)))
+ (and cl-end (>= (overlay-start (car cl-ovl)) cl-end))
+ (and cl-start (<= (overlay-end (car cl-ovl)) cl-start))
+ (not (funcall cl-func (car cl-ovl) cl-arg))))
+ (setq cl-ovl (cdr cl-ovl)))
+ (if cl-start (set-marker cl-start nil))
+ (if cl-end (set-marker cl-end nil))))
;;; Support for `setf'.
;;;###autoload
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 6c62ce5c830..2d8a1c4c1c2 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -27,6 +27,8 @@
;; This package supplies a single entry point, common-lisp-indent-function,
;; which performs indentation in the preferred style for Common Lisp code.
+;; It is also a suitable function for indenting Emacs lisp code.
+;;
;; To enable it:
;;
;; (setq lisp-indent-function 'common-lisp-indent-function)
@@ -154,6 +156,15 @@ is set to `defun'.")
(looking-at "\\sw"))
(error t)))
+(defun lisp-indent-find-method (symbol &optional no-compat)
+ "Find the lisp indentation function for SYMBOL.
+If NO-COMPAT is non-nil, do not retrieve indenters intended for
+the standard lisp indent package."
+ (or (and (derived-mode-p 'emacs-lisp-mode)
+ (get symbol 'common-lisp-indent-function-for-elisp))
+ (get symbol 'common-lisp-indent-function)
+ (and (not no-compat)
+ (get symbol 'lisp-indent-function))))
(defun common-lisp-loop-part-indentation (indent-point state)
"Compute the indentation of loop form constituents."
@@ -245,9 +256,17 @@ For example, the function `case' has an indent property
* indent the first argument by 4.
* arguments after the first should be lists, and there may be any number
of them. The first list element has an offset of 2, all the rest
- have an offset of 2+1=3."
+ have an offset of 2+1=3.
+
+If the current mode is actually `emacs-lisp-mode', look for a
+`common-lisp-indent-function-for-elisp' property before looking
+at `common-lisp-indent-function' and, if set, use its value
+instead."
+ ;; FIXME: why do we need to special-case loop?
(if (save-excursion (goto-char (elt state 1))
- (looking-at "([Ll][Oo][Oo][Pp]"))
+ (looking-at (if (derived-mode-p 'emacs-lisp-mode)
+ "(\\(cl-\\)?[Ll][Oo][Oo][Pp]"
+ "([Ll][Oo][Oo][Pp]")))
(common-lisp-loop-part-indentation indent-point state)
(common-lisp-indent-function-1 indent-point state)))
@@ -291,18 +310,29 @@ For example, the function `case' has an indent property
(setq function (downcase (buffer-substring-no-properties
tem (point))))
(goto-char tem)
+ ;; Elisp generally provides CL functionality with a CL
+ ;; prefix, so if we have a special indenter for the
+ ;; unprefixed version, prefer it over whatever's defined
+ ;; for the cl- version. Users can override this
+ ;; heuristic by defining a
+ ;; common-lisp-indent-function-for-elisp property on the
+ ;; cl- version.
+ (when (and (derived-mode-p 'emacs-lisp-mode)
+ (not (lisp-indent-find-method
+ (intern-soft function) t))
+ (string-match "\\`cl-" function)
+ (setf tem (intern-soft
+ (substring function (match-end 0))))
+ (lisp-indent-find-method tem t))
+ (setf function (symbol-name tem)))
(setq tem (intern-soft function)
- method (get tem 'common-lisp-indent-function))
- (cond ((and (null method)
- (string-match ":[^:]+" function))
- ;; The pleblisp package feature
- (setq function (substring function
- (1+ (match-beginning 0)))
- method (get (intern-soft function)
- 'common-lisp-indent-function)))
- ((and (null method))
- ;; backwards compatibility
- (setq method (get tem 'lisp-indent-function)))))
+ method (lisp-indent-find-method tem))
+ ;; The pleblisp package feature
+ (when (and (null tem)
+ (string-match ":[^:]+" function))
+ (setq function (substring function (1+ (match-beginning 0)))
+ tem (intern-soft function)
+ method (lisp-indent-find-method tem))))
(let ((n 0))
;; How far into the containing form is the current form?
(if (< (point) indent-point)
@@ -764,7 +794,11 @@ optional\\|rest\\|key\\|allow-other-keys\\|aux\\|whole\\|body\\|environment\
(put (car el) 'common-lisp-indent-function
(if (symbolp (cdr el))
(get (cdr el) 'common-lisp-indent-function)
- (car (cdr el))))))
+ (car (cdr el))))))
+
+;; In elisp, the else part of `if' is in an implicit progn, so indent
+;; it more.
+(put 'if 'common-lisp-indent-function-for-elisp 2)
;(defun foo (x)
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 219d76f85d1..c4b9673aa2a 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -152,9 +152,6 @@ an element already on the list.
`(setq ,place (cl-adjoin ,x ,place ,@keys)))
`(cl-callf2 cl-adjoin ,x ,place ,@keys)))
-(defun cl--set-elt (seq n val)
- (if (listp seq) (setcar (nthcdr n seq) val) (aset seq n val)))
-
(defun cl--set-buffer-substring (start end val)
(save-excursion (delete-region start end)
(goto-char start)
@@ -361,7 +358,13 @@ SEQ, this is like `mapcar'. With several, it is like the Common Lisp
(cl--defalias 'cl-first 'car)
(cl--defalias 'cl-second 'cadr)
(cl--defalias 'cl-rest 'cdr)
-(cl--defalias 'cl-endp 'null)
+
+(defun cl-endp (x)
+ "Return true if X is the empty list; false if it is a cons.
+Signal an error if X is not a list."
+ (if (listp x)
+ (null x)
+ (signal 'wrong-type-argument (list 'listp x 'x))))
(cl--defalias 'cl-third 'cl-caddr "Return the third element of the list X.")
(cl--defalias 'cl-fourth 'cl-cadddr "Return the fourth element of the list X.")
@@ -625,7 +628,6 @@ If ALIST is non-nil, the new pairs are prepended to it."
`(insert (prog1 ,store (erase-buffer))))
(gv-define-simple-setter buffer-substring cl--set-buffer-substring)
(gv-define-simple-setter current-buffer set-buffer)
-(gv-define-simple-setter current-case-table set-case-table)
(gv-define-simple-setter current-column move-to-column t)
(gv-define-simple-setter current-global-map use-global-map t)
(gv-define-setter current-input-mode (store)
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index e45efa328ee..0a426d17096 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -135,7 +135,13 @@
(t t)))
(defun cl--const-expr-val (x)
- (and (macroexp-const-p x) (if (consp x) (nth 1 x) x)))
+ "Return the value of X known at compile-time.
+If X is not known at compile time, return nil. Before testing
+whether X is known at compile time, macroexpand it completely in
+`macroexpand-all-environment'."
+ (let ((x (macroexpand-all x macroexpand-all-environment)))
+ (if (macroexp-const-p x)
+ (if (consp x) (nth 1 x) x))))
(defun cl--expr-contains (x y)
"Count number of times X refers to Y. Return nil for 0 times."
@@ -1540,7 +1546,7 @@ If BODY is `setq', then use SPECS for assignments rather than for bindings."
(if (and (cl--unused-var-p temp) (null expr))
nil ;; Don't bother declaring/setting `temp' since it won't
;; be used when `expr' is nil, anyway.
- (when (or (null temp)
+ (when (or (null temp)
(and (eq body 'setq) (cl--unused-var-p temp)))
;; Prefer a fresh uninterned symbol over "_to", to avoid
;; warnings that we set an unused variable.
@@ -1878,13 +1884,13 @@ This is like `cl-flet', but for macros instead of functions.
cl-declarations body)))
(if (cdr bindings)
`(cl-macrolet (,(car bindings)) (cl-macrolet ,(cdr bindings) ,@body))
- (if (null bindings) (cons 'progn body)
+ (if (null bindings) (macroexp-progn body)
(let* ((name (caar bindings))
(res (cl--transform-lambda (cdar bindings) name)))
(eval (car res))
- (macroexpand-all (cons 'progn body)
- (cons (cons name `(lambda ,@(cdr res)))
- macroexpand-all-environment))))))
+ (macroexpand-all (macroexp-progn body)
+ (cons (cons name `(lambda ,@(cdr res)))
+ macroexpand-all-environment))))))
(defconst cl--old-macroexpand
(if (and (boundp 'cl--old-macroexpand)
@@ -2057,10 +2063,21 @@ values. For compatibility, (cl-values A B C) is a synonym for (list A B C).
(declare (debug t))
(cons 'progn body))
;;;###autoload
-(defmacro cl-the (_type form)
- "At present this ignores TYPE and is simply equivalent to FORM."
+(defmacro cl-the (type form)
+ "Return FORM. If type-checking is enabled, assert that it is of TYPE."
(declare (indent 1) (debug (cl-type-spec form)))
- form)
+ (if (not (or (not (cl--compiling-file))
+ (< cl--optimize-speed 3)
+ (= cl--optimize-safety 3)))
+ form
+ (let* ((temp (if (cl--simple-expr-p form 3)
+ form (make-symbol "--cl-var--")))
+ (body `(progn (unless ,(cl--make-type-test temp type)
+ (signal 'wrong-type-argument
+ (list ',type ,temp ',form)))
+ ,temp)))
+ (if (eq temp form) body
+ `(let ((,temp ,form)) ,body)))))
(defvar cl--proclaim-history t) ; for future compilers
(defvar cl--declare-stack t) ; for future compilers
@@ -2572,21 +2589,38 @@ non-nil value, that slot cannot be set via `setf'.
(put ',name 'cl-struct-include ',include)
(put ',name 'cl-struct-print ,print-auto)
,@(mapcar (lambda (x)
- `(put ',(car x) 'side-effect-free ',(cdr x)))
+ `(function-put ',(car x) 'side-effect-free ',(cdr x)))
side-eff))
forms)
`(progn ,@(nreverse (cons `',name forms)))))
-;;; Types and assertions.
-
-;;;###autoload
-(defmacro cl-deftype (name arglist &rest body)
- "Define NAME as a new data type.
-The type name can then be used in `cl-typecase', `cl-check-type', etc."
- (declare (debug cl-defmacro) (doc-string 3) (indent 2))
- `(cl-eval-when (compile load eval)
- (put ',name 'cl-deftype-handler
- (cl-function (lambda (&cl-defs '('*) ,@arglist) ,@body)))))
+(defun cl-struct-sequence-type (struct-type)
+ "Return the sequence used to build STRUCT-TYPE.
+STRUCT-TYPE is a symbol naming a struct type. Return 'vector or
+'list, or nil if STRUCT-TYPE is not a struct type. "
+ (declare (side-effect-free t) (pure t))
+ (car (get struct-type 'cl-struct-type)))
+
+(defun cl-struct-slot-info (struct-type)
+ "Return a list of slot names of struct STRUCT-TYPE.
+Each entry is a list (SLOT-NAME . OPTS), where SLOT-NAME is a
+slot name symbol and OPTS is a list of slot options given to
+`cl-defstruct'. Dummy slots that represent the struct name and
+slots skipped by :initial-offset may appear in the list."
+ (declare (side-effect-free t) (pure t))
+ (get struct-type 'cl-struct-slots))
+
+(defun cl-struct-slot-offset (struct-type slot-name)
+ "Return the offset of slot SLOT-NAME in STRUCT-TYPE.
+The returned zero-based slot index is relative to the start of
+the structure data type and is adjusted for any structure name
+and :initial-offset slots. Signal error if struct STRUCT-TYPE
+does not contain SLOT-NAME."
+ (declare (side-effect-free t) (pure t))
+ (or (cl-position slot-name
+ (cl-struct-slot-info struct-type)
+ :key #'car :test #'eq)
+ (error "struct %s has no slot %s" struct-type slot-name)))
(defvar byte-compile-function-environment)
(defvar byte-compile-macro-environment)
@@ -2873,19 +2907,47 @@ The function's arguments should be treated as immutable.
;;; Things that are inline.
(cl-proclaim '(inline cl-acons cl-map cl-concatenate cl-notany
- cl-notevery cl--set-elt cl-revappend cl-nreconc gethash))
+ cl-notevery cl-revappend cl-nreconc gethash))
;;; Things that are side-effect-free.
-(mapc (lambda (x) (put x 'side-effect-free t))
+(mapc (lambda (x) (function-put x 'side-effect-free t))
'(cl-oddp cl-evenp cl-signum last butlast cl-ldiff cl-pairlis cl-gcd
cl-lcm cl-isqrt cl-floor cl-ceiling cl-truncate cl-round cl-mod cl-rem
cl-subseq cl-list-length cl-get cl-getf))
;;; Things that are side-effect-and-error-free.
-(mapc (lambda (x) (put x 'side-effect-free 'error-free))
+(mapc (lambda (x) (function-put x 'side-effect-free 'error-free))
'(eql cl-list* cl-subst cl-acons cl-equalp
cl-random-state-p copy-tree cl-sublis))
+;;; Types and assertions.
+
+;;;###autoload
+(defmacro cl-deftype (name arglist &rest body)
+ "Define NAME as a new data type.
+The type name can then be used in `cl-typecase', `cl-check-type', etc."
+ (declare (debug cl-defmacro) (doc-string 3) (indent 2))
+ `(cl-eval-when (compile load eval)
+ (put ',name 'cl-deftype-handler
+ (cl-function (lambda (&cl-defs '('*) ,@arglist) ,@body)))))
+
+;;; Additional functions that we can now define because we've defined
+;;; `cl-defsubst' and `cl-typep'.
+
+(cl-defsubst cl-struct-slot-value (struct-type slot-name inst)
+ ;; The use of `cl-defsubst' here gives us both a compiler-macro
+ ;; and a gv-expander "for free".
+ "Return the value of slot SLOT-NAME in INST of STRUCT-TYPE.
+STRUCT and SLOT-NAME are symbols. INST is a structure instance."
+ (declare (side-effect-free t))
+ (unless (cl-typep inst struct-type)
+ (signal 'wrong-type-argument (list struct-type inst)))
+ ;; We could use `elt', but since the byte compiler will resolve the
+ ;; branch below at compile time, it's more efficient to use the
+ ;; type-specific accessor.
+ (if (eq (cl-struct-sequence-type struct-type) 'vector)
+ (aref inst (cl-struct-slot-offset struct-type slot-name))
+ (nth (cl-struct-slot-offset struct-type slot-name) inst)))
(run-hooks 'cl-macs-load-hook)
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index aa88264c4ab..a7078328748 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -166,7 +166,7 @@ SEQ1 is destructively modified, then returned.
(cl-n (min (- (or cl-end1 cl-len) cl-start1)
(- (or cl-end2 cl-len) cl-start2))))
(while (>= (setq cl-n (1- cl-n)) 0)
- (cl--set-elt cl-seq1 (+ cl-start1 cl-n)
+ (setf (elt cl-seq1 (+ cl-start1 cl-n))
(elt cl-seq2 (+ cl-start2 cl-n))))))
(if (listp cl-seq1)
(let ((cl-p1 (nthcdr cl-start1 cl-seq1))
@@ -392,7 +392,7 @@ to avoid corrupting the original SEQ.
cl-seq
(setq cl-seq (copy-sequence cl-seq))
(or cl-from-end
- (progn (cl--set-elt cl-seq cl-i cl-new)
+ (progn (setf (elt cl-seq cl-i) cl-new)
(setq cl-i (1+ cl-i) cl-count (1- cl-count))))
(apply 'cl-nsubstitute cl-new cl-old cl-seq :count cl-count
:start cl-i cl-keys))))))
@@ -439,7 +439,7 @@ This is a destructive function; it reuses the storage of SEQ whenever possible.
(setq cl-end (1- cl-end))
(if (cl--check-test cl-old (elt cl-seq cl-end))
(progn
- (cl--set-elt cl-seq cl-end cl-new)
+ (setf (elt cl-seq cl-end) cl-new)
(setq cl-count (1- cl-count)))))
(while (and (< cl-start cl-end) (> cl-count 0))
(if (cl--check-test cl-old (aref cl-seq cl-start))
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index c64ec52decb..7102b5549eb 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -298,8 +298,8 @@ Otherwise work like `message'."
;;;###autoload
-(defvar eldoc-documentation-function nil
- "If non-nil, function to call to return doc string.
+(defvar eldoc-documentation-function #'eldoc-documentation-function-default
+ "Function to call to return doc string.
The function of no args should return a one-line string for displaying
doc about a function etc. appropriate to the context around point.
It should return nil if there's no doc appropriate for the context.
@@ -323,22 +323,20 @@ Emacs Lisp mode) that support ElDoc.")
(when eldoc-last-message
(eldoc-message nil)
nil))
- (if eldoc-documentation-function
- (eldoc-message (funcall eldoc-documentation-function))
- (let* ((current-symbol (eldoc-current-symbol))
- (current-fnsym (eldoc-fnsym-in-current-sexp))
- (doc (cond
- ((null current-fnsym)
- nil)
- ((eq current-symbol (car current-fnsym))
- (or (apply 'eldoc-get-fnsym-args-string
- current-fnsym)
- (eldoc-get-var-docstring current-symbol)))
- (t
- (or (eldoc-get-var-docstring current-symbol)
- (apply 'eldoc-get-fnsym-args-string
- current-fnsym))))))
- (eldoc-message doc))))))
+ (eldoc-message (funcall eldoc-documentation-function)))))
+
+(defun eldoc-documentation-function-default ()
+ "Default value for `eldoc-documentation-function' (which see)."
+ (let ((current-symbol (eldoc-current-symbol))
+ (current-fnsym (eldoc-fnsym-in-current-sexp)))
+ (cond ((null current-fnsym)
+ nil)
+ ((eq current-symbol (car current-fnsym))
+ (or (apply #'eldoc-get-fnsym-args-string current-fnsym)
+ (eldoc-get-var-docstring current-symbol)))
+ (t
+ (or (eldoc-get-var-docstring current-symbol)
+ (apply #'eldoc-get-fnsym-args-string current-fnsym))))))
(defun eldoc-get-fnsym-args-string (sym &optional index)
"Return a string containing the parameter list of the function SYM.
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 34041aab9a8..024110b93e0 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -1320,7 +1320,7 @@ RESULT must be an `ert-test-result-with-condition'."
(unwind-protect
(progn
(insert message "\n")
- (setq end (copy-marker (point)))
+ (setq end (point-marker))
(goto-char begin)
(insert " " prefix)
(forward-line 1)
@@ -1463,6 +1463,65 @@ the tests)."
(kill-emacs 2))))
+(defun ert-summarize-tests-batch-and-exit ()
+ "Summarize the results of testing.
+Expects to be called in batch mode, with logfiles as command-line arguments.
+The logfiles should have the `ert-run-tests-batch' format. When finished,
+this exits Emacs, with status as per `ert-run-tests-batch-and-exit'."
+ (or noninteractive
+ (user-error "This function is only for use in batch mode"))
+ (let ((nlogs (length command-line-args-left))
+ (ntests 0) (nrun 0) (nexpected 0) (nunexpected 0) (nskipped 0)
+ nnotrun logfile notests badtests unexpected)
+ (with-temp-buffer
+ (while (setq logfile (pop command-line-args-left))
+ (erase-buffer)
+ (insert-file-contents logfile)
+ (if (not (re-search-forward "^Running \\([0-9]+\\) tests" nil t))
+ (push logfile notests)
+ (setq ntests (+ ntests (string-to-number (match-string 1))))
+ (if (not (re-search-forward "^\\(Aborted: \\)?\
+Ran \\([0-9]+\\) tests, \\([0-9]+\\) results as expected\
+\\(?:, \\([0-9]+\\) unexpected\\)?\
+\\(?:, \\([0-9]+\\) skipped\\)?" nil t))
+ (push logfile badtests)
+ (if (match-string 1) (push logfile badtests))
+ (setq nrun (+ nrun (string-to-number (match-string 2)))
+ nexpected (+ nexpected (string-to-number (match-string 3))))
+ (when (match-string 4)
+ (push logfile unexpected)
+ (setq nunexpected (+ nunexpected
+ (string-to-number (match-string 4)))))
+ (if (match-string 5)
+ (setq nskipped (+ nskipped
+ (string-to-number (match-string 5)))))))))
+ (setq nnotrun (- ntests nrun))
+ (message "\nSUMMARY OF TEST RESULTS")
+ (message "-----------------------")
+ (message "Files examined: %d" nlogs)
+ (message "Ran %d tests%s, %d results as expected%s%s"
+ nrun
+ (if (zerop nnotrun) "" (format ", %d failed to run" nnotrun))
+ nexpected
+ (if (zerop nunexpected)
+ ""
+ (format ", %d unexpected" nunexpected))
+ (if (zerop nskipped)
+ ""
+ (format ", %d skipped" nskipped)))
+ (when notests
+ (message "%d files did not contain any tests:" (length notests))
+ (mapc (lambda (l) (message " %s" l)) notests))
+ (when badtests
+ (message "%d files did not finish:" (length badtests))
+ (mapc (lambda (l) (message " %s" l)) badtests))
+ (when unexpected
+ (message "%d files contained unexpected results:" (length unexpected))
+ (mapc (lambda (l) (message " %s" l)) unexpected))
+ (kill-emacs (cond ((or notests badtests (not (zerop nnotrun))) 2)
+ (unexpected 1)
+ (t 0)))))
+
;;; Utility functions for load/unload actions.
(defun ert--activate-font-lock-keywords ()
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 5c404ce0468..c372117b104 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -178,8 +178,7 @@ LIBRARY should be a string (the name of the library)."
(defvar find-function-C-source-directory
(let ((dir (expand-file-name "src" source-directory)))
- (when (and (file-directory-p dir) (file-readable-p dir))
- dir))
+ (if (file-accessible-directory-p dir) dir))
"Directory where the C source files of Emacs can be found.
If nil, do not try to find the source code of functions and variables
defined in C.")
diff --git a/lisp/emacs-lisp/gulp.el b/lisp/emacs-lisp/gulp.el
deleted file mode 100644
index d0a89b3075a..00000000000
--- a/lisp/emacs-lisp/gulp.el
+++ /dev/null
@@ -1,178 +0,0 @@
-;;; gulp.el --- ask for updates for Lisp packages
-
-;; Copyright (C) 1996, 2001-2014 Free Software Foundation, Inc.
-
-;; Author: Sam Shteingold <shteingd@math.ucla.edu>
-;; Maintainer: emacs-devel@gnu.org
-;; Keywords: maint
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; 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
-;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Search the emacs/{version}/lisp directory for *.el files, extract the
-;; name of the author or maintainer and send him e-mail requesting
-;; update.
-
-;;; Code:
-(defgroup gulp nil
- "Ask for updates for Lisp packages."
- :prefix "-"
- :group 'maint)
-
-(defcustom gulp-discard "^;+ *Maintainer: *\\(FSF\\|emacs-devel@gnu\\.org\\) *$"
- "The regexp matching the packages not requiring the request for updates."
- :version "24.4" ; added emacs-devel
- :type 'regexp
- :group 'gulp)
-
-(defcustom gulp-tmp-buffer "*gulp*"
- "The name of the temporary buffer."
- :type 'string
- :group 'gulp)
-
-(defcustom gulp-max-len 2000
- "Distance into a Lisp source file to scan for keywords."
- :type 'integer
- :group 'gulp)
-
-(defcustom gulp-request-header
- (concat
- "This message was created automatically.
-I'm going to start pretesting a new version of GNU Emacs soon, so I'd
-like to ask if you have any updates for the Emacs packages you work on.
-You're listed as the maintainer of the following package(s):\n\n")
- "The starting text of a gulp message."
- :type 'string
- :group 'gulp)
-
-(defcustom gulp-request-end
- (concat
- "\nIf you have any changes since the version in the previous release ("
- (format "%d.%d" emacs-major-version emacs-minor-version)
- "),
-please send them to me ASAP.
-
-Please don't send the whole file. Instead, please send a patch made with
-`diff -c' that shows precisely the changes you would like me to install.
-Also please include itemized change log entries for your changes;
-please use lisp/ChangeLog as a guide for the style and for what kinds
-of information to include.
-
-Thanks.")
- "The closing text in a gulp message."
- :type 'string
- :group 'gulp)
-
-(declare-function mail-subject "sendmail" ())
-(declare-function mail-send "sendmail" ())
-
-(defun gulp-send-requests (dir &optional time)
- "Send requests for updates to the authors of Lisp packages in directory DIR.
-For each maintainer, the message consists of `gulp-request-header',
-followed by the list of packages (with modification times if the optional
-prefix argument TIME is non-nil), concluded with `gulp-request-end'.
-
-You can't edit the messages, but you can confirm whether to send each one.
-
-The list of addresses for which you decided not to send mail
-is left in the `*gulp*' buffer at the end."
- (interactive "DRequest updates for Lisp directory: \nP")
- (with-current-buffer (get-buffer-create gulp-tmp-buffer)
- (let ((m-p-alist (gulp-create-m-p-alist
- (directory-files dir nil "^[^=].*\\.el$" t)
- dir))
- ;; Temporarily inhibit undo in the *gulp* buffer.
- (buffer-undo-list t)
- mail-setup-hook msg node)
- (setq m-p-alist
- (sort m-p-alist
- (function (lambda (a b)
- (string< (car a) (car b))))))
- (while (setq node (car m-p-alist))
- (setq msg (gulp-create-message (cdr node) time))
- (setq mail-setup-hook
- (lambda ()
- (mail-subject)
- (insert "It's time for Emacs updates again")
- (goto-char (point-max))
- (insert msg)))
- (mail nil (car node))
- (goto-char (point-min))
- (if (y-or-n-p "Send? ") (mail-send)
- (kill-this-buffer)
- (set-buffer gulp-tmp-buffer)
- (insert (format "%s\n\n" node)))
- (setq m-p-alist (cdr m-p-alist))))
- (set-buffer gulp-tmp-buffer)
- (setq buffer-undo-list nil)))
-
-
-(defun gulp-create-message (rec time)
- "Return the message string for REC, which is a list like (FILE TIME)."
- (let (node (str gulp-request-header))
- (while (setq node (car rec))
- (setq str (concat str "\t" (car node)
- (if time (concat "\tLast modified:\t" (cdr node)))
- "\n"))
- (setq rec (cdr rec)))
- (concat str gulp-request-end)))
-
-
-(defun gulp-create-m-p-alist (flist dir)
- "Create the maintainer/package alist for files in FLIST in DIR.
-That is a list of elements, each of the form (MAINTAINER PACKAGES...)."
- (save-excursion
- (let (mplist filen node mnt-tm mnt tm fl-tm)
- (get-buffer-create gulp-tmp-buffer)
- (set-buffer gulp-tmp-buffer)
- (setq buffer-undo-list t)
- (while flist
- (setq fl-tm (gulp-maintainer (setq filen (car flist)) dir))
- (if (setq tm (cdr fl-tm) mnt (car fl-tm));; there is a definite maintainer
- (if (setq node (assoc mnt mplist));; this is not a new maintainer
- (setq mplist (cons (cons mnt (cons (cons filen tm) (cdr node)))
- (delete node mplist)))
- (setq mplist (cons (list mnt (cons filen (cdr fl-tm))) mplist))))
- (setq flist (cdr flist)))
- (erase-buffer)
- mplist)))
-
-(defun gulp-maintainer (filenm dir)
- "Return a list (MAINTAINER TIMESTAMP) for the package FILENM in directory DIR."
- (save-excursion
- (let* ((fl (expand-file-name filenm dir)) mnt
- (timest (format-time-string "%Y-%m-%d %a %T %Z"
- (elt (file-attributes fl) 5))))
- (set-buffer gulp-tmp-buffer)
- (erase-buffer)
- (insert-file-contents fl nil 0 gulp-max-len)
- (goto-char 1)
- (if (re-search-forward gulp-discard nil t)
- (setq mnt nil) ;; do nothing, return nil
- (goto-char 1)
- (if (and (re-search-forward "^;+ *Maintainer: \\(.*\\)$" nil t)
- (> (length (setq mnt (match-string 1))) 0))
- () ;; found!
- (goto-char 1)
- (if (re-search-forward "^;+ *Author: \\(.*\\)$" nil t)
- (setq mnt (match-string 1))))
- (if (= (length mnt) 0) (setq mnt nil))) ;; "^;; Author: $" --> nil
- (cons mnt timest))))
-
-(provide 'gulp)
-
-;;; gulp.el ends here
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 1cdba5b371a..31df353321a 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -104,7 +104,8 @@ It has `lisp-mode-abbrev-table' as its parent."
(regexp-opt
'("defun" "defun*" "defsubst" "defmacro"
"defadvice" "define-skeleton"
- "define-minor-mode" "define-global-minor-mode"
+ "define-compilation-mode" "define-minor-mode"
+ "define-global-minor-mode"
"define-globalized-minor-mode"
"define-derived-mode" "define-generic-mode"
"define-compiler-macro" "define-modify-macro"
@@ -156,6 +157,24 @@ It has `lisp-mode-abbrev-table' as its parent."
;;;; Font-lock support.
+(defun lisp--match-hidden-arg (limit)
+ (let ((res nil))
+ (while
+ (let ((ppss (parse-partial-sexp (line-beginning-position)
+ (line-end-position)
+ -1)))
+ (skip-syntax-forward " )")
+ (if (or (>= (car ppss) 0)
+ (looking-at ";\\|$"))
+ (progn
+ (forward-line 1)
+ (< (point) limit))
+ (looking-at ".*") ;Set the match-data.
+ (forward-line 1)
+ (setq res (point))
+ nil)))
+ res))
+
(pcase-let
((`(,vdefs ,tdefs
,el-defs-re ,cl-defs-re
@@ -189,6 +208,7 @@ It has `lisp-mode-abbrev-table' as its parent."
"with-category-table" "with-coding-priority"
"with-current-buffer" "with-demoted-errors"
"with-electric-help" "with-eval-after-load"
+ "with-file-modes"
"with-local-quit" "with-no-warnings"
"with-output-to-temp-buffer" "with-selected-window"
"with-selected-frame" "with-silent-modifications"
@@ -347,6 +367,9 @@ It has `lisp-mode-abbrev-table' as its parent."
;; and that they get the wrong color.
;; ;; CL `with-' and `do-' constructs
;;("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face)
+ (lisp--match-hidden-arg
+ (0 '(face font-lock-warning-face
+ help-echo "Hidden behind deeper element; move to another line?")))
))
"Gaudy level highlighting for Emacs Lisp mode.")
@@ -377,6 +400,9 @@ It has `lisp-mode-abbrev-table' as its parent."
;; and that they get the wrong color.
;; ;; CL `with-' and `do-' constructs
;;("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face)
+ (lisp--match-hidden-arg
+ (0 '(face font-lock-warning-face
+ help-echo "Hidden behind deeper element; move to another line?")))
))
"Gaudy level highlighting for Lisp modes."))
@@ -387,6 +413,41 @@ It has `lisp-mode-abbrev-table' as its parent."
(defvar lisp-cl-font-lock-keywords lisp-cl-font-lock-keywords-1
"Default expressions to highlight in Lisp modes.")
+(defun lisp-string-in-doc-position-p (listbeg startpos)
+ (let* ((firstsym (and listbeg
+ (save-excursion
+ (goto-char listbeg)
+ (and (looking-at "([ \t\n]*\\(\\(\\sw\\|\\s_\\)+\\)")
+ (match-string 1)))))
+ (docelt (and firstsym
+ (function-get (intern-soft firstsym)
+ lisp-doc-string-elt-property))))
+ (and docelt
+ ;; It's a string in a form that can have a docstring.
+ ;; Check whether it's in docstring position.
+ (save-excursion
+ (when (functionp docelt)
+ (goto-char (match-end 1))
+ (setq docelt (funcall docelt)))
+ (goto-char listbeg)
+ (forward-char 1)
+ (condition-case nil
+ (while (and (> docelt 0) (< (point) startpos)
+ (progn (forward-sexp 1) t))
+ (setq docelt (1- docelt)))
+ (error nil))
+ (and (zerop docelt) (<= (point) startpos)
+ (progn (forward-comment (point-max)) t)
+ (= (point) startpos))))))
+
+(defun lisp-string-after-doc-keyword-p (listbeg startpos)
+ (and listbeg ; We are inside a Lisp form.
+ (save-excursion
+ (goto-char startpos)
+ (ignore-errors
+ (progn (backward-sexp 1)
+ (looking-at ":documentation\\_>"))))))
+
(defun lisp-font-lock-syntactic-face-function (state)
(if (nth 3 state)
;; This might be a (doc)string or a |...| symbol.
@@ -394,32 +455,9 @@ It has `lisp-mode-abbrev-table' as its parent."
(if (eq (char-after startpos) ?|)
;; This is not a string, but a |...| symbol.
nil
- (let* ((listbeg (nth 1 state))
- (firstsym (and listbeg
- (save-excursion
- (goto-char listbeg)
- (and (looking-at "([ \t\n]*\\(\\(\\sw\\|\\s_\\)+\\)")
- (match-string 1)))))
- (docelt (and firstsym
- (function-get (intern-soft firstsym)
- lisp-doc-string-elt-property))))
- (if (and docelt
- ;; It's a string in a form that can have a docstring.
- ;; Check whether it's in docstring position.
- (save-excursion
- (when (functionp docelt)
- (goto-char (match-end 1))
- (setq docelt (funcall docelt)))
- (goto-char listbeg)
- (forward-char 1)
- (condition-case nil
- (while (and (> docelt 0) (< (point) startpos)
- (progn (forward-sexp 1) t))
- (setq docelt (1- docelt)))
- (error nil))
- (and (zerop docelt) (<= (point) startpos)
- (progn (forward-comment (point-max)) t)
- (= (point) (nth 8 state)))))
+ (let ((listbeg (nth 1 state)))
+ (if (or (lisp-string-in-doc-position-p listbeg startpos)
+ (lisp-string-after-doc-keyword-p listbeg startpos))
font-lock-doc-face
font-lock-string-face))))
font-lock-comment-face))
@@ -465,10 +503,10 @@ font-lock keywords will not be case sensitive."
lisp-cl-font-lock-keywords-2))
nil ,keywords-case-insensitive nil nil
(font-lock-mark-block-function . mark-defun)
+ (font-lock-extra-managed-props help-echo)
(font-lock-syntactic-face-function
. lisp-font-lock-syntactic-face-function)))
(setq-local prettify-symbols-alist lisp--prettify-symbols-alist)
- ;; electric
(when elisp
(setq-local electric-pair-text-pairs
(cons '(?\` . ?\') electric-pair-text-pairs)))
@@ -992,26 +1030,20 @@ If CHAR is not a character, return nil."
(forward-sexp -1))))
(save-restriction
- ;; vladimir@cs.ualberta.ca 30-Jul-1997: skip ` in
- ;; `variable' so that the value is returned, not the
- ;; name
- (if (and ignore-quotes
- (eq (following-char) ?`))
+ (if (and ignore-quotes (eq (following-char) ?`))
+ ;; vladimir@cs.ualberta.ca 30-Jul-1997: Skip ` in `variable' so
+ ;; that the value is returned, not the name.
(forward-char))
+ (when (looking-at ",@?") (goto-char (match-end 0)))
(narrow-to-region (point-min) opoint)
(setq expr (read (current-buffer)))
- ;; If it's an (interactive ...) form, it's more
- ;; useful to show how an interactive call would
- ;; use it.
- (and (consp expr)
- (eq (car expr) 'interactive)
+ ;; If it's an (interactive ...) form, it's more useful to show how an
+ ;; interactive call would use it.
+ ;; FIXME: Is it really the right place for this?
+ (when (eq (car-safe expr) 'interactive)
(setq expr
- (list 'call-interactively
- (list 'quote
- (list 'lambda
- '(&rest args)
- expr
- 'args)))))
+ `(call-interactively
+ (lambda (&rest args) ,expr args))))
expr)))))
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 80366db33d5..23b021df177 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -57,10 +57,14 @@ Should take the same arguments and behave similarly to `forward-sexp'.")
(defun forward-sexp (&optional arg)
"Move forward across one balanced expression (sexp).
-With ARG, do it that many times. Negative arg -N means
-move backward across N balanced expressions.
-This command assumes point is not in a string or comment.
-Calls `forward-sexp-function' to do the work, if that is non-nil."
+With ARG, do it that many times. Negative arg -N means move
+backward across N balanced expressions. This command assumes
+point is not in a string or comment. Calls
+`forward-sexp-function' to do the work, if that is non-nil. If
+unable to move over a sexp, signal `scan-error' with three
+arguments: a message, the start of the obstacle (usually a
+parenthesis or list marker of some kind), and end of the
+obstacle."
(interactive "^p")
(or arg (setq arg 1))
(if forward-sexp-function
@@ -140,38 +144,92 @@ This command assumes point is not in a string or comment."
(goto-char (or (scan-lists (point) inc -1) (buffer-end arg)))
(setq arg (- arg inc)))))
-(defun backward-up-list (&optional arg)
+(defun backward-up-list (&optional arg escape-strings no-syntax-crossing)
"Move backward out of one level of parentheses.
This command will also work on other parentheses-like expressions
-defined by the current language mode.
-With ARG, do this that many times.
-A negative argument means move forward but still to a less deep spot.
-This command assumes point is not in a string or comment."
- (interactive "^p")
- (up-list (- (or arg 1))))
-
-(defun up-list (&optional arg)
+defined by the current language mode. With ARG, do this that
+many times. A negative argument means move forward but still to
+a less deep spot. If ESCAPE-STRINGS is non-nil (as it is
+interactively), move out of enclosing strings as well. If
+NO-SYNTAX-CROSSING is non-nil (as it is interactively), prefer to
+break out of any enclosing string instead of moving to the start
+of a list broken across multiple strings. On error, location of
+point is unspecified."
+ (interactive "^p\nd\nd")
+ (up-list (- (or arg 1)) escape-strings no-syntax-crossing))
+
+(defun up-list (&optional arg escape-strings no-syntax-crossing)
"Move forward out of one level of parentheses.
This command will also work on other parentheses-like expressions
-defined by the current language mode.
-With ARG, do this that many times.
-A negative argument means move backward but still to a less deep spot.
-This command assumes point is not in a string or comment."
- (interactive "^p")
+defined by the current language mode. With ARG, do this that
+many times. A negative argument means move backward but still to
+a less deep spot. If ESCAPE-STRINGS is non-nil (as it is
+interactively), move out of enclosing strings as well. If
+NO-SYNTAX-CROSSING is non-nil (as it is interactively), prefer to
+break out of any enclosing string instead of moving to the start
+of a list broken across multiple strings. On error, location of
+point is unspecified."
+ (interactive "^p\nd\nd")
(or arg (setq arg 1))
(let ((inc (if (> arg 0) 1 -1))
- pos)
+ (pos nil))
(while (/= arg 0)
- (if (null forward-sexp-function)
- (goto-char (or (scan-lists (point) inc 1) (buffer-end arg)))
- (condition-case err
- (while (progn (setq pos (point))
- (forward-sexp inc)
- (/= (point) pos)))
- (scan-error (goto-char (nth (if (> arg 0) 3 2) err))))
- (if (= (point) pos)
- (signal 'scan-error
- (list "Unbalanced parentheses" (point) (point)))))
+ (condition-case err
+ (save-restriction
+ ;; If we've been asked not to cross string boundaries
+ ;; and we're inside a string, narrow to that string so
+ ;; that scan-lists doesn't find a match in a different
+ ;; string.
+ (when no-syntax-crossing
+ (let* ((syntax (syntax-ppss))
+ (string-comment-start (nth 8 syntax)))
+ (when string-comment-start
+ (save-excursion
+ (goto-char string-comment-start)
+ (narrow-to-region
+ (point)
+ (if (nth 3 syntax) ; in string
+ (condition-case nil
+ (progn (forward-sexp) (point))
+ (scan-error (point-max)))
+ (forward-comment 1)
+ (point)))))))
+ (if (null forward-sexp-function)
+ (goto-char (or (scan-lists (point) inc 1)
+ (buffer-end arg)))
+ (condition-case err
+ (while (progn (setq pos (point))
+ (forward-sexp inc)
+ (/= (point) pos)))
+ (scan-error (goto-char (nth (if (> arg 0) 3 2) err))))
+ (if (= (point) pos)
+ (signal 'scan-error
+ (list "Unbalanced parentheses" (point) (point))))))
+ (scan-error
+ (let ((syntax nil))
+ (or
+ ;; If we bumped up against the end of a list, see whether
+ ;; we're inside a string: if so, just go to the beginning
+ ;; or end of that string.
+ (and escape-strings
+ (or syntax (setf syntax (syntax-ppss)))
+ (nth 3 syntax)
+ (goto-char (nth 8 syntax))
+ (progn (when (> inc 0)
+ (forward-sexp))
+ t))
+ ;; If we narrowed to a comment above and failed to escape
+ ;; it, the error might be our fault, not an indication
+ ;; that we're out of syntax. Try again from beginning or
+ ;; end of the comment.
+ (and no-syntax-crossing
+ (or syntax (setf syntax (syntax-ppss)))
+ (nth 4 syntax)
+ (goto-char (nth 8 syntax))
+ (or (< inc 0)
+ (forward-comment 1))
+ (setf arg (+ arg inc)))
+ (signal (car err) (cdr err))))))
(setq arg (- arg inc)))))
(defun kill-sexp (&optional arg)
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index e3a746fa69e..44727daf76a 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -97,7 +97,10 @@ each clause."
(defun macroexp--compiler-macro (handler form)
(condition-case err
(apply handler form (cdr form))
- (error (message "Compiler-macro error for %S: %S" (car form) err)
+ (error
+ (message "--------------------------------------------------")
+ (backtrace)
+ (message "Compiler-macro error for %S: %S" (car form) err)
form)))
(defun macroexp--funcall-if-compiled (_form)
@@ -402,7 +405,7 @@ symbol itself."
(defvar macroexp--pending-eager-loads nil
"Stack of files currently undergoing eager macro-expansion.")
-(defun internal-macroexpand-for-load (form)
+(defun internal-macroexpand-for-load (form full-p)
;; Called from the eager-macroexpansion in readevalloop.
(cond
;; Don't repeat the same warning for every top-level element.
@@ -425,7 +428,9 @@ symbol itself."
(condition-case err
(let ((macroexp--pending-eager-loads
(cons load-file-name macroexp--pending-eager-loads)))
- (macroexpand-all form))
+ (if full-p
+ (macroexpand-all 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
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 1c8641249cf..bfd939d69e2 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -236,11 +236,12 @@ different, but `function-equal' will hopefully ignore those differences.")
;; This function acts like the t special value in buffer-local hooks.
(lambda (&rest args) (apply (default-value var) args)))))
-(defun advice--normalize-place (place)
- (cond ((eq 'local (car-safe place)) `(advice--buffer-local ,@(cdr place)))
- ((eq 'var (car-safe place)) (nth 1 place))
- ((symbolp place) `(default-value ',place))
- (t place)))
+(eval-and-compile
+ (defun advice--normalize-place (place)
+ (cond ((eq 'local (car-safe place)) `(advice--buffer-local ,@(cdr place)))
+ ((eq 'var (car-safe place)) (nth 1 place))
+ ((symbolp place) `(default-value ',place))
+ (t place))))
;;;###autoload
(defmacro add-function (where place function &optional props)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 6efe6c7135a..c2aaabdd6a6 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -657,6 +657,7 @@ EXTRA-PROPERTIES is currently unused."
(let* ((auto-name (format "%s-autoloads.el" name))
;;(ignore-name (concat name "-pkg.el"))
(generated-autoload-file (expand-file-name auto-name pkg-dir))
+ (backup-inhibited t)
(version-control 'never))
(package-autoload-ensure-default-file generated-autoload-file)
(update-directory-autoloads pkg-dir)
@@ -698,6 +699,7 @@ untar into a directory named DIR; otherwise, signal an error."
(print-length nil))
(write-region
(concat
+ ";;; -*- no-byte-compile: t -*-\n"
(prin1-to-string
(nconc
(list 'define-package
@@ -712,14 +714,25 @@ untar into a directory named DIR; otherwise, signal an error."
(list (car elt)
(package-version-join (cadr elt))))
requires))))
- (package--alist-to-plist
- (package-desc-extras pkg-desc))))
+ (let ((alist (package-desc-extras pkg-desc))
+ flat)
+ (while alist
+ (let* ((pair (pop alist))
+ (key (car pair))
+ (val (cdr pair)))
+ ;; Don't bother ‘quote’ing ‘key’; it is always a keyword.
+ (push key flat)
+ (push (if (and (not (consp val))
+ (or (keywordp val)
+ (not (symbolp val))
+ (memq val '(nil t))))
+ val
+ `',val)
+ flat)))
+ (nreverse flat))))
"\n")
nil pkg-file nil 'silent))))
-(defun package--alist-to-plist (alist)
- (apply #'nconc (mapcar (lambda (pair) (list (car pair) (cdr pair))) alist)))
-
(defun package-unpack (pkg-desc)
"Install the contents of the current buffer as a package."
(let* ((name (package-desc-name pkg-desc))
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index b2d4f2b71dd..ff9388171a6 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -205,9 +205,7 @@ Merges keywords to avoid backtracking in Emacs's regexp matcher."
(regexp-opt-group suffixes t t)
close-group))
- (let* ((sgnirts (mapcar (lambda (s)
- (concat (nreverse (string-to-list s))))
- strings))
+ (let* ((sgnirts (mapcar #'reverse strings))
(xiffus (try-completion "" sgnirts)))
(if (> (length xiffus) 0)
;; common suffix: take it and recurse on the prefixes.
@@ -218,8 +216,7 @@ Merges keywords to avoid backtracking in Emacs's regexp matcher."
'string-lessp)))
(concat open-group
(regexp-opt-group prefixes t t)
- (regexp-quote
- (concat (nreverse (string-to-list xiffus))))
+ (regexp-quote (nreverse xiffus))
close-group))
;; Otherwise, divide the list into those that start with a
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index d0d71ddb935..3ee261aa06b 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -323,7 +323,8 @@ to the entry with the same ID element as the current line."
(if saved-pt
(progn (goto-char saved-pt)
(move-to-column saved-col)
- (recenter))
+ (when (eq (window-buffer) (current-buffer))
+ (recenter)))
(goto-char (point-min)))))
(defun tabulated-list-print-entry (id cols)
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-28 09:24:17 +0000