------------------------------------------------------------ revno: 115486 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-12-12 01:20:37 -0800 message: * .bzrignore: Fix comment typo. diff: === modified file '.bzrignore' --- .bzrignore 2013-12-12 08:54:21 +0000 +++ .bzrignore 2013-12-12 09:20:37 +0000 @@ -82,7 +82,7 @@ !etc/refcards/Makefile etc/refcards/*.aux etc/refcards/*.log -# FIXME this ignore info and everything in it. +# FIXME this ignores info and everything in it. # It would be better to only ignore: # info/ (i.e., just the directory) and info/*.info. info/ ------------------------------------------------------------ revno: 115485 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-12-12 01:08:26 -0800 message: * Makefile.in (${srcdir}/info/dir): Parallel make fix. diff: === modified file 'Makefile.in' --- Makefile.in 2013-12-12 09:02:27 +0000 +++ Makefile.in 2013-12-12 09:08:26 +0000 @@ -964,10 +964,9 @@ ## It would be much simpler if info/dir was only created in the ## installation location by the install-info rule, but we also ## need one in the source directory for people running uninstalled. -## The dependency on *.texi is not essential, but it keeps -## this rule from running needlessly when there are no changes. -${srcdir}/info/dir: ${srcdir}/build-aux/dir_top ${srcdir}/doc/*/*.texi - ${MAKE} ${MFLAGS} info-real +## FIXME Change make-info-dir to use texi files rather than info-files, +## depend on ${srcdir}/doc/*/*.texi here rather than info-real. +${srcdir}/info/dir: info-real ${srcdir}/build-aux/dir_top tempfile=info-dir.$$$$; \ rm -f $${tempfile}; \ thisdir=`pwd`; \ ------------------------------------------------------------ revno: 115484 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-12-12 01:02:27 -0800 message: * Makefile.in (install-info): Remove some useless subshells. diff: === modified file 'ChangeLog' --- ChangeLog 2013-12-12 08:54:21 +0000 +++ ChangeLog 2013-12-12 09:02:27 +0000 @@ -1,5 +1,7 @@ 2013-12-12 Glenn Morris + * Makefile.in (install-info): Remove some useless subshells. + Stop keeping info/dir in the repository. * build-aux/dir_top: Move here from admin/. * build-aux/make-info-dir: New script. === modified file 'Makefile.in' --- Makefile.in 2013-12-12 08:54:21 +0000 +++ Makefile.in 2013-12-12 09:02:27 +0000 @@ -651,10 +651,8 @@ if [ "`cd ${srcdir}/info && /bin/pwd`" = "$$exp_infodir" ]; then \ true; \ else \ - (cd "$(DESTDIR)${infodir}"; \ - [ -f dir ] || \ - (cd "$${thisdir}"; \ - ${INSTALL_DATA} ${srcdir}/info/dir "$(DESTDIR)${infodir}/dir") ); \ + [ -f "$(DESTDIR)${infodir}/dir" ] || \ + ${INSTALL_DATA} ${srcdir}/info/dir "$(DESTDIR)${infodir}/dir"; \ info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \ cd ${srcdir}/info ; \ for elt in ${INFO_NONMISC} $${info_misc}; do \ ------------------------------------------------------------ revno: 115483 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-12-12 00:54:21 -0800 message: Stop keeping info/dir in the repository. * build-aux/dir_top: Move here from admin/. * build-aux/make-info-dir: New script. * Makefile.in (bootstrap-clean): Delete info/. (info-dir, ${srcdir}/info/dir): New rules. (info): Also make info-dir. (check-info): Rename from check-info-dir. Instead of info/dir entries, check @dircategory in info/*.info. * make-dist: Use `info' rule rather than `info-real'. No more info/COPYING (not even the right license for info/ files). * info/: Remove from repository. * admin/update_autogen (info_dir): Use dir_top from build-aux/ rather than admin/. * .bzrignore: Ignore info/ altogether. * doc/emacs/Makefile.in: Comment. diff: === modified file '.bzrignore' --- .bzrignore 2013-11-30 18:44:31 +0000 +++ .bzrignore 2013-12-12 08:54:21 +0000 @@ -82,7 +82,10 @@ !etc/refcards/Makefile etc/refcards/*.aux etc/refcards/*.log -info/*.info +# FIXME this ignore info and everything in it. +# It would be better to only ignore: +# info/ (i.e., just the directory) and info/*.info. +info/ admin/unidata/unidata.txt build-aux/compile build-aux/config.guess === modified file 'ChangeLog' --- ChangeLog 2013-12-12 04:53:59 +0000 +++ ChangeLog 2013-12-12 08:54:21 +0000 @@ -1,3 +1,17 @@ +2013-12-12 Glenn Morris + + Stop keeping info/dir in the repository. + * build-aux/dir_top: Move here from admin/. + * build-aux/make-info-dir: New script. + * Makefile.in (bootstrap-clean): Delete info/. + (info-dir, ${srcdir}/info/dir): New rules. + (info): Also make info-dir. + (check-info): Rename from check-info-dir. + Instead of info/dir entries, check @dircategory in info/*.info. + * make-dist: Use `info' rule rather than `info-real'. + No more info/COPYING (not even the right license for info/ files). + * info/: Remove from repository. + 2013-12-11 Glenn Morris * info/dir: Add octave-mode. === modified file 'Makefile.in' --- Makefile.in 2013-11-30 02:06:34 +0000 +++ Makefile.in 2013-12-12 08:54:21 +0000 @@ -639,6 +639,10 @@ chown $${installuser} "$(DESTDIR)${etcdocdir}/$${docfile}" || true ; \ else true; fi +## FIXME: +## If info/dir is missing, but we have install-info, we should let +## that handle it. If info/dir is present and we do not have install-info, +## we should check for missing entries and add them by hand. install-info: info umask 022; ${MKDIR_P} "$(DESTDIR)${infodir}" -unset CDPATH; \ @@ -883,6 +887,7 @@ [ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) bootstrap-clean); \ done [ ! -f config.log ] || mv -f config.log config.log~ + rm -rf ${srcdir}/info ${top_bootclean} ### `maintainer-clean' @@ -946,7 +951,7 @@ t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $(MFLAGS) $$2 .PHONY: $(DOCS) docs pdf ps -.PHONY: info dvi dist check html info-real force-info check-info-dir +.PHONY: info dvi dist check html info-real info-dir force-info check-info ## TODO add etc/refcards. docs: $(DOCS) @@ -956,6 +961,20 @@ pdf: $(PDFS) ps: $(PSS) +info-dir: ${srcdir}/info/dir + +## It would be much simpler if info/dir was only created in the +## installation location by the install-info rule, but we also +## need one in the source directory for people running uninstalled. +## The dependency on *.texi is not essential, but it keeps +## this rule from running needlessly when there are no changes. +${srcdir}/info/dir: ${srcdir}/build-aux/dir_top ${srcdir}/doc/*/*.texi + ${MAKE} ${MFLAGS} info-real + tempfile=info-dir.$$$$; \ + rm -f $${tempfile}; \ + thisdir=`pwd`; \ + (cd ${srcdir} && ./build-aux/make-info-dir $${thisdir}/$${tempfile}); \ + ${srcdir}/build-aux/move-if-change $${tempfile} ${srcdir}/info/dir INSTALL_DVI = install-emacs-dvi install-lispref-dvi \ install-lispintro-dvi install-misc-dvi @@ -1021,28 +1040,31 @@ @if test "$(HAVE_MAKEINFO)" = "no"; then \ echo "Configured --without-makeinfo, not building manuals" ; \ else \ - $(MAKE) $(MFLAGS) info-real ; \ + $(MAKE) $(MFLAGS) info-real info-dir; \ fi -# The info/dir file must be updated by hand when new manuals are added. -# Cannot add an info/dir entry for efaq-w32 since it is not installed -# on all platforms. -check-info-dir: info +## build-aux/make-info-dir expects only certain dircategories. +check-info: info cd info ; \ - missing= ; \ + bad= ; \ for file in *; do \ test -f "$${file}" || continue ; \ case $${file} in \ - *-[0-9]*|COPYING|dir|efaq-w32*) continue ;; \ + *-[0-9]*|COPYING|dir) continue ;; \ esac ; \ - file=`echo $${file} | sed 's/\.info//'` ; \ - grep -q -F ": ($${file})." dir || missing="$${missing} $${file}" ; \ + cat=`sed -n 's/^INFO-DIR-SECTION //p' $${file}`; \ + case $${cat} in \ + "Texinfo documentation system" | "Emacs"| "GNU Emacs Lisp" | \ + "Emacs editing modes" | "Emacs network features" | \ + "Emacs misc features" | "Emacs lisp libraries" ) : ;; \ + *) bad="$${bad} $${file}" ;; \ + esac; \ done ; \ - if test -n "$${missing}"; then \ - echo "Missing info/dir entries: $${missing}" ; \ + if test -n "$${bad}"; then \ + echo "Unexpected dircategory in: $${bad}" ; \ exit 1 ; \ fi ; \ - echo "info/dir is OK" + echo "info files are OK" #### Bootstrapping. === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-12-12 03:37:38 +0000 +++ admin/ChangeLog 2013-12-12 08:54:21 +0000 @@ -1,5 +1,8 @@ 2013-12-12 Glenn Morris + * update_autogen (info_dir): + Use dir_top from build-aux/ rather than admin/. + * update_autogen: Add option to generate info/dir. (Usage): Add -I. (info_flag): New variable. === modified file 'admin/update_autogen' --- admin/update_autogen 2013-12-12 03:39:28 +0000 +++ admin/update_autogen 2013-12-12 08:54:21 +0000 @@ -212,11 +212,11 @@ } # function commit -## FIXME use standard tools for this, generate info/dir at build time -## if needed, stop keeping in the repo. +## No longer used since info/dir is now generated at install time if needed, +## and is not in the repository any more. info_dir () { - local basefile=admin/dir_top outfile=info/dir + local basefile=build-aux/dir_top outfile=info/dir echo "Regenerating info/dir..." @@ -247,7 +247,8 @@ dircat=`sed -n -e 's/@value{emacsname}/Emacs/' -e 's/^@dircategory //p' $file` - ## TODO warn about unknown topics. + ## TODO warn about unknown topics (check-info in top-level + ## Makefile does this). [ "$dircat" = "$topic" ] || continue sed -n -e 's/@value{emacsname}/Emacs/' \ === renamed file 'admin/dir_top' => 'build-aux/dir_top' === added file 'build-aux/make-info-dir' --- build-aux/make-info-dir 1970-01-01 00:00:00 +0000 +++ build-aux/make-info-dir 2013-12-12 08:54:21 +0000 @@ -0,0 +1,93 @@ +#!/bin/sh + +### make-info-dir - create info/dir, for systems without install-info + +## Copyright (C) 2013 Free Software Foundation, Inc. + +## Author: Glenn Morris + +## 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 . + +### Commentary: + +## Generate info/dir, for systems without install-info. +## Expects to be called from top-level Emacs source directory. + +## It only handles the case where info/dir is missing from the +## installation directory. It does not handle info/dir being present +## but missing some entries. + +### Code: + +if test $# -ne 1; then + echo "Specify destination file" + exit 1 +fi + +outfile=$1 + +echo "Creating $outfile..." + +if test -f "$outfile"; then + echo "$outfile already present" + exit 1 +fi + +## Header contains non-printing characters, so this is more +## reliable than using echo. +basefile=build-aux/dir_top + +if test ! -f "$basefile"; then + echo "$basefile not found" + exit 1 +fi + + +cp $basefile $outfile + + +## FIXME inefficient looping. +for topic in "Texinfo documentation system" "Emacs" "GNU Emacs Lisp" \ + "Emacs editing modes" "Emacs network features" "Emacs misc features" \ + "Emacs lisp libraries"; do + + cat - <> $outfile + +$topic +EOF + for file in info/*.info; do + + ## FIXME do not ignore w32 if OS is w32. + case $file in + *-xtra.info|*efaq-w32.info) continue ;; + esac + + dircat=`sed -n -e 's/^INFO-DIR-SECTION //p' $file` + + ## TODO warn about unknown topics. + test "$dircat" = "$topic" || continue + + sed -n -e '/^START-INFO-DIR-ENTRY/,/^END-INFO-DIR-ENTRY/ s/^\([^SE]\)/\1/p' \ + $file >> $outfile + + done +done + +echo "Created $outfile" + +exit 0 + +### make-info-dir ends here === modified file 'doc/emacs/Makefile.in' --- doc/emacs/Makefile.in 2013-11-30 18:34:58 +0000 +++ doc/emacs/Makefile.in 2013-12-12 08:54:21 +0000 @@ -143,8 +143,7 @@ ${srcdir}/kmacro.texi \ $(EMACS_XTRA) -## This seems pointless. The info/ directory exists in both the -## repository and the release tarfiles. +## The info/ directory exists in release tarfiles but not the repository. mkinfodir = @${MKDIR_P} ${buildinfodir} .PHONY: info dvi html pdf ps === removed directory 'info' === removed file 'info/.gitignore' --- info/.gitignore 2012-05-05 09:40:49 +0000 +++ info/.gitignore 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -*.info === removed file 'info/COPYING' --- info/COPYING 2010-01-04 05:35:18 +0000 +++ info/COPYING 1970-01-01 00:00:00 +0000 @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. === removed file 'info/dir' --- info/dir 2013-12-12 03:41:26 +0000 +++ info/dir 1970-01-01 00:00:00 +0000 @@ -1,103 +0,0 @@ -This is the file .../info/dir, which contains the -topmost node of the Info hierarchy, called (dir)Top. -The first time you invoke Info you start off looking at this node. - -File: dir, Node: Top This is the top of the INFO tree - -The Info Directory -****************** - - The Info Directory is the top-level menu of major Info topics. - Type "d" in Info to return to the Info Directory. Type "q" to exit Info. - Type "?" for a list of Info commands, or "h" to visit an Info tutorial. - Type "m" to choose a menu item--for instance, - "mEmacs" visits the Emacs manual. - In Emacs Info, you can click mouse button 2 on a menu item - or cross reference to follow it to its target. - Each menu line that starts with a * is a topic you can select with "m". - Every third topic has a red * to help pick the right number to type. - -* Menu: - -Texinfo documentation system -* Info: (info). How to use the documentation browsing system. - -Emacs -* Emacs: (emacs). The extensible self-documenting text editor. -* Emacs FAQ: (efaq). Frequently Asked Questions about Emacs. - -GNU Emacs Lisp -* Emacs Lisp Intro: (eintr). A simple introduction to Emacs Lisp programming. -* Elisp: (elisp). The Emacs Lisp Reference Manual. - -Emacs editing modes -* Ada mode: (ada-mode). Emacs mode for editing and compiling Ada code. -* CC Mode: (ccmode). Emacs mode for editing C, C++, Objective-C, - Java, Pike, AWK, and CORBA IDL code. -* IDLWAVE: (idlwave). Major mode and shell for IDL files. -* nXML Mode: (nxml-mode). XML editing mode with RELAX NG support. -* Octave mode: (octave-mode). Emacs mode for editing GNU Octave files. -* Org Mode: (org). Outline-based notes management and organizer. - -Emacs network features -* Emacs GnuTLS: (emacs-gnutls). The Emacs GnuTLS integration. -* ERC: (erc). Powerful and extensible IRC client for Emacs. -* EUDC: (eudc). Emacs client for directory servers (LDAP, PH). -* Gnus: (gnus). The newsreader Gnus. -* Mairix: (mairix-el). Emacs interface to the Mairix mail indexer. -* Message: (message). Mail and news composition mode that - goes with Gnus. -* MH-E: (mh-e). Emacs interface to the MH mail system. -* Newsticker: (newsticker). A Newsticker for Emacs. -* PGG: (pgg). Emacs interface to various PGP implementations. -* Rcirc: (rcirc). Internet Relay Chat (IRC) client. -* SASL: (sasl). The Emacs SASL library. -* SC: (sc). Supercite lets you cite parts of messages - you're replying to, in flexible ways. -* Sieve: (sieve). Managing Sieve scripts in Emacs. -* TRAMP: (tramp). Transparent Remote Access, Multiple Protocol - Emacs remote file access via rsh and rcp. - -Emacs misc features -* Autotype: (autotype). Convenient features for text that you enter - frequently in Emacs. -* Bovine: (bovine). Semantic bovine parser development. -* Calc: (calc). Advanced desk calculator and mathematical tool. -* Dired-X: (dired-x). Dired Extra Features. -* Ebrowse: (ebrowse). A C++ class browser for Emacs. -* EDE: (ede). The Emacs Development Environment. -* Ediff: (ediff). A visual interface for comparing and - merging programs. -* EDT: (edt). An Emacs emulation of the EDT editor. -* EIEIO: (eieio). An objects system for Emacs Lisp. -* EasyPG Assistant: (epa). An Emacs user interface to GNU Privacy Guard. -* ERT: (ert). Emacs Lisp regression testing tool. -* Eshell: (eshell). A command shell implemented in Emacs Lisp. -* Flymake: (flymake). A universal on-the-fly syntax checker. -* Forms: (forms). Emacs package for editing data bases - by filling in forms. -* Htmlfontify: (htmlfontify). Convert source code to html. -* Ido: (ido). Interactively do things with buffers and files. -* PCL-CVS: (pcl-cvs). Emacs front-end to CVS. -* RefTeX: (reftex). Emacs support for LaTeX cross-references - and citations. -* Remember: (remember). Simple information manager for Emacs. -* Semantic: (semantic). Source code parser library and utilities. -* SES: (ses). Simple Emacs Spreadsheet. -* Speedbar: (speedbar). File/Tag summarizing utility. -* SRecode: (srecode). Semantic template code generator. -* Todo Mode: (todo-mode). Make and maintain todo lists. -* VIP: (vip). An older VI-emulation for Emacs. -* VIPER: (viper). A VI-emulation mode for Emacs. -* Wisent: (wisent). Semantic Wisent parser development. -* WoMan: (woman). Browse UN*X Manual Pages "W.O. (without) Man". - -Emacs lisp libraries -* Auth-source: (auth). The Emacs auth-source library. -* CL: (cl). Partial Common Lisp support for Emacs Lisp. -* D-Bus: (dbus). Using D-Bus in Emacs. -* Emacs MIME: (emacs-mime). Emacs MIME de/composition library. -* SMTP: (smtpmail). Emacs library for sending mail via SMTP. -* URL: (url). URL loading package. -* Widget: (widget). The "widget" package used by the Emacs - Customization facility. === modified file 'make-dist' --- make-dist 2013-11-27 06:15:06 +0000 +++ make-dist 2013-12-12 08:54:21 +0000 @@ -251,7 +251,7 @@ echo timestamp > src/stamp-h.in echo "Updating Info files" - make info-real + make info echo "Updating finder, custom and autoload data" (cd lisp && make updates EMACS="$EMACS") @@ -505,7 +505,7 @@ ### It would be nice if they could all be symlinks to top-level copy, but ### you're not supposed to have any symlinks in distribution tar files. echo "Making sure copying notices are all copies of \`COPYING'" -for subdir in . etc info leim lib lib-src lisp lwlib msdos nt src; do +for subdir in . etc leim lib lib-src lisp lwlib msdos nt src; do rm -f ${tempdir}/${subdir}/COPYING cp COPYING ${tempdir}/${subdir} done ------------------------------------------------------------ revno: 115482 committer: Dmitry Antipov branch nick: trunk timestamp: Thu 2013-12-12 12:39:41 +0400 message: * dispextern.h (FACE_SUITABLE_FOR_CHAR_P): Remove unused macro. (FACE_FOR_CHAR): Simplify because face_for_char does the same. * fontset.c (face_suitable_for_char_p) [0]: Remove unused function. (font_for_char): Prefer ptrdiff_t to int for buffer position. (face_for_char): Likewise. Rearrange eassert and return ASCII face for CHAR_BYTE8_P. * fontset.h (font_for_char, face_for_char): Adjust prototypes. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-12 04:04:35 +0000 +++ src/ChangeLog 2013-12-12 08:39:41 +0000 @@ -5,6 +5,13 @@ http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00351.html. * keyboard.c (poll_for_input_1, input_polling_used): Define unconditionally. + * dispextern.h (FACE_SUITABLE_FOR_CHAR_P): Remove unused macro. + (FACE_FOR_CHAR): Simplify because face_for_char does the same. + * fontset.c (face_suitable_for_char_p) [0]: Remove unused function. + (font_for_char): Prefer ptrdiff_t to int for buffer position. + (face_for_char): Likewise. Rearrange eassert and return ASCII + face for CHAR_BYTE8_P. + * fontset.h (font_for_char, face_for_char): Adjust prototypes. 2013-12-11 Ken Brown === modified file 'src/dispextern.h' --- src/dispextern.h 2013-12-11 16:52:34 +0000 +++ src/dispextern.h 2013-12-12 08:39:41 +0000 @@ -1819,24 +1819,16 @@ #define FACE_SUITABLE_FOR_ASCII_CHAR_P(FACE, CHAR) \ ((FACE) == (FACE)->ascii_face) -#define FACE_SUITABLE_FOR_CHAR_P(FACE, CHAR) \ - (ASCII_CHAR_P (CHAR) \ - ? FACE_SUITABLE_FOR_ASCII_CHAR_P(FACE) \ - : face_suitable_for_char_p ((FACE), (CHAR))) - /* Return the id of the realized face on frame F that is like the face with id ID but is suitable for displaying character CHAR. This macro is only meaningful for multibyte character CHAR. */ #define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) \ - ((ASCII_CHAR_P (CHAR) || CHAR_BYTE8_P (CHAR)) \ - ? (FACE)->ascii_face->id \ - : face_for_char ((F), (FACE), (CHAR), (POS), (OBJECT))) + face_for_char ((F), (FACE), (CHAR), (POS), (OBJECT)) #else /* not HAVE_WINDOW_SYSTEM */ #define FACE_SUITABLE_FOR_ASCII_CHAR_P(FACE, CHAR) 1 -#define FACE_SUITABLE_FOR_CHAR_P(FACE, CHAR) 1 #define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) ((FACE)->id) #endif /* not HAVE_WINDOW_SYSTEM */ === modified file 'src/fontset.c' --- src/fontset.c 2013-11-04 06:09:03 +0000 +++ src/fontset.c 2013-12-12 08:39:41 +0000 @@ -899,42 +899,21 @@ face->fontset = -1; } - -#if 0 -/* Return true if FACE is suitable for displaying character C. - Called from the macro FACE_SUITABLE_FOR_CHAR_P - when C is not an ASCII character. */ - -bool -face_suitable_for_char_p (struct face *face, int c) -{ - Lisp_Object fontset, rfont_def; - - fontset = FONTSET_FROM_ID (face->fontset); - rfont_def = fontset_font (fontset, c, NULL, -1); - return (VECTORP (rfont_def) - && INTEGERP (RFONT_DEF_FACE (rfont_def)) - && face->id == XINT (RFONT_DEF_FACE (rfont_def))); -} -#endif - - -/* Return ID of face suitable for displaying character C on frame F. - FACE must be realized for ASCII characters in advance. Called from - the macro FACE_FOR_CHAR. */ +/* Return ID of face suitable for displaying character C at buffer position + POS on frame F. FACE must be realized for ASCII characters in advance. + Called from the macro FACE_FOR_CHAR. */ int -face_for_char (struct frame *f, struct face *face, int c, int pos, Lisp_Object object) +face_for_char (struct frame *f, struct face *face, int c, + ptrdiff_t pos, Lisp_Object object) { Lisp_Object fontset, rfont_def, charset; int face_id; int id; - /* If face->fontset is negative (that happens when no font is found - for face), just return face->ascii_face because we can't do - anything. Perhaps, we should fix the callers to assure - that face->fontset is always valid. */ - if (ASCII_CHAR_P (c) || face->fontset < 0) + eassert (fontset_id_valid_p (face->fontset)); + + if (ASCII_CHAR_P (c) || CHAR_BYTE8_P (c)) return face->ascii_face->id; #ifdef HAVE_NS @@ -950,7 +929,6 @@ } #endif - eassert (fontset_id_valid_p (face->fontset)); fontset = FONTSET_FROM_ID (face->fontset); eassert (!BASE_FONTSET_P (fontset)); @@ -1005,7 +983,7 @@ Lisp_Object -font_for_char (struct face *face, int c, int pos, Lisp_Object object) +font_for_char (struct face *face, int c, ptrdiff_t pos, Lisp_Object object) { Lisp_Object fontset, rfont_def, charset; int id; === modified file 'src/fontset.h' --- src/fontset.h 2013-08-30 12:17:44 +0000 +++ src/fontset.h 2013-12-12 08:39:41 +0000 @@ -28,8 +28,8 @@ extern void free_face_fontset (struct frame *, struct face *); extern int face_for_char (struct frame *, struct face *, int, - int, Lisp_Object); -extern Lisp_Object font_for_char (struct face *, int, int, Lisp_Object); + ptrdiff_t, Lisp_Object); +extern Lisp_Object font_for_char (struct face *, int, ptrdiff_t, Lisp_Object); extern int make_fontset_for_ascii_face (struct frame *, int, struct face *); extern int fontset_from_font (Lisp_Object); ------------------------------------------------------------ revno: 115481 fixes bug: http://debbugs.gnu.org/15916 committer: Fabián Ezequiel Gallina branch nick: trunk timestamp: Thu 2013-12-12 02:37:09 -0300 message: * lisp/progmodes/python.el (python-indent-context) (python-indent-calculate-indentation): Fix auto-identation behavior for comment blocks. * test/automated/python-tests.el (python-indent-after-comment-1) (python-indent-after-comment-2): New tests. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-12 04:17:40 +0000 +++ lisp/ChangeLog 2013-12-12 05:37:09 +0000 @@ -1,3 +1,9 @@ +2013-12-12 Fabián Ezequiel Gallina + + * progmodes/python.el (python-indent-context) + (python-indent-calculate-indentation): Fix auto-identation + behavior for comment blocks. (Bug#15916) + 2013-12-12 Nathan Trapuzzano (tiny change) * progmodes/python.el (python-indent-calculate-indentation): When === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2013-12-12 03:47:41 +0000 +++ lisp/progmodes/python.el 2013-12-12 05:37:09 +0000 @@ -686,6 +686,8 @@ \(STATUS . START) Where status can be any of the following symbols: + + * after-comment: When current line might continue a comment block * inside-paren: If point in between (), {} or [] * inside-string: If point is inside a string * after-backslash: Previous line ends in a backslash @@ -704,6 +706,17 @@ (goto-char (line-beginning-position)) (bobp)) 'no-indent) + ;; Comment continuation + ((save-excursion + (when (and + (or + (python-info-current-line-comment-p) + (python-info-current-line-empty-p)) + (progn + (forward-comment -1) + (python-info-current-line-comment-p))) + (setq start (point)) + 'after-comment))) ;; Inside string ((setq start (python-syntax-context 'string ppss)) 'inside-string) @@ -755,6 +768,9 @@ (save-excursion (pcase context-status (`no-indent 0) + (`after-comment + (goto-char context-start) + (current-indentation)) ;; When point is after beginning of block just add one level ;; of indentation relative to the context-start (`after-beginning-of-block === modified file 'test/ChangeLog' --- test/ChangeLog 2013-12-12 03:47:41 +0000 +++ test/ChangeLog 2013-12-12 05:37:09 +0000 @@ -1,3 +1,8 @@ +2013-12-12 Fabián Ezequiel Gallina + + * automated/python-tests.el (python-indent-after-comment-1) + (python-indent-after-comment-2): New tests. + 2013-12-12 Nathan Trapuzzano * automated/python-test.el (python-indent-block-enders-1): Rename === modified file 'test/automated/python-tests.el' --- test/automated/python-tests.el 2013-12-12 03:47:41 +0000 +++ test/automated/python-tests.el 2013-12-12 05:37:09 +0000 @@ -199,6 +199,83 @@ (should (eq (car (python-indent-context)) 'inside-paren)) (should (= (python-indent-calculate-indentation) 4)))) +(ert-deftest python-indent-after-comment-1 () + "The most simple after-comment case that shouldn't fail." + (python-tests-with-temp-buffer + "# Contents will be modified to correct indentation +class Blag(object): + def _on_child_complete(self, child_future): + if self.in_terminal_state(): + pass + # We only complete when all our async children have entered a + # terminal state. At that point, if any child failed, we fail +# with the exception with which the first child failed. +" + (python-tests-look-at "# We only complete") + (should (eq (car (python-indent-context)) 'after-line)) + (should (= (python-indent-calculate-indentation) 8)) + (python-tests-look-at "# terminal state") + (should (eq (car (python-indent-context)) 'after-comment)) + (should (= (python-indent-calculate-indentation) 8)) + (python-tests-look-at "# with the exception") + (should (eq (car (python-indent-context)) 'after-comment)) + ;; This one indents relative to previous block, even given the fact + ;; that it was under-indented. + (should (= (python-indent-calculate-indentation) 4)) + (python-tests-look-at "# terminal state" -1) + ;; It doesn't hurt to check again. + (should (eq (car (python-indent-context)) 'after-comment)) + (python-indent-line) + (should (= (current-indentation) 8)) + (python-tests-look-at "# with the exception") + (should (eq (car (python-indent-context)) 'after-comment)) + ;; Now everything should be lined up. + (should (= (python-indent-calculate-indentation) 8)))) + +(ert-deftest python-indent-after-comment-2 () + "Test after-comment in weird cases." + (python-tests-with-temp-buffer + "# Contents will be modified to correct indentation +def func(arg): + # I don't do much + return arg + # This comment is badly indented just because. + # But we won't mess with the user in this line. + +now_we_do_mess_cause_this_is_not_a_comment = 1 + +# yeah, that. +" + (python-tests-look-at "# I don't do much") + (should (eq (car (python-indent-context)) 'after-beginning-of-block)) + (should (= (python-indent-calculate-indentation) 4)) + (python-tests-look-at "return arg") + ;; Comment here just gets ignored, this line is not a comment so + ;; the rules won't apply here. + (should (eq (car (python-indent-context)) 'after-beginning-of-block)) + (should (= (python-indent-calculate-indentation) 4)) + (python-tests-look-at "# This comment is badly") + (should (eq (car (python-indent-context)) 'after-line)) + ;; The return keyword moves indentation backwards 4 spaces, but + ;; let's assume this comment was placed there because the user + ;; wanted to (manually adding spaces or whatever). + (should (= (python-indent-calculate-indentation) 0)) + (python-tests-look-at "# but we won't mess") + (should (eq (car (python-indent-context)) 'after-comment)) + (should (= (python-indent-calculate-indentation) 4)) + ;; Behave the same for blank lines: potentially a comment. + (forward-line 1) + (should (eq (car (python-indent-context)) 'after-comment)) + (should (= (python-indent-calculate-indentation) 4)) + (python-tests-look-at "now_we_do_mess") + ;; Here is where comment indentation starts to get ignored and + ;; where the user can't freely indent anymore. + (should (eq (car (python-indent-context)) 'after-line)) + (should (= (python-indent-calculate-indentation) 0)) + (python-tests-look-at "# yeah, that.") + (should (eq (car (python-indent-context)) 'after-line)) + (should (= (python-indent-calculate-indentation) 0)))) + (ert-deftest python-indent-inside-paren-1 () "The most simple inside-paren case that shouldn't fail." (python-tests-with-temp-buffer ------------------------------------------------------------ revno: 115480 committer: Paul Eggert branch nick: trunk timestamp: Wed 2013-12-11 20:53:59 -0800 message: Revert my most-recent change re Solaris. diff: === modified file 'ChangeLog' --- ChangeLog 2013-12-11 22:31:02 +0000 +++ ChangeLog 2013-12-12 04:53:59 +0000 @@ -1,13 +1,3 @@ -2013-12-11 Paul Eggert - - Make 'configure' work out-of-the-box on Solaris. - * configure.ac: Work even if libgif etc. are missing. Emacs works - without these libraries even if its default GUI is harmed, so they - are not strictly necessary. Another possibility would be to - disable X11 if these libraries are missing. The point is that a - plain 'configure' should not fail on platforms like Solaris 11 - where one or more image libraries are not installed by default. - 2013-12-11 Glenn Morris * info/dir: Add octave-mode. === modified file 'configure.ac' --- configure.ac 2013-12-11 22:31:02 +0000 +++ configure.ac 2013-12-12 04:53:59 +0000 @@ -3106,8 +3106,7 @@ fi AC_SUBST(LIBGIF) -dnl If using X11, warn if image libraries are missing. -dnl It's not fatal if they're absent, though the UI may suffer. +dnl Check for required libraries. if test "${HAVE_X11}" = "yes"; then MISSING="" WITH_NO="" @@ -3123,12 +3122,12 @@ MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no" if test "X${MISSING}" != X; then - AC_MSG_WARN([X11 used, but the following libraries were not found: + AC_MSG_ERROR([The following required libraries were not found: $MISSING Maybe some development libraries/packages are missing? -Emacs will be built without them. To silence this warning, give +If you don't want to link with them give $WITH_NO -as options to 'configure'.]) +as options to configure]) fi fi ------------------------------------------------------------ revno: 115479 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-12-11 20:17:40 -0800 message: Mark tiny change from author without assignment diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-12 03:47:41 +0000 +++ lisp/ChangeLog 2013-12-12 04:17:40 +0000 @@ -1,4 +1,4 @@ -2013-12-12 Nathan Trapuzzano +2013-12-12 Nathan Trapuzzano (tiny change) * progmodes/python.el (python-indent-calculate-indentation): When determining indentation, don't treat "return", "pass", etc., as ------------------------------------------------------------ revno: 115478 committer: Dmitry Antipov branch nick: trunk timestamp: Thu 2013-12-12 08:04:35 +0400 message: * xterm.c (x_make_frame_visible): Restore hack which is needed when input polling is used. This is still meaningful for Cygwin, see http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00351.html. * keyboard.c (poll_for_input_1, input_polling_used): Define unconditionally. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-11 16:52:34 +0000 +++ src/ChangeLog 2013-12-12 04:04:35 +0000 @@ -1,3 +1,11 @@ +2013-12-12 Dmitry Antipov + + * xterm.c (x_make_frame_visible): Restore hack which is needed when + input polling is used. This is still meaningful for Cygwin, see + http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00351.html. + * keyboard.c (poll_for_input_1, input_polling_used): Define + unconditionally. + 2013-12-11 Ken Brown * dispextern.h (erase_phys_cursor): === modified file 'src/keyboard.c' --- src/keyboard.c 2013-12-07 23:04:10 +0000 +++ src/keyboard.c 2013-12-12 04:04:35 +0000 @@ -1954,7 +1954,6 @@ static struct atimer *poll_timer; -#ifdef HAVE_NTGUI /* Poll for input, so that we catch a C-g if it comes in. */ void poll_for_input_1 (void) @@ -1963,7 +1962,6 @@ && !waiting_for_input) gobble_input (); } -#endif /* Timer callback function for poll_timer. TIMER is equal to poll_timer. */ @@ -2015,8 +2013,6 @@ #endif } -#ifdef HAVE_NTGUI - /* True if we are using polling to handle input asynchronously. */ bool @@ -2031,7 +2027,6 @@ return 0; #endif } -#endif /* Turn off polling. */ === modified file 'src/xterm.c' --- src/xterm.c 2013-12-11 15:06:04 +0000 +++ src/xterm.c 2013-12-12 04:04:35 +0000 @@ -8923,6 +8923,27 @@ { /* Force processing of queued events. */ x_sync (f); + + /* This hack is still in use at least for Cygwin. See + http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00351.html. + + Machines that do polling rather than SIGIO have been + observed to go into a busy-wait here. So we'll fake an + alarm signal to let the handler know that there's something + to be read. We used to raise a real alarm, but it seems + that the handler isn't always enabled here. This is + probably a bug. */ + if (input_polling_used ()) + { + /* It could be confusing if a real alarm arrives while + processing the fake one. Turn it off and let the + handler reset it. */ + int old_poll_suppress_count = poll_suppress_count; + poll_suppress_count = 1; + poll_for_input_1 (); + poll_suppress_count = old_poll_suppress_count; + } + if (XPending (FRAME_X_DISPLAY (f))) { XEvent xev; ------------------------------------------------------------ revno: 115477 fixes bug: http://debbugs.gnu.org/15812 author: Nathan Trapuzzano committer: Fabián Ezequiel Gallina branch nick: trunk timestamp: Thu 2013-12-12 00:47:41 -0300 message: * lisp/progmodes/python.el (python-indent-calculate-indentation): When determining indentation, don't treat "return", "pass", etc., as operators when they are just string constituents. * automated/python-test.el (python-indent-block-enders-1): Rename from python-indent-block-enders. (python-indent-block-enders-2): New test. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-12 00:42:16 +0000 +++ lisp/ChangeLog 2013-12-12 03:47:41 +0000 @@ -1,3 +1,9 @@ +2013-12-12 Nathan Trapuzzano + + * progmodes/python.el (python-indent-calculate-indentation): When + determining indentation, don't treat "return", "pass", etc., as + operators when they are just string constituents. (Bug#15812) + 2013-12-12 Juri Linkov * uniquify.el (uniquify-buffer-name-style): Change default to === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2013-11-29 02:03:39 +0000 +++ lisp/progmodes/python.el 2013-12-12 03:47:41 +0000 @@ -774,7 +774,7 @@ (save-excursion (python-util-forward-comment -1) (python-nav-beginning-of-statement) - (member (current-word) python-indent-block-enders))) + (looking-at (regexp-opt python-indent-block-enders)))) python-indent-offset 0))) ;; When inside of a string, do nothing. just use the current === modified file 'test/ChangeLog' --- test/ChangeLog 2013-12-08 16:11:08 +0000 +++ test/ChangeLog 2013-12-12 03:47:41 +0000 @@ -1,3 +1,9 @@ +2013-12-12 Nathan Trapuzzano + + * automated/python-test.el (python-indent-block-enders-1): Rename + from python-indent-block-enders. + (python-indent-block-enders-2): New test. + 2013-12-08 Dmitry Gutov * indent/js.js: New file. === modified file 'test/automated/python-tests.el' --- test/automated/python-tests.el 2013-11-23 20:46:43 +0000 +++ test/automated/python-tests.el 2013-12-12 03:47:41 +0000 @@ -447,7 +447,7 @@ (should (eq (car (python-indent-context)) 'after-line)) (should (= (python-indent-calculate-indentation) 0)))) -(ert-deftest python-indent-block-enders () +(ert-deftest python-indent-block-enders-1 () "Test `python-indent-block-enders' value honoring." (python-tests-with-temp-buffer " @@ -469,6 +469,27 @@ (forward-line 1) (should (= (python-indent-calculate-indentation) 8)))) +(ert-deftest python-indent-block-enders-2 () + "Test `python-indent-block-enders' value honoring." + (python-tests-with-temp-buffer + " +Class foo(object): + '''raise lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do + + eiusmod tempor incididunt ut labore et dolore magna aliqua. + ''' + def bar(self): + \"return (1, 2, 3).\" + if self.baz: + return (1, + 2, + 3) +" + (python-tests-look-at "def") + (should (= (python-indent-calculate-indentation) 4)) + (python-tests-look-at "if") + (should (= (python-indent-calculate-indentation) 8)))) + ;;; Navigation ------------------------------------------------------------ revno: 115476 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-12-11 22:41:26 -0500 message: Auto-commit of info/dir files. diff: === modified file 'info/dir' --- info/dir 2013-12-11 17:00:07 +0000 +++ info/dir 2013-12-12 03:41:26 +0000 @@ -40,16 +40,16 @@ * Org Mode: (org). Outline-based notes management and organizer. Emacs network features +* Emacs GnuTLS: (emacs-gnutls). The Emacs GnuTLS integration. +* ERC: (erc). Powerful and extensible IRC client for Emacs. * EUDC: (eudc). Emacs client for directory servers (LDAP, PH). * Gnus: (gnus). The newsreader Gnus. -* Emacs GnuTLS: (emacs-gnutls). The Emacs GnuTLS integration. * Mairix: (mairix-el). Emacs interface to the Mairix mail indexer. -* MH-E: (mh-e). Emacs interface to the MH mail system. * Message: (message). Mail and news composition mode that goes with Gnus. +* MH-E: (mh-e). Emacs interface to the MH mail system. * Newsticker: (newsticker). A Newsticker for Emacs. * PGG: (pgg). Emacs interface to various PGP implementations. -* ERC: (erc). Powerful and extensible IRC client for Emacs. * Rcirc: (rcirc). Internet Relay Chat (IRC) client. * SASL: (sasl). The Emacs SASL library. * SC: (sc). Supercite lets you cite parts of messages @@ -61,15 +61,16 @@ Emacs misc features * Autotype: (autotype). Convenient features for text that you enter frequently in Emacs. +* Bovine: (bovine). Semantic bovine parser development. * Calc: (calc). Advanced desk calculator and mathematical tool. * Dired-X: (dired-x). Dired Extra Features. -* EasyPG Assistant: (epa). An Emacs user interface to GNU Privacy Guard. * Ebrowse: (ebrowse). A C++ class browser for Emacs. * EDE: (ede). The Emacs Development Environment. * Ediff: (ediff). A visual interface for comparing and merging programs. * EDT: (edt). An Emacs emulation of the EDT editor. * EIEIO: (eieio). An objects system for Emacs Lisp. +* EasyPG Assistant: (epa). An Emacs user interface to GNU Privacy Guard. * ERT: (ert). Emacs Lisp regression testing tool. * Eshell: (eshell). A command shell implemented in Emacs Lisp. * Flymake: (flymake). A universal on-the-fly syntax checker. @@ -82,14 +83,13 @@ and citations. * Remember: (remember). Simple information manager for Emacs. * Semantic: (semantic). Source code parser library and utilities. -* Bovine: (bovine). Semantic bovine parser development. -* SRecode: (srecode). Template code generator. -* Wisent: (wisent). Semantic Wisent parser development. * SES: (ses). Simple Emacs Spreadsheet. * Speedbar: (speedbar). File/Tag summarizing utility. +* SRecode: (srecode). Semantic template code generator. * Todo Mode: (todo-mode). Make and maintain todo lists. * VIP: (vip). An older VI-emulation for Emacs. * VIPER: (viper). A VI-emulation mode for Emacs. +* Wisent: (wisent). Semantic Wisent parser development. * WoMan: (woman). Browse UN*X Manual Pages "W.O. (without) Man". Emacs lisp libraries @@ -97,7 +97,7 @@ * CL: (cl). Partial Common Lisp support for Emacs Lisp. * D-Bus: (dbus). Using D-Bus in Emacs. * Emacs MIME: (emacs-mime). Emacs MIME de/composition library. +* SMTP: (smtpmail). Emacs library for sending mail via SMTP. * URL: (url). URL loading package. * Widget: (widget). The "widget" package used by the Emacs Customization facility. -* SMTP: (smtpmail). Emacs library for sending mail via SMTP. ------------------------------------------------------------ revno: 115475 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-12-11 19:39:28 -0800 message: * admin/update_autogen (info_dir): Tweak commit message. diff: === modified file 'admin/update_autogen' --- admin/update_autogen 2013-12-12 03:37:38 +0000 +++ admin/update_autogen 2013-12-12 03:39:28 +0000 @@ -272,7 +272,7 @@ done < $tempfile - commit "generated" $modified || die "bzr commit error" + commit "info/dir" $modified || die "bzr commit error" } # function info_dir ------------------------------------------------------------ revno: 115474 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-12-11 19:37:38 -0800 message: Add support for auto-generating info/dir * admin/update_autogen: Add option to generate info/dir. (Usage): Add -I. (info_flag): New variable. (-I): New option. (doc): Maybe check its status. (info_dir): New function. * admin/dir_top: New file. * doc/emacs/emacs.texi: * doc/lispintro/emacs-lisp-intro.texi: * doc/lispref/elisp.texi: * doc/misc/autotype.texi, doc/misc/cc-mode.texi, doc/misc/ediff.texi: * doc/misc/ert.texi, doc/misc/htmlfontify.texi, doc/misc/ido.texi: * doc/misc/octave-mode.texi, doc/misc/org.texi, doc/misc/srecode.texi: * doc/misc/todo-mode.texi, doc/misc/tramp.texi: Sync direntry with info/dir version. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-12-11 05:37:30 +0000 +++ admin/ChangeLog 2013-12-12 03:37:38 +0000 @@ -1,3 +1,13 @@ +2013-12-12 Glenn Morris + + * update_autogen: Add option to generate info/dir. + (Usage): Add -I. + (info_flag): New variable. + (-I): New option. + (doc): Maybe check its status. + (info_dir): New function. + * dir_top: New file. + 2013-12-11 Paul Eggert Remove the option of using libcrypto. === added file 'admin/dir_top' --- admin/dir_top 1970-01-01 00:00:00 +0000 +++ admin/dir_top 2013-12-12 03:37:38 +0000 @@ -0,0 +1,20 @@ +This is the file .../info/dir, which contains the +topmost node of the Info hierarchy, called (dir)Top. +The first time you invoke Info you start off looking at this node. + +File: dir, Node: Top This is the top of the INFO tree + +The Info Directory +****************** + + The Info Directory is the top-level menu of major Info topics. + Type "d" in Info to return to the Info Directory. Type "q" to exit Info. + Type "?" for a list of Info commands, or "h" to visit an Info tutorial. + Type "m" to choose a menu item--for instance, + "mEmacs" visits the Emacs manual. + In Emacs Info, you can click mouse button 2 on a menu item + or cross reference to follow it to its target. + Each menu line that starts with a * is a topic you can select with "m". + Every third topic has a red * to help pick the right number to type. + +* Menu: === modified file 'admin/update_autogen' --- admin/update_autogen 2013-11-05 07:54:03 +0000 +++ admin/update_autogen 2013-12-12 03:37:38 +0000 @@ -51,7 +51,7 @@ usage () { cat 1>&2 < /dev/null" EXIT -while getopts ":hcfqA:CL" option ; do +while getopts ":hcfqA:CIL" option ; do case $option in (h) usage ;; @@ -119,6 +121,8 @@ (C) clean=1 ;; + (I) info_flag=1 ;; + (L) lboot_flag=1 ;; (\?) die "Bad option -$OPTARG" ;; @@ -138,7 +142,8 @@ echo "Running bzr status..." -bzr status -S ${autogendir:+$sources} ${ldefs_flag:+lisp} >| $tempfile || \ +bzr status -S ${autogendir:+$sources} ${ldefs_flag:+lisp} \ + ${info_flag:+doc} >| $tempfile || \ die "bzr status error for input files" ## The lisp portion could be more permissive, eg only care about .el files. @@ -207,6 +212,70 @@ } # function commit +## FIXME use standard tools for this, generate info/dir at build time +## if needed, stop keeping in the repo. +info_dir () +{ + local basefile=admin/dir_top outfile=info/dir + + echo "Regenerating info/dir..." + + ## Header contains non-printing characters, so this is more + ## reliable than using echo. + rm -f $outfile + cp $basefile $outfile + + local topic file dircat dirent + + ## FIXME inefficient looping. + for topic in "Texinfo documentation system" "Emacs" "GNU Emacs Lisp" \ + "Emacs editing modes" "Emacs network features" "Emacs misc features" \ + "Emacs lisp libraries"; do + + cat - <> $outfile + +$topic +EOF + ## Bit faster than doc/*/*.texi. + for file in doc/emacs/emacs.texi doc/lispintro/*.texi \ + doc/lispref/elisp.texi doc/misc/*.texi; do + + ## FIXME do not ignore w32 if OS is w32. + case $file in + *-xtra.texi|*efaq-w32.texi) continue ;; + esac + + dircat=`sed -n -e 's/@value{emacsname}/Emacs/' -e 's/^@dircategory //p' $file` + + ## TODO warn about unknown topics. + [ "$dircat" = "$topic" ] || continue + + sed -n -e 's/@value{emacsname}/Emacs/' \ + -e 's/@acronym{\([A-Z]*\)}/\1/' \ + -e '/^@direntry/,/^@end direntry/ s/^\([^@]\)/\1/p' \ + $file >> $outfile + + done + done + + bzr status -S $outfile >| $tempfile || \ + die "bzr status error for generated $outfile" + + local modified + + while read stat file; do + + [ "$stat" != "M" ] && \ + die "Unexpected status ($stat) for generated $file" + + modified="$modified $file" + + done < $tempfile + + commit "generated" $modified || die "bzr commit error" +} # function info_dir + + [ "$autogendir" ] && { oldpwd=$PWD @@ -239,6 +308,9 @@ } # $autogendir +[ "$info_flag" ] && info_dir + + [ "$ldefs_flag" ] || exit 0 === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-12-08 15:33:27 +0000 +++ doc/emacs/ChangeLog 2013-12-12 03:37:38 +0000 @@ -1,3 +1,7 @@ +2013-12-12 Glenn Morris + + * emacs.texi: Sync direntry with info/dir version. + 2013-12-08 Juanma Barranquero * msdog.texi (Windows Keyboard): Fix typo. === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2013-11-29 19:55:31 +0000 +++ doc/emacs/emacs.texi 2013-12-12 03:37:38 +0000 @@ -48,7 +48,7 @@ @dircategory Emacs @direntry -* Emacs: (emacs). The extensible self-documenting text editor. +* Emacs: (emacs). The extensible self-documenting text editor. @end direntry @c in general, keep the following line commented out, unless doing a === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2013-12-02 17:55:40 +0000 +++ doc/lispintro/ChangeLog 2013-12-12 03:37:38 +0000 @@ -1,3 +1,7 @@ +2013-12-12 Glenn Morris + + * emacs-lisp-intro.texi: Sync direntry with info/dir version. + 2013-12-02 Paul Eggert * emacs-lisp-intro.texi (Counting Words): Don't use ':' in xref === modified file 'doc/lispintro/emacs-lisp-intro.texi' --- doc/lispintro/emacs-lisp-intro.texi 2013-12-02 17:55:40 +0000 +++ doc/lispintro/emacs-lisp-intro.texi 2013-12-12 03:37:38 +0000 @@ -98,8 +98,7 @@ @dircategory GNU Emacs Lisp @direntry -* Emacs Lisp Intro: (eintr). - A simple introduction to Emacs Lisp programming. +* Emacs Lisp Intro: (eintr). A simple introduction to Emacs Lisp programming. @end direntry @copying === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-12-08 15:33:27 +0000 +++ doc/lispref/ChangeLog 2013-12-12 03:37:38 +0000 @@ -1,3 +1,7 @@ +2013-12-12 Glenn Morris + + * elisp.texi: Sync direntry with info/dir version. + 2013-12-08 Juanma Barranquero * display.texi (Progress, Face Remapping): === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2013-07-31 12:59:10 +0000 +++ doc/lispref/elisp.texi 2013-12-12 03:37:38 +0000 @@ -119,7 +119,7 @@ @dircategory GNU Emacs Lisp @direntry -* Elisp: (elisp). The Emacs Lisp Reference Manual. +* Elisp: (elisp). The Emacs Lisp Reference Manual. @end direntry @titlepage === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-12-11 16:57:40 +0000 +++ doc/misc/ChangeLog 2013-12-12 03:37:38 +0000 @@ -1,3 +1,10 @@ +2013-12-12 Glenn Morris + + * autotype.texi, cc-mode.texi, ediff.texi, ert.texi: + * htmlfontify.texi, ido.texi, octave-mode.texi, org.texi: + * srecode.texi, todo-mode.texi, tramp.texi: + Sync direntry with info/dir version. + 2013-12-11 Rüdiger Sonderfeld * Makefile.in: Add octave-mode.texi. === modified file 'doc/misc/autotype.texi' --- doc/misc/autotype.texi 2013-01-06 14:29:40 +0000 +++ doc/misc/autotype.texi 2013-12-12 03:37:38 +0000 @@ -28,8 +28,8 @@ @dircategory Emacs misc features @direntry -* Autotype: (autotype). Convenient features for text that you - enter frequently in Emacs. +* Autotype: (autotype). Convenient features for text that you enter + frequently in Emacs. @end direntry @titlepage === modified file 'doc/misc/cc-mode.texi' --- doc/misc/cc-mode.texi 2013-08-13 07:02:00 +0000 +++ doc/misc/cc-mode.texi 2013-12-12 03:37:38 +0000 @@ -176,7 +176,7 @@ @dircategory Emacs editing modes @direntry * CC Mode: (ccmode). Emacs mode for editing C, C++, Objective-C, - Java, Pike, AWK, and CORBA IDL code. + Java, Pike, AWK, and CORBA IDL code. @end direntry @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! === modified file 'doc/misc/ediff.texi' --- doc/misc/ediff.texi 2013-02-13 04:31:09 +0000 +++ doc/misc/ediff.texi 2013-12-12 03:37:38 +0000 @@ -42,7 +42,8 @@ @dircategory Emacs misc features @direntry -* Ediff: (ediff). A visual interface for comparing and merging programs. +* Ediff: (ediff). A visual interface for comparing and + merging programs. @end direntry @titlepage === modified file 'doc/misc/ert.texi' --- doc/misc/ert.texi 2013-10-24 07:40:05 +0000 +++ doc/misc/ert.texi 2013-12-12 03:37:38 +0000 @@ -6,7 +6,7 @@ @dircategory Emacs misc features @direntry -* ERT: (ert). Emacs Lisp regression testing tool. +* ERT: (ert). Emacs Lisp regression testing tool. @end direntry @copying === modified file 'doc/misc/htmlfontify.texi' --- doc/misc/htmlfontify.texi 2013-08-09 00:51:03 +0000 +++ doc/misc/htmlfontify.texi 2013-12-12 03:37:38 +0000 @@ -26,7 +26,7 @@ @dircategory Emacs misc features @direntry -* Htmlfontify: (htmlfontify). Convert source code to html. +* Htmlfontify: (htmlfontify). Convert source code to html. @end direntry @titlepage === modified file 'doc/misc/ido.texi' --- doc/misc/ido.texi 2013-09-11 14:06:22 +0000 +++ doc/misc/ido.texi 2013-12-12 03:37:38 +0000 @@ -21,9 +21,9 @@ @end quotation @end copying -@dircategory Emacs lisp libraries +@dircategory Emacs misc features @direntry -* Ido: (ido). Interactively do things with buffers and files. +* Ido: (ido). Interactively do things with buffers and files. @end direntry @finalout === modified file 'doc/misc/octave-mode.texi' --- doc/misc/octave-mode.texi 2013-12-11 13:50:46 +0000 +++ doc/misc/octave-mode.texi 2013-12-12 03:37:38 +0000 @@ -22,7 +22,7 @@ @dircategory Emacs editing modes @direntry -* Octave mode: (octave-mode). Emacs mode for editing GNU Octave files. +* Octave mode: (octave-mode). Emacs mode for editing GNU Octave files. @end direntry @finalout === modified file 'doc/misc/org.texi' --- doc/misc/org.texi 2013-12-06 14:43:10 +0000 +++ doc/misc/org.texi 2013-12-12 03:37:38 +0000 @@ -279,7 +279,7 @@ @dircategory Emacs editing modes @direntry -* Org Mode: (org). Outline-based notes management and organizer +* Org Mode: (org). Outline-based notes management and organizer. @end direntry @titlepage === modified file 'doc/misc/srecode.texi' --- doc/misc/srecode.texi 2013-10-23 17:20:09 +0000 +++ doc/misc/srecode.texi 2013-12-12 03:37:38 +0000 @@ -32,7 +32,7 @@ @dircategory Emacs misc features @direntry -* SRecode: (srecode). Template code generator. +* SRecode: (srecode). Semantic template code generator. @end direntry @titlepage === modified file 'doc/misc/todo-mode.texi' --- doc/misc/todo-mode.texi 2013-08-16 05:15:51 +0000 +++ doc/misc/todo-mode.texi 2013-12-12 03:37:38 +0000 @@ -25,7 +25,7 @@ @dircategory Emacs misc features @direntry -* Todo Mode: (todo-mode). Make and maintain todo lists. +* Todo Mode: (todo-mode). Make and maintain todo lists. @end direntry @titlepage === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2013-10-02 13:52:32 +0000 +++ doc/misc/tramp.texi 2013-12-12 03:37:38 +0000 @@ -84,7 +84,7 @@ @dircategory @value{emacsname} network features @direntry * TRAMP: (tramp). Transparent Remote Access, Multiple Protocol - @value{emacsname} remote file access via rsh and rcp. + @value{emacsname} remote file access via rsh and rcp. @end direntry @titlepage ------------------------------------------------------------ revno: 115473 committer: Juri Linkov branch nick: trunk timestamp: Thu 2013-12-12 02:42:16 +0200 message: * lisp/uniquify.el (uniquify-buffer-name-style): Change default to `post-forward-angle-brackets'. * lisp/menu-bar.el (menu-bar-options-menu): Don't require preloaded `uniquify'. Change default to `post-forward-angle-brackets'. http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00317.html diff: === modified file 'doc/emacs/buffers.texi' --- doc/emacs/buffers.texi 2013-11-29 18:54:14 +0000 +++ doc/emacs/buffers.texi 2013-12-12 00:42:16 +0000 @@ -614,8 +614,7 @@ @vindex uniquify-buffer-name-style Other methods work by adding parts of each file's directory to the -buffer name. To select one, load the library @file{uniquify} (e.g., -using @code{(require 'uniquify)}), and customize the variable +buffer name. To select one, customize the variable @code{uniquify-buffer-name-style} (@pxref{Easy Customization}). To begin with, the @code{forward} naming method includes part of the === modified file 'etc/NEWS' --- etc/NEWS 2013-12-11 15:59:27 +0000 +++ etc/NEWS 2013-12-12 00:42:16 +0000 @@ -205,7 +205,7 @@ ** `electric-indent-mode' is enabled by default. -** Uniquify is enabled by default. +** Uniquify is enabled by default with post-forward-angle-brackets style. ** Command `rectangle-mark-mode' bound to C-x SPC makes a rectangular region. Most commands are still unaware of it, but kill/yank do work on the rectangle. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 21:15:12 +0000 +++ lisp/ChangeLog 2013-12-12 00:42:16 +0000 @@ -1,3 +1,11 @@ +2013-12-12 Juri Linkov + + * uniquify.el (uniquify-buffer-name-style): Change default to + `post-forward-angle-brackets'. + + * menu-bar.el (menu-bar-options-menu): Don't require preloaded + `uniquify'. Change default to `post-forward-angle-brackets'. + 2013-12-11 Glenn Morris * emacs-lisp/package.el (finder-list-matches): === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2013-12-08 06:24:54 +0000 +++ lisp/menu-bar.el 2013-12-12 00:42:16 +0000 @@ -1223,10 +1223,9 @@ "Use Directory Names in Buffer Names" "Directory name in buffer names (uniquify) %s" "Uniquify buffer names by adding parent directory names" - (require 'uniquify) (setq uniquify-buffer-name-style (if (not uniquify-buffer-name-style) - 'forward)))) + 'post-forward-angle-brackets)))) (bindings--define-key menu [edit-options-separator] menu-bar-separator) === modified file 'lisp/uniquify.el' --- lisp/uniquify.el 2013-11-29 18:36:31 +0000 +++ lisp/uniquify.el 2013-12-12 00:42:16 +0000 @@ -93,7 +93,7 @@ :group 'files) -(defcustom uniquify-buffer-name-style 'post-forward +(defcustom uniquify-buffer-name-style 'post-forward-angle-brackets "If non-nil, buffer names are uniquified with parts of directory name. The value determines the buffer name style and is one of `forward', `reverse', `post-forward', or `post-forward-angle-brackets'. @@ -111,6 +111,7 @@ (const post-forward) (const post-forward-angle-brackets) (const :tag "standard Emacs behavior (nil)" nil)) + :version "24.4" :require 'uniquify :group 'uniquify) ------------------------------------------------------------ revno: 115472 committer: Paul Eggert branch nick: trunk timestamp: Wed 2013-12-11 14:31:02 -0800 message: Make 'configure' work out-of-the-box on Solaris. * configure.ac: Work even if libgif etc. are missing. Emacs works without these libraries even if its default GUI is harmed, so they are not strictly necessary. Another possibility would be to disable X11 if these libraries are missing. The point is that a plain 'configure' should not fail on platforms like Solaris 11 where one or more image libraries are not installed by default. diff: === modified file 'ChangeLog' --- ChangeLog 2013-12-11 17:00:07 +0000 +++ ChangeLog 2013-12-11 22:31:02 +0000 @@ -1,3 +1,13 @@ +2013-12-11 Paul Eggert + + Make 'configure' work out-of-the-box on Solaris. + * configure.ac: Work even if libgif etc. are missing. Emacs works + without these libraries even if its default GUI is harmed, so they + are not strictly necessary. Another possibility would be to + disable X11 if these libraries are missing. The point is that a + plain 'configure' should not fail on platforms like Solaris 11 + where one or more image libraries are not installed by default. + 2013-12-11 Glenn Morris * info/dir: Add octave-mode. === modified file 'configure.ac' --- configure.ac 2013-12-11 05:37:30 +0000 +++ configure.ac 2013-12-11 22:31:02 +0000 @@ -3106,7 +3106,8 @@ fi AC_SUBST(LIBGIF) -dnl Check for required libraries. +dnl If using X11, warn if image libraries are missing. +dnl It's not fatal if they're absent, though the UI may suffer. if test "${HAVE_X11}" = "yes"; then MISSING="" WITH_NO="" @@ -3122,12 +3123,12 @@ MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no" if test "X${MISSING}" != X; then - AC_MSG_ERROR([The following required libraries were not found: + AC_MSG_WARN([X11 used, but the following libraries were not found: $MISSING Maybe some development libraries/packages are missing? -If you don't want to link with them give +Emacs will be built without them. To silence this warning, give $WITH_NO -as options to configure]) +as options to 'configure'.]) fi fi ------------------------------------------------------------ revno: 115471 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-12-11 16:15:12 -0500 message: * lisp/emacs-lisp/package.el (finder-list-matches): Autoload rather than falsely declaring. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 19:01:44 +0000 +++ lisp/ChangeLog 2013-12-11 21:15:12 +0000 @@ -1,3 +1,8 @@ +2013-12-11 Glenn Morris + + * emacs-lisp/package.el (finder-list-matches): + Autoload rather than falsely declaring. + 2013-12-11 Teodor Zlatanov * net/eww.el (eww-exit, eww-close): Add UI convenience wrappers. === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2013-12-10 00:54:38 +0000 +++ lisp/emacs-lisp/package.el 2013-12-11 21:15:12 +0000 @@ -1509,7 +1509,7 @@ (revert-buffer nil t) (goto-char (point-min))))) -(declare-function finder-list-matches "finder" (keyword)) +(autoload 'finder-list-matches "finder") (defun package-keyword-button-action (button) (let ((pkg-keyword (button-get button 'package-keyword))) (finder-list-matches pkg-keyword))) ------------------------------------------------------------ revno: 115470 committer: Ted Zlatanov branch nick: quickfixes timestamp: Wed 2013-12-11 14:01:44 -0500 message: eww: exit and close actions * net/eww.el (eww-exit, eww-close): Add UI convenience wrappers. (eww-mode-map): Use them. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 17:54:09 +0000 +++ lisp/ChangeLog 2013-12-11 19:01:44 +0000 @@ -1,3 +1,8 @@ +2013-12-11 Teodor Zlatanov + + * net/eww.el (eww-exit, eww-close): Add UI convenience wrappers. + (eww-mode-map): Use them. + 2013-12-11 Martin Rudalics * window.el (display-buffer-in-side-window): Fix doc-string === modified file 'lisp/net/eww.el' --- lisp/net/eww.el 2013-12-11 00:27:27 +0000 +++ lisp/net/eww.el 2013-12-11 19:01:44 +0000 @@ -392,7 +392,8 @@ (defvar eww-mode-map (let ((map (make-sparse-keymap))) (suppress-keymap map) - (define-key map "q" 'quit-window) + (define-key map "q" 'eww-close) + (define-key map "Q" 'eww-exit) (define-key map "g" 'eww-reload) (define-key map [tab] 'shr-next-link) (define-key map [backtab] 'shr-previous-link) @@ -418,8 +419,8 @@ (easy-menu-define nil map "" '("Eww" - ["Exit" eww-quit t] - ["Close browser" quit-window t] + ["Exit" eww-exit t] + ["Close browser" eww-close t] ["Reload" eww-reload t] ["Back to previous page" eww-back-url :active (not (zerop (length eww-history)))] @@ -450,6 +451,17 @@ ;;(setq buffer-read-only t) ) +(defun eww-exit () + "Exit the Emacs Web Wowser." + (interactive) + (setq eww-history nil) + (kill-buffer (current-buffer))) + +(defun eww-close () + "Close the Emacs Web Wowser browser, leaving history intact." + (interactive) + (quit-window)) + (defun eww-save-history () (push (list :url eww-current-url :title eww-current-title ------------------------------------------------------------ revno: 115469 committer: martin rudalics branch nick: trunk timestamp: Wed 2013-12-11 18:54:09 +0100 message: Fix doc-string of display-buffer-in-side-window (Bug#16115). * window.el (display-buffer-in-side-window): Fix doc-string (Bug#16115). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 17:10:22 +0000 +++ lisp/ChangeLog 2013-12-11 17:54:09 +0000 @@ -1,3 +1,8 @@ +2013-12-11 Martin Rudalics + + * window.el (display-buffer-in-side-window): Fix doc-string + (Bug#16115). + 2013-12-11 Juanma Barranquero * vc/vc-git.el: Silence byte-compiler warnings. === modified file 'lisp/window.el' --- lisp/window.el 2013-12-03 01:19:24 +0000 +++ lisp/window.el 2013-12-11 17:54:09 +0000 @@ -807,13 +807,13 @@ (delete-window window))) (defun display-buffer-in-side-window (buffer alist) - "Display BUFFER in a window on side SIDE of the selected frame. + "Display BUFFER in a side window of the selected frame. ALIST is an association list of symbols and values. The -following symbols can be used: +following special symbols can be used in ALIST. -`side' denotes the side of the existing window where the new - window shall be located. Valid values are `bottom', `right', - `top' and `left'. The default is `bottom'. +`side' denotes the side of the frame where the new window shall + be located. Valid values are `bottom', `right', `top' and + `left'. The default is `bottom'. `slot' if non-nil, specifies the window slot where to display BUFFER. A value of zero or nil means use the middle slot on ------------------------------------------------------------ revno: 115468 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2013-12-11 18:10:22 +0100 message: * vc/vc-git.el: Silence byte-compiler warnings. (vc-git-dir-extra-headers): Rename arg _dir which is no longer ignored. (log-edit-set-header): Declare. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 17:05:28 +0000 +++ lisp/ChangeLog 2013-12-11 17:10:22 +0000 @@ -1,3 +1,9 @@ +2013-12-11 Juanma Barranquero + + * vc/vc-git.el: Silence byte-compiler warnings. + (vc-git-dir-extra-headers): Rename arg _dir which is no longer ignored. + (log-edit-set-header): Declare. + 2013-12-11 Eli Zaretskii * Makefile.in (custom-deps, finder-data): Run output file names === modified file 'lisp/vc/vc-git.el' --- lisp/vc/vc-git.el 2013-12-02 22:13:51 +0000 +++ lisp/vc/vc-git.el 2013-12-11 17:10:22 +0000 @@ -521,7 +521,7 @@ :help "Show the contents of the current stash")) map)) -(defun vc-git-dir-extra-headers (_dir) +(defun vc-git-dir-extra-headers (dir) (let ((str (with-output-to-string (with-current-buffer standard-output (vc-git--out-ok "symbolic-ref" "HEAD")))) @@ -560,9 +560,9 @@ 'face 'font-lock-variable-name-face))) "\n" ;; For now just a heading, key bindings can be added later for various bisect actions - (when (file-exists-p (expand-file-name ".git/BISECT_START" (vc-git-root _dir))) + (when (file-exists-p (expand-file-name ".git/BISECT_START" (vc-git-root dir))) (propertize "Bisect : in progress\n" 'face 'font-lock-warning-face)) - (when (file-exists-p (expand-file-name ".git/rebase-apply" (vc-git-root _dir))) + (when (file-exists-p (expand-file-name ".git/rebase-apply" (vc-git-root dir))) (propertize "Rebase : in progress\n" 'face 'font-lock-warning-face)) (if stash (concat @@ -624,6 +624,7 @@ (declare-function log-edit-mode "log-edit" ()) (declare-function log-edit-toggle-header "log-edit" (header value)) (declare-function log-edit-extract-headers "log-edit" (headers string)) +(declare-function log-edit-set-header "log-edit" (header value &optional toggle)) (defun vc-git-log-edit-toggle-signoff () "Toggle whether to add the \"Signed-off-by\" line at the end of ------------------------------------------------------------ revno: 115467 fixes bug: http://debbugs.gnu.org/16099 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2013-12-11 19:05:28 +0200 message: More fixes for bug #16099. lisp/Makefile.in (custom-deps, finder-data): Run output file names through unmsys--file-name. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 15:59:27 +0000 +++ lisp/ChangeLog 2013-12-11 17:05:28 +0000 @@ -1,3 +1,8 @@ +2013-12-11 Eli Zaretskii + + * Makefile.in (custom-deps, finder-data): Run output file names + through unmsys--file-name. (Bug#16099) + 2013-12-11 Stefan Monnier * emacs-lisp/smie.el (smie-indent--hanging-p): Don't bother matching === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2013-12-10 20:56:59 +0000 +++ lisp/Makefile.in 2013-12-11 17:05:28 +0000 @@ -158,7 +158,7 @@ $(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l cus-dep \ - --eval '(setq generated-custom-dependencies-file "$(srcdir)/cus-load.el")' \ + --eval '(setq generated-custom-dependencies-file (unmsys--file-name "$(srcdir)/cus-load.el"))' \ -f custom-make-dependencies $$wins $(lisp)/finder-inf.el: @@ -167,7 +167,7 @@ $(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l finder \ - --eval '(setq generated-finder-keywords-file "$(srcdir)/finder-inf.el")' \ + --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(srcdir)/finder-inf.el"))' \ -f finder-compile-keywords-make-dist $$wins # The chmod +w is to handle env var CVSREAD=1. ------------------------------------------------------------ revno: 115466 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-12-11 09:00:07 -0800 message: * info/dir: Add octave-mode. diff: === modified file 'ChangeLog' --- ChangeLog 2013-12-11 16:57:40 +0000 +++ ChangeLog 2013-12-11 17:00:07 +0000 @@ -1,3 +1,7 @@ +2013-12-11 Glenn Morris + + * info/dir: Add octave-mode. + 2013-12-11 Paul Eggert Remove the option of using libcrypto. === modified file 'info/dir' --- info/dir 2013-09-08 23:31:14 +0000 +++ info/dir 2013-12-11 17:00:07 +0000 @@ -36,6 +36,7 @@ Java, Pike, AWK, and CORBA IDL code. * IDLWAVE: (idlwave). Major mode and shell for IDL files. * nXML Mode: (nxml-mode). XML editing mode with RELAX NG support. +* Octave mode: (octave-mode). Emacs mode for editing GNU Octave files. * Org Mode: (org). Outline-based notes management and organizer. Emacs network features ------------------------------------------------------------ revno: 115465 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-12-11 08:57:40 -0800 message: ChangeLog fixes diff: === modified file 'ChangeLog' --- ChangeLog 2013-12-11 13:50:46 +0000 +++ ChangeLog 2013-12-11 16:57:40 +0000 @@ -1,9 +1,3 @@ -2013-12-06 Rüdiger Sonderfeld - - * doc/misc/octave-mode.texi: Imported from GNU Octave - (doc/interpreter/emacs.txi). - * doc/misc/Makefile.in: Add octave-mode.texi. - 2013-12-11 Paul Eggert Remove the option of using libcrypto. === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-12-08 15:33:27 +0000 +++ doc/misc/ChangeLog 2013-12-11 16:57:40 +0000 @@ -1,3 +1,12 @@ +2013-12-11 Rüdiger Sonderfeld + + * Makefile.in: Add octave-mode.texi. + +2013-12-11 Kurt Hornik + Rüdiger Sonderfeld + + * octave-mode.texi: Import from GNU Octave (doc/interpreter/emacs.txi). + 2013-12-08 Juanma Barranquero * dbus.texi (Properties and Annotations): Fix typo. ------------------------------------------------------------ revno: 115464 committer: Ken Brown branch nick: trunk timestamp: Wed 2013-12-11 11:52:34 -0500 message: Fix conditions for prototype declarations. * src/dispextern.h (erase_phys_cursor): * src/keyboard.h (make_ctrl_char): Declare prototypes if HAVE_NTGUI. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-11 15:06:04 +0000 +++ src/ChangeLog 2013-12-11 16:52:34 +0000 @@ -1,3 +1,8 @@ +2013-12-11 Ken Brown + + * dispextern.h (erase_phys_cursor): + * keyboard.h (make_ctrl_char): Declare prototypes if HAVE_NTGUI. + 2013-12-11 Dmitry Antipov * nsterm.m (x_free_frame_resources): === modified file 'src/dispextern.h' --- src/dispextern.h 2013-12-04 16:58:05 +0000 +++ src/dispextern.h 2013-12-11 16:52:34 +0000 @@ -3251,7 +3251,7 @@ enum draw_glyphs_face); extern void get_phys_cursor_geometry (struct window *, struct glyph_row *, struct glyph *, int *, int *, int *); -#ifdef WINDOWSNT +#if HAVE_NTGUI extern void erase_phys_cursor (struct window *); #endif extern void display_and_set_cursor (struct window *, bool, int, int, int, int); === modified file 'src/keyboard.h' --- src/keyboard.h 2013-11-30 09:25:31 +0000 +++ src/keyboard.h 2013-12-11 16:52:34 +0000 @@ -518,7 +518,7 @@ extern void clear_input_pending (void); extern bool requeued_events_pending_p (void); extern void bind_polling_period (int); -#ifdef WINDOWSNT +#if HAVE_NTGUI extern int make_ctrl_char (int) ATTRIBUTE_CONST; #endif extern void stuff_buffered_input (Lisp_Object); ------------------------------------------------------------ revno: 115463 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16041 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2013-12-11 10:59:27 -0500 message: * lisp/emacs-lisp/smie.el (smie-indent--hanging-p): Don't bother matching comment-start-skip, since it fails when that uses submatch 1. diff: === modified file 'etc/NEWS' --- etc/NEWS 2013-12-11 14:42:34 +0000 +++ etc/NEWS 2013-12-11 15:59:27 +0000 @@ -247,6 +247,13 @@ * Changes in Specialized Modes and Packages in Emacs 24.4 +** CUA-mode +CUA-mode was changed to make use of delete-selection-mode and +shift-select-mode. So you can now enable it independently from +transient-mark-mode, delete-selection-mode, and shift-select-mode. +As a result, cua-highlight-region-shift-only is obsolete +(you can disable transient-mark-mode to get the same result). + ** `delete-selection-mode' can be used without transient-mark-mode. ** prolog-use-smie has been removed, along with the non-SMIE indentation code. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 14:49:01 +0000 +++ lisp/ChangeLog 2013-12-11 15:59:27 +0000 @@ -1,5 +1,8 @@ 2013-12-11 Stefan Monnier + * emacs-lisp/smie.el (smie-indent--hanging-p): Don't bother matching + comment-start-skip, since it fails when that uses submatch 1 (bug#16041). + * emulation/cua-base.el (cua-paste): Add `delete-selection' property instead of deleting the selection "by hand" (bug#16098). Rely on insert-for-yank to yank rectangles. === modified file 'lisp/emacs-lisp/smie.el' --- lisp/emacs-lisp/smie.el 2013-11-04 20:45:36 +0000 +++ lisp/emacs-lisp/smie.el 2013-12-11 15:59:27 +0000 @@ -1165,7 +1165,7 @@ (forward-char 1)) (skip-chars-forward " \t") (or (eolp) - (and (looking-at comment-start-skip) + (and ;; (looking-at comment-start-skip) ;(bug#16041). (forward-comment (point-max)))) (point)))))) ------------------------------------------------------------ revno: 115462 committer: Dmitry Antipov branch nick: trunk timestamp: Wed 2013-12-11 19:06:04 +0400 message: * nsterm.m (x_free_frame_resources): * term.c (tty_free_frame_resources): * xterm.c (x_free_frame_resources): Do not check for non-NULL face cache because it's implied by free_frame_faces anyway. * w32term.c (x_free_frame_resources): Likewise. Do not call free_frame_faces twice. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-11 14:42:55 +0000 +++ src/ChangeLog 2013-12-11 15:06:04 +0000 @@ -1,3 +1,12 @@ +2013-12-11 Dmitry Antipov + + * nsterm.m (x_free_frame_resources): + * term.c (tty_free_frame_resources): + * xterm.c (x_free_frame_resources): Do not check for non-NULL + face cache because it's implied by free_frame_faces anyway. + * w32term.c (x_free_frame_resources): Likewise. Do not call + free_frame_faces twice. + 2013-12-11 Rüdiger Sonderfeld * editfns.c (Fformat_time_string): Mention %F in the doc. === modified file 'src/nsterm.m' --- src/nsterm.m 2013-12-08 12:59:14 +0000 +++ src/nsterm.m 2013-12-11 15:06:04 +0000 @@ -1155,9 +1155,7 @@ block_input (); free_frame_menubar (f); - - if (FRAME_FACE_CACHE (f)) - free_frame_faces (f); + free_frame_faces (f); if (f == dpyinfo->x_focus_frame) dpyinfo->x_focus_frame = 0; === modified file 'src/term.c' --- src/term.c 2013-12-11 00:32:00 +0000 +++ src/term.c 2013-12-11 15:06:04 +0000 @@ -3833,10 +3833,7 @@ tty_free_frame_resources (struct frame *f) { eassert (FRAME_TERMCAP_P (f)); - - if (FRAME_FACE_CACHE (f)) - free_frame_faces (f); - + free_frame_faces (f); xfree (f->output_data.tty); } @@ -3848,9 +3845,7 @@ tty_free_frame_resources (struct frame *f) { eassert (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)); - - if (FRAME_FACE_CACHE (f)) - free_frame_faces (f); + free_frame_faces (f); } #endif /* MSDOS */ === modified file 'src/w32term.c' --- src/w32term.c 2013-12-07 17:48:52 +0000 +++ src/w32term.c 2013-12-11 15:06:04 +0000 @@ -6080,17 +6080,13 @@ /* We must free faces before destroying windows because some font-driver (e.g. xft) access a window while finishing a face. */ - if (FRAME_FACE_CACHE (f)) - free_frame_faces (f); + free_frame_faces (f); if (FRAME_W32_WINDOW (f)) my_destroy_window (f, FRAME_W32_WINDOW (f)); free_frame_menubar (f); - if (FRAME_FACE_CACHE (f)) - free_frame_faces (f); - xfree (f->output_data.w32); f->output_data.w32 = NULL; === modified file 'src/xterm.c' --- src/xterm.c 2013-12-11 10:03:46 +0000 +++ src/xterm.c 2013-12-11 15:06:04 +0000 @@ -9129,8 +9129,7 @@ /* We must free faces before destroying windows because some font-driver (e.g. xft) access a window while finishing a face. */ - if (FRAME_FACE_CACHE (f)) - free_frame_faces (f); + free_frame_faces (f); if (f->output_data.x->icon_desc) XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->icon_desc); ------------------------------------------------------------ revno: 115461 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16098 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2013-12-11 09:49:01 -0500 message: * lisp/emulation/cua-base.el (cua-paste): Add `delete-selection' property instead of deleting the selection "by hand". Rely on insert-for-yank to yank rectangles. (cua-highlight-region-shift-only): Mark obsolete. (cua-mode): Don't enable/disable transient-mark-mode, shift-select-mode (cua-mode works both with and without them), and pc-selection-mode (obsolete). * lisp/emulation/cua-rect.el (cua--activate-rectangle): Activate the mark. (cua--deactivate-rectangle): Deactivate it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 14:42:34 +0000 +++ lisp/ChangeLog 2013-12-11 14:49:01 +0000 @@ -1,5 +1,15 @@ 2013-12-11 Stefan Monnier + * emulation/cua-base.el (cua-paste): Add `delete-selection' property + instead of deleting the selection "by hand" (bug#16098). + Rely on insert-for-yank to yank rectangles. + (cua-highlight-region-shift-only): Mark obsolete. + (cua-mode): Don't enable/disable transient-mark-mode, + shift-select-mode (cua-mode works both with and without them), and + pc-selection-mode (obsolete). + * emulation/cua-rect.el (cua--activate-rectangle): Activate the mark. + (cua--deactivate-rectangle): Deactivate it. + * delsel.el (delete-selection-mode): Don't enable transient-mark-mode. (delete-selection-helper): Make sure yank starts at the top of the deleted region. === modified file 'lisp/emulation/cua-base.el' --- lisp/emulation/cua-base.el 2013-12-08 08:11:50 +0000 +++ lisp/emulation/cua-base.el 2013-12-11 14:49:01 +0000 @@ -294,6 +294,8 @@ is not turned on." :type 'boolean :group 'cua) +(make-obsolete-variable 'cua-highlight-region-shift-only + 'transient-mark-mode "24.4") (defcustom cua-prefix-override-inhibit-delay 0.2 "If non-nil, time in seconds to delay before overriding prefix key. @@ -858,6 +860,7 @@ (declare-function x-clipboard-yank "../term/x-win" ()) +(put 'cua-paste 'delete-selection 'yank) (defun cua-paste (arg) "Paste last cut or copied region or rectangle. An active region is deleted before executing the command. @@ -866,8 +869,7 @@ (interactive "P") (setq arg (cua--prefix-arg arg)) (let ((regtxt (and cua--register (get-register cua--register))) - (count (prefix-numeric-value arg)) - paste-column paste-lines) + (count (prefix-numeric-value arg))) (cond ((and cua--register (not regtxt)) (message "Nothing in register %c" cua--register)) @@ -875,30 +877,12 @@ (if regtxt (cua--insert-at-global-mark regtxt) (when (not (eobp)) - (cua--insert-at-global-mark (filter-buffer-substring (point) (+ (point) count))) + (cua--insert-at-global-mark + (filter-buffer-substring (point) (+ (point) count))) (forward-char count)))) (buffer-read-only (error "Cannot paste into a read-only buffer")) (t - ;; Must save register here, since delete may override reg 0. - (if mark-active - (if cua--rectangle - (progn - (goto-char (min (mark) (point))) - (setq paste-column (cua--rectangle-left)) - (setq paste-lines (cua--delete-rectangle)) - (if (= paste-lines 1) - (setq paste-lines nil))) ;; paste all - ;; Before a yank command, make sure we don't yank the - ;; head of the kill-ring that really comes from the - ;; currently active region we are going to delete. - ;; That would make yank a no-op. - (if (and (string= (filter-buffer-substring (point) (mark)) - (car kill-ring)) - (fboundp 'mouse-region-match) - (mouse-region-match)) - (current-kill 1)) - (cua-delete-region))) (cond (regtxt (cond @@ -906,16 +890,6 @@ ((consp regtxt) (cua--insert-rectangle regtxt)) ((stringp regtxt) (insert-for-yank regtxt)) (t (message "Unknown data in register %c" cua--register)))) - ((and cua--last-killed-rectangle - (eq (and kill-ring (car kill-ring)) (car cua--last-killed-rectangle))) - (let ((pt (point))) - (when (not (eq buffer-undo-list t)) - (setq this-command 'cua--paste-rectangle) - (undo-boundary) - (setq buffer-undo-list (cons pt buffer-undo-list))) - (cua--insert-rectangle (cdr cua--last-killed-rectangle) - nil paste-column paste-lines) - (if arg (goto-char pt)))) ((eq this-original-command 'clipboard-yank) (clipboard-yank)) ((eq this-original-command 'x-clipboard-yank) @@ -1426,9 +1400,7 @@ ;; State prior to enabling cua-mode ;; Value is a list with the following elements: -;; transient-mark-mode ;; delete-selection-mode -;; pc-selection-mode (defvar cua--saved-state nil) @@ -1488,7 +1460,8 @@ (remove-hook 'post-command-hook 'cua--post-command-handler)) (if (not cua-mode) - (setq emulation-mode-map-alists (delq 'cua--keymap-alist emulation-mode-map-alists)) + (setq emulation-mode-map-alists + (delq 'cua--keymap-alist emulation-mode-map-alists)) (add-to-ordered-list 'emulation-mode-map-alists 'cua--keymap-alist 400) (cua--select-keymaps)) @@ -1496,34 +1469,21 @@ (cua-mode (setq cua--saved-state (list - transient-mark-mode - (and (boundp 'delete-selection-mode) delete-selection-mode) - (and (boundp 'pc-selection-mode) pc-selection-mode) - shift-select-mode)) + (and (boundp 'delete-selection-mode) delete-selection-mode))) (if cua-delete-selection (delete-selection-mode 1) (if (and (boundp 'delete-selection-mode) delete-selection-mode) (delete-selection-mode -1))) - (if (and (boundp 'pc-selection-mode) pc-selection-mode) - (pc-selection-mode -1)) - (cua--deactivate) - (setq shift-select-mode t) - (transient-mark-mode (if cua-highlight-region-shift-only -1 1))) + (if cua-highlight-region-shift-only (transient-mark-mode -1)) + (cua--deactivate)) (cua--saved-state - (setq transient-mark-mode (car cua--saved-state)) - (if (nth 1 cua--saved-state) + (if (nth 0 cua--saved-state) (delete-selection-mode 1) (if (and (boundp 'delete-selection-mode) delete-selection-mode) (delete-selection-mode -1))) - (if (nth 2 cua--saved-state) - (pc-selection-mode 1)) - (setq shift-select-mode (nth 3 cua--saved-state)) (if (called-interactively-p 'interactive) - (message "CUA mode disabled.%s%s%s%s" - (if (nth 1 cua--saved-state) " Delete-Selection" "") - (if (and (nth 1 cua--saved-state) (nth 2 cua--saved-state)) " and" "") - (if (nth 2 cua--saved-state) " PC-Selection" "") - (if (or (nth 1 cua--saved-state) (nth 2 cua--saved-state)) " enabled" ""))) + (message "CUA mode disabled.%s" + (if (nth 0 cua--saved-state) " Delete-Selection enabled" ""))) (setq cua--saved-state nil)))) === modified file 'lisp/emulation/cua-rect.el' --- lisp/emulation/cua-rect.el 2013-12-08 08:11:50 +0000 +++ lisp/emulation/cua-rect.el 2013-12-11 14:49:01 +0000 @@ -718,7 +718,8 @@ (cdr (cdr cua--last-rectangle)) (cua--rectangle-get-corners)) cua--status-string (if (cua--rectangle-virtual-edges) " [R]" "") - cua--last-rectangle nil)) + cua--last-rectangle nil) + (activate-mark)) ;; (defvar cua-save-point nil) @@ -731,7 +732,8 @@ cua--rectangle nil cua--rectangle-overlays nil cua--status-string nil - cua--mouse-last-pos nil)) + cua--mouse-last-pos nil) + (deactivate-mark)) (defun cua--highlight-rectangle () ;; This function is used to highlight the rectangular region. ------------------------------------------------------------ revno: 115460 committer: Rüdiger Sonderfeld branch nick: trunk timestamp: Wed 2013-12-11 15:42:55 +0100 message: Fix docstring of format-time-string to include %F. See discussion of Bug#15816. * editfns.c (Fformat_time_string): Mention %F in the doc. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-11 10:03:46 +0000 +++ src/ChangeLog 2013-12-11 14:42:55 +0000 @@ -1,3 +1,7 @@ +2013-12-11 Rüdiger Sonderfeld + + * editfns.c (Fformat_time_string): Mention %F in the doc. + 2013-12-11 Martin Rudalics * window.c (resize_frame_windows): Don't return immediately when === modified file 'src/editfns.c' --- src/editfns.c 2013-11-29 01:22:40 +0000 +++ src/editfns.c 2013-12-11 14:42:55 +0000 @@ -1723,6 +1723,7 @@ %c is the locale's date and time format. %x is the locale's "preferred" date format. %D is like "%m/%d/%y". +%F is the ISO 8601 date format (like "%Y-%m-%d"). %R is like "%H:%M", %T is like "%H:%M:%S", %r is like "%I:%M:%S %p". %X is the locale's "preferred" time format. @@ -1741,7 +1742,7 @@ %EX is a locale's alternative version of %X; %OX is like %X, but uses the locale's number symbols. -For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". +For example, to produce full ISO 8601 format, use "%FT%T%z". usage: (format-time-string FORMAT-STRING &optional TIME UNIVERSAL) */) (Lisp_Object format_string, Lisp_Object timeval, Lisp_Object universal) ------------------------------------------------------------ revno: 115459 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2013-12-11 09:42:34 -0500 message: * lisp/delsel.el (delete-selection-mode): Don't enable transient-mark-mode. (delete-selection-helper): Make sure yank starts at the top of the deleted region. (minibuffer-keyboard-quit): Use region-active-p. diff: === modified file 'etc/NEWS' --- etc/NEWS 2013-12-08 16:08:45 +0000 +++ etc/NEWS 2013-12-11 14:42:34 +0000 @@ -247,7 +247,7 @@ * Changes in Specialized Modes and Packages in Emacs 24.4 -** The backtrace debugger can display local vars with `v'. +** `delete-selection-mode' can be used without transient-mark-mode. ** prolog-use-smie has been removed, along with the non-SMIE indentation code. @@ -257,10 +257,6 @@ ** sh-script now uses its SMIE indentation algorithm by default. -** The debugger's `e' command evaluates the code in the context at point. -This includes using the lexical environment at point, which means that -`e' now lets you access lexical variables as well. - ** `eshell' now supports visual subcommands and options Eshell has been able to handle "visual" commands (interactive, non-line oriented commands such as top that require display @@ -318,6 +314,12 @@ ** completing-read-multiple's separator can now be a regexp. The default separator is changed to allow surrounding spaces around the comma. +** The backtrace debugger and local variables: +*** The debugger's `e' command evaluates the code in the context at point. +This includes using the lexical environment at point, which means that +`e' now lets you access lexical variables as well. +*** The backtrace debugger can display local vars with `v'. + ** Battery *** Battery information via the BSD `apm' utility is now supported. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 14:27:15 +0000 +++ lisp/ChangeLog 2013-12-11 14:42:34 +0000 @@ -1,5 +1,10 @@ 2013-12-11 Stefan Monnier + * delsel.el (delete-selection-mode): Don't enable transient-mark-mode. + (delete-selection-helper): Make sure yank starts at the top of the + deleted region. + (minibuffer-keyboard-quit): Use region-active-p. + * emacs-lisp/trace.el (trace-make-advice): Don't deactivate the mark. * simple.el (normal-erase-is-backspace-mode): Map kp-delete identically === modified file 'lisp/delsel.el' --- lisp/delsel.el 2013-12-11 01:11:24 +0000 +++ lisp/delsel.el 2013-12-11 14:42:34 +0000 @@ -71,8 +71,7 @@ :global t :group 'editing-basics (if (not delete-selection-mode) (remove-hook 'pre-command-hook 'delete-selection-pre-hook) - (add-hook 'pre-command-hook 'delete-selection-pre-hook) - (transient-mark-mode t))) + (add-hook 'pre-command-hook 'delete-selection-pre-hook))) (defun delete-active-region (&optional killp) "Delete the active region. @@ -122,7 +121,11 @@ (fboundp 'mouse-region-match) (mouse-region-match)) (current-kill 1)) - (delete-active-region)) + (let ((pos (copy-marker (region-beginning)))) + (delete-active-region) + ;; If the region was, say, rectangular, make sure we yank + ;; from the top, to "replace". + (goto-char pos))) ((eq type 'supersede) (let ((empty-region (= (point) (mark)))) (delete-active-region) @@ -192,7 +195,7 @@ In Delete Selection mode, if the mark is active, just deactivate it; then it takes a second \\[keyboard-quit] to abort the minibuffer." (interactive) - (if (and delete-selection-mode transient-mark-mode mark-active) + (if (and delete-selection-mode (region-active-p)) (setq deactivate-mark t) (abort-recursive-edit))) @@ -209,9 +212,9 @@ (define-key minibuffer-local-completion-map "\C-g" 'abort-recursive-edit) (define-key minibuffer-local-must-match-map "\C-g" 'abort-recursive-edit) (define-key minibuffer-local-isearch-map "\C-g" 'abort-recursive-edit) - (dolist (sym '(self-insert-command insert-char quoted-insert yank clipboard-yank - insert-register - reindent-then-newline-and-indent newline-and-indent newline open-line)) + (dolist (sym '(self-insert-command insert-char quoted-insert yank + clipboard-yank insert-register newline-and-indent + reindent-then-newline-and-indent newline open-line)) (put sym 'delete-selection nil)) ;; continue standard unloading nil) ------------------------------------------------------------ revno: 115458 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2013-12-11 09:27:15 -0500 message: * lisp/emacs-lisp/trace.el (trace-make-advice): Don't deactivate the mark. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 14:22:26 +0000 +++ lisp/ChangeLog 2013-12-11 14:27:15 +0000 @@ -1,5 +1,7 @@ 2013-12-11 Stefan Monnier + * emacs-lisp/trace.el (trace-make-advice): Don't deactivate the mark. + * simple.el (normal-erase-is-backspace-mode): Map kp-delete identically to `delete' (bug#16109). === modified file 'lisp/emacs-lisp/trace.el' --- lisp/emacs-lisp/trace.el 2013-05-29 15:17:12 +0000 +++ lisp/emacs-lisp/trace.el 2013-12-11 14:27:15 +0000 @@ -222,6 +222,7 @@ (lambda (body &rest args) (let ((trace-level (1+ trace-level)) (trace-buffer (get-buffer-create buffer)) + (deactivate-mark nil) ;Protect deactivate-mark. (ctx (funcall context))) (unless inhibit-trace (with-current-buffer trace-buffer ------------------------------------------------------------ revno: 115457 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16109 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2013-12-11 09:22:26 -0500 message: * lisp/simple.el (normal-erase-is-backspace-mode): Map kp-delete identically to `delete'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 13:50:46 +0000 +++ lisp/ChangeLog 2013-12-11 14:22:26 +0000 @@ -1,3 +1,8 @@ +2013-12-11 Stefan Monnier + + * simple.el (normal-erase-is-backspace-mode): Map kp-delete identically + to `delete' (bug#16109). + 2013-12-11 Rüdiger Sonderfeld * progmodes/octave.el (octave-mode, inferior-octave-mode): Link to === modified file 'lisp/simple.el' --- lisp/simple.el 2013-12-03 01:19:24 +0000 +++ lisp/simple.el 2013-12-11 14:22:26 +0000 @@ -7435,7 +7435,7 @@ (if enabled (progn (define-key local-function-key-map [delete] [deletechar]) - (define-key local-function-key-map [kp-delete] [?\C-d]) + (define-key local-function-key-map [kp-delete] [deletechar]) (define-key local-function-key-map [backspace] [?\C-?]) (dolist (b bindings) ;; Not sure if input-decode-map is really right, but ------------------------------------------------------------ revno: 115456 committer: Rüdiger Sonderfeld branch nick: trunk timestamp: Wed 2013-12-11 14:50:46 +0100 message: Import `octave-mode' manual from GNU Octave. The manual was written by Kurt Hornik. He agreed to assign the copyright for it to the FSF. I have updated and modified the manual. * doc/misc/octave-mode.texi: Imported from GNU Octave (doc/interpreter/emacs.txi). * doc/misc/Makefile.in: Add octave-mode.texi. * lisp/progmodes/octave.el (octave-mode, inferior-octave-mode): Link to info manual and show keybindings and set `:group' keyword. diff: === modified file 'ChangeLog' --- ChangeLog 2013-12-11 05:37:30 +0000 +++ ChangeLog 2013-12-11 13:50:46 +0000 @@ -1,3 +1,9 @@ +2013-12-06 Rüdiger Sonderfeld + + * doc/misc/octave-mode.texi: Imported from GNU Octave + (doc/interpreter/emacs.txi). + * doc/misc/Makefile.in: Add octave-mode.texi. + 2013-12-11 Paul Eggert Remove the option of using libcrypto. === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2013-11-30 18:34:58 +0000 +++ doc/misc/Makefile.in 2013-12-11 13:50:46 +0000 @@ -67,7 +67,7 @@ dbus dired-x ebrowse ede ediff edt eieio \ emacs-mime epa erc ert eshell eudc efaq \ flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \ - mairix-el message mh-e newsticker nxml-mode \ + mairix-el message mh-e newsticker nxml-mode octave-mode \ org pcl-cvs pgg rcirc remember reftex sasl \ sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp \ url vip viper widget wisent woman @@ -564,6 +564,18 @@ nxml-mode.html: $(nxml_mode_deps) $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/nxml-mode.texi +octave_mode_deps = ${srcdir}/octave-mode.texi ${gfdl} +octave-mode : $(buildinfodir)/octave-mode$(INFO_EXT) +$(buildinfodir)/octave-mode$(INFO_EXT): $(octave_mode_deps) + $(mkinfodir) + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/octave-mode.texi +octave-mode.dvi: $(octave_mode_deps) + $(ENVADD) $(TEXI2DVI) ${srcdir}/octave-mode.texi +octave-mode.pdf: $(octave_mode_deps) + $(ENVADD) $(TEXI2PDF) ${srcdir}/octave-mode.texi +octave-mode.html: $(octave_mode_deps) + $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/octave-mode.texi + org_deps = ${srcdir}/org.texi ${gfdl} org : $(buildinfodir)/org$(INFO_EXT) $(buildinfodir)/org$(INFO_EXT): $(org_deps) === added file 'doc/misc/octave-mode.texi' --- doc/misc/octave-mode.texi 1970-01-01 00:00:00 +0000 +++ doc/misc/octave-mode.texi 2013-12-11 13:50:46 +0000 @@ -0,0 +1,477 @@ +\input texinfo @c -*-texinfo-*- +@c %**start of header +@setfilename ../../info/octave-mode +@settitle Octave Mode +@c %**end of header + +@copying +Copyright @copyright{} 1996--2013 Free Software Foundation, Inc. + +@quotation +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.3 or +any later version published by the Free Software Foundation; with no +Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' +and with the Back-Cover Texts as in (a) below. A copy of the license +is included in the section entitled ``GNU Free Documentation License.'' + +(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and +modify this GNU manual.'' +@end quotation +@end copying + +@dircategory Emacs editing modes +@direntry +* Octave mode: (octave-mode). Emacs mode for editing GNU Octave files. +@end direntry + +@finalout + +@titlepage +@title Octave Mode +@subtitle An Emacs mode for programming in GNU Octave + +@page +@vskip 0pt plus 1filll +@insertcopying +@end titlepage + +@contents + +@ifnottex +@node Top +@top Octave Mode + +@insertcopying +@end ifnottex + +@menu +* Overview:: +* Using Octave Mode:: +* Running Octave from Within Emacs:: +* GNU Free Documentation License:: +* Key Index:: +* Variable Index:: +* Lisp Function Index:: +* Concept Index:: +@end menu + +@node Overview +@chapter Overview + +The development of Octave code can greatly be facilitated using Emacs +with Octave mode, a major mode for editing Octave files which can +e.g.@: automatically indent the code, do some of the typing (with +Abbrev mode) and show keywords, comments, strings, etc.@: in different +faces (with Font-lock mode on devices that support it). + +It is also possible to run Octave from within Emacs, either by +directly entering commands at the prompt in a buffer in Inferior +Octave mode, or by interacting with Octave from within a file with +Octave code. This is useful in particular for debugging Octave code. + +@node Using Octave Mode +@chapter Using Octave Mode +@cindex Using Octave Mode + +In Octave mode, the following special Emacs commands can be used in +addition to the standard Emacs commands. + +@table @kbd +@item C-M-j +@kindex C-M-j +@findex octave-indent-new-comment-line +@vindex octave-continuation-string +Break Octave line at point, continuing comment if within one. Insert +@code{octave-continuation-string} before breaking the line unless +inside a list. Signal an error if within a single-quoted string. + +@item C-c ; +@kindex C-c ; +@findex octave-update-function-file-comment +Query replace function names in function file comment. + +@item C-c C-p +@kindex C-c C-p +@findex octave-previous-code-line +Move one line of Octave code backward, skipping empty and comment +lines (@code{octave-previous-code-line}). With numeric prefix +argument @var{n}, move that many code lines backward (forward if +@var{n} is negative). + +@item C-c C-n +@kindex C-c C-n +@findex octave-next-code-line +Move one line of Octave code forward, skipping empty and comment lines +(@code{octave-next-code-line}). With numeric prefix argument @var{n}, +move that many code lines forward (backward if @var{n} is negative). + +@item C-c C-a +@kindex C-c C-a +@findex octave-beginning-of-line +Move to the beginning of the physical line +(@code{octave-beginning-of-line}). If point is in an empty or comment +line, simply go to its beginning; otherwise, move backwards to the +beginning of the first code line which is not inside a continuation +statement, i.e., which does not follow a code line ending in +@samp{...} or @samp{\}, or is inside an open parenthesis list. + +@item C-c C-e +@kindex C-c C-e +@findex octave-end-of-line +Move to the end of the physical line (@code{octave-end-of-line}). If +point is in a code line, move forward to the end of the first Octave +code line which does not end in @samp{...} or @samp{\} or is inside an +open parenthesis list. Otherwise, simply go to the end of the current +line. + +@item C-c M-C-h +@kindex C-c M-C-h +@findex octave-mark-block +Put point at the beginning of this block, mark at the end +(@code{octave-mark-block}). The block marked is the one that contains +point or follows point. + +@item C-c ] +@kindex C-c ] +Close the current block on a separate line (@code{smie-close-block}). +An error is signaled if no block to close is found. + +@item C-c C-f +@kindex C-c C-f +@findex octave-insert-defun +Insert a function skeleton, prompting for the function's name, arguments +and return values which have to be entered without parentheses +(@code{octave-insert-defun}). +@noindent +in one of your Emacs startup files. +@end table + +A common problem is that the @key{RET} key does @emph{not} indent the +line to where the new text should go after inserting the newline. This +is because the standard Emacs convention is that @key{RET} (aka +@kbd{C-m}) just adds a newline, whereas @key{LFD} (aka @kbd{C-j}) adds a +newline and indents it. This is particularly inconvenient for users with +keyboards which do not have a special @key{LFD} key at all; in such +cases, it is typically more convenient to use @key{RET} as the @key{LFD} +key (rather than typing @kbd{C-j}). + +You can make @key{RET} do this by adding +@lisp +(define-key octave-mode-map "\C-m" + 'octave-reindent-then-newline-and-indent) +@end lisp +@noindent +to one of your Emacs startup files. Another, more generally applicable +solution is +@lisp +(defun RET-behaves-as-LFD () + (let ((x (key-binding "\C-j"))) + (local-set-key "\C-m" x))) +(add-hook 'octave-mode-hook 'RET-behaves-as-LFD) +@end lisp +@noindent +(this works for all modes by adding to the startup hooks, without +having to know the particular binding of @key{RET} in that mode!). +Similar considerations apply for using @key{M-RET} as @key{M-LFD}. As +@email{bwarsaw@@cnri.reston.va.us, Barry A. Warsaw} says in the +documentation for his @code{cc-mode}, ``This is a very common +question. @code{:-)} If you want this to be the default behavior, +don't lobby me, lobby RMS!'' + +The following variables can be used to customize Octave mode. + +@vtable @code +@item octave-blink-matching-block +Non-@code{nil} means show matching begin of block when inserting a space, +newline or @samp{;} after an else or end keyword. Default is @code{t}. +This is an extremely useful feature for automatically verifying that the +keywords match---if they don't, an error message is displayed. + +@item octave-block-offset +Extra indentation applied to statements in block structures. +Default is 2. + +@item octave-continuation-offset +Extra indentation applied to Octave continuation lines. +Default is 4. + +@item octave-font-lock-texinfo-comment +Highlight texinfo comment blocks. The default value is @code{t}. +@end vtable + +If Font Lock mode is enabled, Octave mode will display + +@itemize @bullet +@item +strings in @code{font-lock-string-face} + +@item +comments in @code{font-lock-comment-face} + +@item +the Octave reserved words (such as all block keywords) and the text +functions (such as @samp{cd} or @samp{who}) which are also reserved +using @code{font-lock-keyword-face} + +@item +the built-in operators (@samp{&&}, @samp{==}, @dots{}) using +@code{font-lock-reference-face} + +@item +and the function names in function declarations in +@code{font-lock-function-name-face}. + +@item +Function comments blocks in @code{octave-function-comment-block} +@end itemize + +@cindex Imenu Support +There is also rudimentary support for Imenu (@pxref{Imenu,,, emacs, +The GNU Emacs Manual}). Currently, function names can be indexed. + +@cindex ElDoc Mode Support +@vindex octave-eldoc-message-style +ElDoc mode (@pxref{Lisp Doc,,, emacs, The GNU Emacs Manual}) is +supported. By customizing @code{octave-eldoc-message-style} it can be +changed from displaying one or multi line hints. + +@c @cindex TAGS +@c @cindex Emacs TAGS files +@c @cindex @file{octave-tags} +@c You can generate TAGS files for Emacs from Octave @file{.m} files using +@c the shell script @file{octave-tags} that is installed alongside your copy of +@c Octave. +@c +@vindex octave-mode-hook +Customization of Octave mode can be performed by modification of the +variable @code{octave-mode-hook}. + +@node Running Octave from Within Emacs +@chapter Running Octave from Within Emacs +@cindex Inferior Octave Mode + +Octave mode provides commands for running an inferior +Octave process in a special Emacs buffer. Use +@lisp +M-x run-octave +@end lisp +@noindent +to directly start an inferior Octave process. + +@vindex inferior-octave-buffer +This will start Octave in a special buffer the name of which is +specified by the variable @code{inferior-octave-buffer} and defaults +to @file{*Inferior Octave*}. From within this buffer, you can +interact with the inferior Octave process `as usual', i.e., by +entering Octave commands at the prompt. The buffer is in Inferior +Octave mode, which is derived from the standard Comint mode, a major +mode for interacting with an inferior interpreter. See the +documentation for @code{comint-mode} for more details, and use +@kbd{C-h b} to find out about available special keybindings. + +You can also communicate with an inferior Octave process from within +files with Octave code (i.e., buffers in Octave mode), using the +following commands. + +@table @kbd +@item C-c C-i l +@kindex C-c C-i l +@findex octave-send-line +@vindex octave-send-line-auto-forward +Send the current line to the inferior Octave process +(@code{octave-send-line}). With positive prefix argument @var{n}, +send that many lines. If @code{octave-send-line-auto-forward} is +non-@code{nil}, go to the next unsent code line. + +@item C-c C-i b +@kindex C-c C-i b +@findex octave-send-block +Send the current block to the inferior Octave process +(@code{octave-send-block}). + +@item C-c C-i f +@kindex C-c C-i f +@findex octave-send-defun +Send the current function to the inferior Octave process +(@code{octave-send-defun}). + +@item C-c C-i r +@kindex C-c C-i r +@findex octave-send-region +Send the region to the inferior Octave process +(@code{octave-send-region}). + +@item C-c C-i a +@kindex C-c C-i a +@findex octave-send-buffer +Send the entire buffer to the inferior Octave process +(@code{octave-send-buffer}). If the buffer is associated with a file +then sourcing the buffer by using @kbd{C-c C-l} +(@code{octave-source-file}) should be preferred. + +@item C-c C-i s +@kindex C-c C-i s +@findex octave-show-process-buffer +Make sure that `inferior-octave-buffer' is displayed +(@code{octave-show-process-buffer}). + +@item C-c C-i q +@kindex C-c C-i q +@findex octave-hide-process-buffer +Delete all windows that display the inferior Octave buffer +(@code{octave-hide-process-buffer}). + +@item C-c C-i k +@kindex C-c C-i k +@findex octave-kill-process +Kill the inferior Octave process and its buffer +(@code{octave-kill-process}). + +@item C-c C-l +@kindex C-c C-l +@findex octave-source-file +Parse and execute the current file in the inferior Octave buffer +(@code{octave-source-file}). This is done using Octave's +@code{source} function. + +@item M-. +@kindex M-. +@findex octave-find-definition +@vindex octave-source-directories +Find the definition of a function or variable. Functions implemented +in C++ can be found if variable @code{octave-source-directories} is +set correctly (@code{octave-find-definition}). + +@item C-h d +@kindex C-h d +@findex octave-help +@vindex octave-help-buffer +Display the documentation for function (@code{octave-help}). The +buffer name can be changed by customizing @code{octave-help-buffer}. + +@item C-h a +@kindex C-h a +@findex octave-lookfor +Search for a given string in all the first sentence of function help +strings (@code{octave-lookfor}). With a @code{universal-argument} the +entire help string is searched. + +@end table + +The effect of the commands which send code to the Octave process can be +customized by the following variables. + +@vtable @code +@item octave-send-echo-input +Non-@code{nil} means echo input sent to the inferior Octave process. +Default is @code{t}. + +@item octave-send-show-buffer +Non-@code{nil} means display the buffer running the Octave process after +sending a command (but without selecting it). +Default is @code{t}. +@end vtable + +If you send code and there is no inferior Octave process yet, it will +be started automatically. + +@vindex inferior-octave-startup-args +The startup of the inferior Octave process is highly customizable. +The variable @code{inferior-octave-startup-args} can be used for +specifying command lines arguments to be passed to Octave on startup +as a list of strings. For example, to suppress the startup message +and use `traditional' mode, set this to @code{("-q" "--traditional")}. +You can also specify a startup file of Octave commands to be loaded on +startup; note that these commands will not produce any visible output +in the process buffer. Which file to use is controlled by the +variable @code{inferior-octave-startup-file}. The default is +@file{~/.emacs-octave} or if this file is not found +@file{~/.emacs.d/init_octave.m}. + +@vindex inferior-octave-prompt-read-only +By customizing @code{inferior-octave-prompt-read-only} the prompt can +be changed to be read only. The default value is the same as +@code{comint-prompt-read-only}. + +@vindex inferior-octave-mode-hook +And finally, @code{inferior-octave-mode-hook} is run after starting +the process and putting its buffer into Inferior Octave mode. Hence, +if you like the up and down arrow keys to behave in the interaction +buffer as in the shell, and you want this buffer to use nice colors, +add +@lisp +(add-hook 'inferior-octave-mode-hook + (lambda () + (define-key inferior-octave-mode-map [up] + 'comint-previous-input) + (define-key inferior-octave-mode-map [down] + 'comint-next-input))) +@end lisp +@noindent +to your @file{.emacs} or @file{init.el} file. You could also swap the +roles of @kbd{C-a} (@code{beginning-of-line}) and @code{C-c C-a} +(@code{comint-bol}) using this hook. + +@vindex inferior-octave-prompt +@quotation +@strong{Note} that if you set your Octave prompts to something different +from the defaults, make sure that @code{inferior-octave-prompt} matches +them. Otherwise, @emph{nothing} will work, because Emacs will not know +when Octave is waiting for input, or done sending output. +@end quotation + +@node GNU Free Documentation License +@chapter GNU Free Documentation License +@include doclicense.texi + +@node Key Index +@unnumbered Key Index + +@printindex ky + +@node Variable Index +@unnumbered Variable Index + +@printindex vr + +@node Lisp Function Index +@unnumbered Function Index + +@printindex fn + +@node Concept Index +@unnumbered Concept Index + +@printindex cp + + +@bye + +@c TODO Update + +@c @node Using the Emacs Info Reader for Octave +@c @chapter Using the Emacs Info Reader for Octave + +@c You may also use the Emacs Info reader with Octave's @code{doc} function. + +@c If @file{gnuserv} is installed, add the lines +@c @lisp +@c (autoload 'octave-help "octave-hlp" nil t) +@c (require 'gnuserv) +@c (gnuserv-start) +@c @end lisp +@c @noindent +@c to your @file{.emacs} file. + +@c You can use either `plain' Emacs Info or the function @code{octave-help} +@c as your Octave info reader (for @samp{help -i}). In the former case, +@c use @code{info_program ("info-emacs-info")}. +@c The latter is perhaps more attractive because it allows to look up keys +@c in the indices of @emph{several} info files related to Octave (provided +@c that the Emacs variable @code{octave-help-files} is set correctly). In +@c this case, use @code{info_program ("info-emacs-octave-help")}. + +@c If you use Octave from within Emacs, it is best to add these settings to +@c your @file{~/.emacs-octave} startup file (or the file pointed to by the +@c Emacs variable @code{inferior-octave-startup-file}). === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 01:11:24 +0000 +++ lisp/ChangeLog 2013-12-11 13:50:46 +0000 @@ -1,3 +1,8 @@ +2013-12-11 Rüdiger Sonderfeld + + * progmodes/octave.el (octave-mode, inferior-octave-mode): Link to + info manual and show keybindings and set `:group' keyword. + 2013-12-11 Juri Linkov * delsel.el (delete-active-region): Let-bind `this-command' === modified file 'lisp/progmodes/octave.el' --- lisp/progmodes/octave.el 2013-12-06 04:26:17 +0000 +++ lisp/progmodes/octave.el 2013-12-11 13:50:46 +0000 @@ -528,8 +528,14 @@ Octave is a high-level language, primarily intended for numerical computations. It provides a convenient command line interface for solving linear and nonlinear problems numerically. Function -definitions can also be stored in files and used in batch mode." +definitions can also be stored in files and used in batch mode. + +See Info node `(octave-mode) Using Octave Mode' for more details. + +Key bindings: +\\{octave-mode-map}" :abbrev-table octave-abbrev-table + :group 'octave (smie-setup octave-smie-grammar #'octave-smie-rules :forward-token #'octave-smie-forward-token @@ -705,8 +711,16 @@ (process-live-p inferior-octave-process)) (define-derived-mode inferior-octave-mode comint-mode "Inferior Octave" - "Major mode for interacting with an inferior Octave process." + "Major mode for interacting with an inferior Octave process. + +See Info node `(octave-mode) Running Octave from Within Emacs' for more +details. + +Key bindings: +\\{inferior-octave-mode-map}" :abbrev-table octave-abbrev-table + :group 'octave + (setq comint-prompt-regexp inferior-octave-prompt) (setq-local comment-use-syntax t) ------------------------------------------------------------ revno: 115455 committer: martin rudalics branch nick: trunk timestamp: Wed 2013-12-11 11:03:46 +0100 message: Various fixes around Bug#16013. * window.c (resize_frame_windows): Don't return immediately when the root window's size doesn't change - the minibuffer window may still have to be repositioned/resized. * xfns.c (Fx_create_frame): Always change the frame size after initializing the frame's faces. * xterm.c (handle_one_xevent): Don't set pixel sizes here, change_frame_size should already have done it. (x_new_font): Assign new tool- and menu-bar heights. (x_set_window_size_1): Account for tool- and menu-bar heights (Bug#16013). Don't set pixel sizes since change_frame_size should already have done it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-11 05:37:30 +0000 +++ src/ChangeLog 2013-12-11 10:03:46 +0000 @@ -1,3 +1,17 @@ +2013-12-11 Martin Rudalics + + * window.c (resize_frame_windows): Don't return immediately when + the root window's size doesn't change - the minibuffer window + may still have to be repositioned/resized. + * xfns.c (Fx_create_frame): Always change the frame size after + initializing the frame's faces. + * xterm.c (handle_one_xevent): Don't set pixel sizes here, + change_frame_size should already have done it. + (x_new_font): Assign new tool- and menu-bar heights. + (x_set_window_size_1): Account for tool- and menu-bar heights + (Bug#16013). Don't set pixel sizes since change_frame_size + should already have done it. + 2013-12-11 Paul Eggert Remove the option of using libcrypto. === modified file 'src/window.c' --- src/window.c 2013-12-08 03:07:11 +0000 +++ src/window.c 2013-12-11 10:03:46 +0000 @@ -4057,7 +4057,7 @@ r->pixel_top = FRAME_TOP_MARGIN_HEIGHT (f); if (new_pixel_size == old_pixel_size) - return; + ; else if (WINDOW_LEAF_P (r)) /* For a leaf root window just set the size. */ if (horflag) === modified file 'src/xfns.c' --- src/xfns.c 2013-12-03 17:22:05 +0000 +++ src/xfns.c 2013-12-11 10:03:46 +0000 @@ -3069,7 +3069,6 @@ happen. */ init_frame_faces (f); -#ifdef USE_GTK /* PXW: This is a duplicate from below. We have to do it here since otherwise x_set_tool_bar_lines will work with the character sizes installed by init_frame_faces while the frame's pixel size is still @@ -3078,12 +3077,8 @@ non-pixelwise code apparently worked around this because it had one frame line vs one toolbar line which left us with a zero root window height which was obviously wrong as well ... */ - width = FRAME_TEXT_WIDTH (f); - height = FRAME_TEXT_HEIGHT (f); - FRAME_TEXT_HEIGHT (f) = 0; - SET_FRAME_WIDTH (f, 0); - change_frame_size (f, width, height, 1, 0, 0, 1); -#endif /* USE_GTK */ + change_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f), + FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 1, 0, 0, 1); /* Set the menu-bar-lines and tool-bar-lines parameters. We don't look up the X resources controlling the menu-bar and tool-bar === modified file 'src/xterm.c' --- src/xterm.c 2013-12-07 23:04:10 +0000 +++ src/xterm.c 2013-12-11 10:03:46 +0000 @@ -6622,8 +6622,8 @@ cancel_mouse_face (f); } - FRAME_PIXEL_WIDTH (f) = event->xconfigure.width; - FRAME_PIXEL_HEIGHT (f) = event->xconfigure.height; +/** FRAME_PIXEL_WIDTH (f) = event->xconfigure.width; **/ +/** FRAME_PIXEL_HEIGHT (f) = event->xconfigure.height; **/ #endif /* not USE_GTK */ #endif @@ -7689,6 +7689,9 @@ FRAME_COLUMN_WIDTH (f) = font->average_width; FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (font); + FRAME_TOOL_BAR_HEIGHT (f) = FRAME_TOOL_BAR_LINES (f) * FRAME_LINE_HEIGHT (f); + FRAME_MENU_BAR_HEIGHT (f) = FRAME_MENU_BAR_LINES (f) * FRAME_LINE_HEIGHT (f); + compute_fringe_widths (f, 1); /* Compute the scroll bar width in character columns. */ @@ -8541,13 +8544,15 @@ compute_fringe_widths (f, 0); - pixelwidth = - (pixelwise ? width : FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, width)) - + FRAME_TOOLBAR_WIDTH (f); - pixelheight = - (pixelwise ? height : FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, height)) - + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); - + pixelwidth = ((pixelwise + ? FRAME_TEXT_TO_PIXEL_WIDTH (f, width) + : FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, width)) + + FRAME_TOOLBAR_WIDTH (f)); + pixelheight = ((pixelwise + ? FRAME_TEXT_TO_PIXEL_HEIGHT (f, height) + : FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, height)) + + FRAME_MENUBAR_HEIGHT (f) + + FRAME_TOOLBAR_HEIGHT (f)); if (change_gravity) f->win_gravity = NorthWestGravity; x_wm_set_size_hint (f, (long) 0, 0); XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), @@ -8582,8 +8587,6 @@ else { change_frame_size (f, width, height, 0, 1, 0, 1); - FRAME_PIXEL_WIDTH (f) = pixelwidth; - FRAME_PIXEL_HEIGHT (f) = pixelheight; x_sync (f); } } ------------------------------------------------------------ revno: 115454 committer: Paul Eggert branch nick: trunk timestamp: Tue 2013-12-10 21:37:30 -0800 message: Remove the option of using libcrypto. This scorches the earth and waits for spring; see Ted Zlatanov and Stefan Monnier in . * configure.ac (with_openssl_default, HAVE_LIB_CRYPTO): Remove. Do not say whether Emacs is configured to use a crypto library, since it's no longer an option. (gl_CRYPTO_CHECK): Define a dummy. * lib/gl_openssl.h, m4/gl-openssl.m4: Remove. * admin/merge-gnulib: Remove lib/gl_openssh.h and m4/gl-openssl.m4. * src/Makefile.in (LIB_CRYPTO): Remove. (LIBES): Don't use it. diff: === modified file 'ChangeLog' --- ChangeLog 2013-12-10 02:44:28 +0000 +++ ChangeLog 2013-12-11 05:37:30 +0000 @@ -1,3 +1,15 @@ +2013-12-11 Paul Eggert + + Remove the option of using libcrypto. + This scorches the earth and waits for spring; + see Ted Zlatanov and Stefan Monnier in + . + * configure.ac (with_openssl_default, HAVE_LIB_CRYPTO): Remove. + Do not say whether Emacs is configured to use a crypto library, + since it's no longer an option. + (gl_CRYPTO_CHECK): Define a dummy. + * lib/gl_openssl.h, m4/gl-openssl.m4: Remove. + 2013-12-10 Paul Eggert * configure.ac: Disable libcrypto by default. === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-12-04 16:58:05 +0000 +++ admin/ChangeLog 2013-12-11 05:37:30 +0000 @@ -1,3 +1,8 @@ +2013-12-11 Paul Eggert + + Remove the option of using libcrypto. + * merge-gnulib: Remove lib/gl_openssh.h and m4/gl-openssl.m4. + 2013-12-04 Eli Zaretskii * unidata/unidata-gen.el (unidata-prop-alist): Update bidi-class === modified file 'admin/merge-gnulib' --- admin/merge-gnulib 2013-10-07 21:37:19 +0000 +++ admin/merge-gnulib 2013-12-11 05:37:30 +0000 @@ -91,7 +91,8 @@ } "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && -rm -- "$src"m4/fcntl-o.m4 "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 && +rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \ + "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 && cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && autoreconf -i -I m4 -- ${src:+"$src"} === modified file 'configure.ac' --- configure.ac 2013-12-10 02:44:28 +0000 +++ configure.ac 2013-12-11 05:37:30 +0000 @@ -94,8 +94,7 @@ [AS_HELP_STRING([--without-all], [omit almost all features and build small executable with minimal dependencies])], - [with_features=$withval - with_openssl_default=$withval], + [with_features=$withval], [with_features=yes]) dnl OPTION_DEFAULT_OFF(NAME, HELP-STRING) @@ -640,6 +639,8 @@ dnl that clash with MinGW. AM_CONDITIONAL([BUILDING_FOR_WINDOWSNT], [test "x$opsys" = "xmingw32"]) +# Avoid gnulib's tests for -lcrypto, so that there's no static dependency on it. +AC_DEFUN([gl_CRYPTO_CHECK]) # Avoid gnulib's tests for HAVE_WORKING_O_NOATIME and HAVE_WORKING_O_NOFOLLOW, # as we don't use them. AC_DEFUN([gl_FCNTL_O_FLAGS]) @@ -4848,12 +4849,6 @@ acl_summary=no fi -if test -n "$LIB_CRYPTO"; then - HAVE_LIB_CRYPTO=yes -else - HAVE_LIB_CRYPTO=no -fi - echo " Configured for \`${canonical}'. @@ -4893,7 +4888,6 @@ echo " Does Emacs use GSettings? ${HAVE_GSETTINGS}" echo " Does Emacs use a file notification library? ${NOTIFY_SUMMARY}" echo " Does Emacs use access control lists? ${acl_summary}" -echo " Does Emacs use a crypto library? ${HAVE_LIB_CRYPTO} $LIB_CRYPTO" echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" === removed file 'lib/gl_openssl.h' --- lib/gl_openssl.h 2013-12-08 08:05:36 +0000 +++ lib/gl_openssl.h 1970-01-01 00:00:00 +0000 @@ -1,116 +0,0 @@ -/* gl_openssl.h -- wrap openssl crypto hash routines in gnulib interface - - Copyright (C) 2013 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* Written by Pádraig Brady */ - -#ifndef GL_OPENSSL_NAME -# error "Please define GL_OPENSSL_NAME to 1,5,256 etc." -#endif - -#ifndef _GL_INLINE_HEADER_BEGIN -# error "Please include config.h first." -#endif -_GL_INLINE_HEADER_BEGIN -#ifndef GL_OPENSSL_INLINE -# define GL_OPENSSL_INLINE _GL_INLINE -#endif - -/* Concatenate two preprocessor tokens. */ -#define _GLCRYPTO_CONCAT_(prefix, suffix) prefix##suffix -#define _GLCRYPTO_CONCAT(prefix, suffix) _GLCRYPTO_CONCAT_ (prefix, suffix) - -#if GL_OPENSSL_NAME == 5 -# define OPENSSL_ALG md5 -#else -# define OPENSSL_ALG _GLCRYPTO_CONCAT (sha, GL_OPENSSL_NAME) -#endif - -/* Context type mappings. */ -#if BASE_OPENSSL_TYPE != GL_OPENSSL_NAME -# undef BASE_OPENSSL_TYPE -# if GL_OPENSSL_NAME == 224 -# define BASE_OPENSSL_TYPE 256 -# elif GL_OPENSSL_NAME == 384 -# define BASE_OPENSSL_TYPE 512 -# endif -# define md5_CTX MD5_CTX -# define sha1_CTX SHA_CTX -# define sha224_CTX SHA256_CTX -# define sha224_ctx sha256_ctx -# define sha256_CTX SHA256_CTX -# define sha384_CTX SHA512_CTX -# define sha384_ctx sha512_ctx -# define sha512_CTX SHA512_CTX -# undef _gl_CTX -# undef _gl_ctx -# define _gl_CTX _GLCRYPTO_CONCAT (OPENSSL_ALG, _CTX) /* openssl type. */ -# define _gl_ctx _GLCRYPTO_CONCAT (OPENSSL_ALG, _ctx) /* gnulib type. */ - -struct _gl_ctx { _gl_CTX CTX; }; -#endif - -/* Function name mappings. */ -#define md5_prefix MD5 -#define sha1_prefix SHA1 -#define sha224_prefix SHA224 -#define sha256_prefix SHA256 -#define sha384_prefix SHA384 -#define sha512_prefix SHA512 -#define _GLCRYPTO_PREFIX _GLCRYPTO_CONCAT (OPENSSL_ALG, _prefix) -#define OPENSSL_FN(suffix) _GLCRYPTO_CONCAT (_GLCRYPTO_PREFIX, suffix) -#define GL_CRYPTO_FN(suffix) _GLCRYPTO_CONCAT (OPENSSL_ALG, suffix) - -GL_OPENSSL_INLINE void -GL_CRYPTO_FN (_init_ctx) (struct _gl_ctx *ctx) -{ (void) OPENSSL_FN (_Init) ((_gl_CTX *) ctx); } - -/* These were never exposed by gnulib. */ -#if ! (GL_OPENSSL_NAME == 224 || GL_OPENSSL_NAME == 384) -GL_OPENSSL_INLINE void -GL_CRYPTO_FN (_process_bytes) (const void *buf, size_t len, struct _gl_ctx *ctx) -{ OPENSSL_FN (_Update) ((_gl_CTX *) ctx, buf, len); } - -GL_OPENSSL_INLINE void -GL_CRYPTO_FN (_process_block) (const void *buf, size_t len, struct _gl_ctx *ctx) -{ GL_CRYPTO_FN (_process_bytes) (buf, len, ctx); } -#endif - -GL_OPENSSL_INLINE void * -GL_CRYPTO_FN (_finish_ctx) (struct _gl_ctx *ctx, void *res) -{ OPENSSL_FN (_Final) (res, (_gl_CTX *) ctx); return res; } - -GL_OPENSSL_INLINE void * -GL_CRYPTO_FN (_buffer) (const char *buf, size_t len, void *res) -{ return OPENSSL_FN () ((const unsigned char *) buf, len, res); } - -GL_OPENSSL_INLINE void * -GL_CRYPTO_FN (_read_ctx) (const struct _gl_ctx *ctx, void *res) -{ - /* Assume any unprocessed bytes in ctx are not to be ignored. */ - _gl_CTX tmp_ctx = *(_gl_CTX *) ctx; - OPENSSL_FN (_Final) (res, &tmp_ctx); - return res; -} - -/* Undef so we can include multiple times. */ -#undef GL_CRYPTO_FN -#undef OPENSSL_FN -#undef _GLCRYPTO_PREFIX -#undef OPENSSL_ALG -#undef GL_OPENSSL_NAME - -_GL_INLINE_HEADER_END === removed file 'm4/gl-openssl.m4' --- m4/gl-openssl.m4 2013-12-10 02:44:28 +0000 +++ m4/gl-openssl.m4 1970-01-01 00:00:00 +0000 @@ -1,51 +0,0 @@ -# gl-openssl.m4 serial 3 -dnl Copyright (C) 2013 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_SET_CRYPTO_CHECK_DEFAULT], -[ - m4_define([gl_CRYPTO_CHECK_DEFAULT], [$1]) -]) -gl_SET_CRYPTO_CHECK_DEFAULT([no]) - -AC_DEFUN([gl_CRYPTO_CHECK], -[ - dnl gnulib users set this before gl_INIT with gl_SET_CRYPTO_CHECK_DEFAULT() - m4_divert_once([DEFAULTS], [with_openssl_default='gl_CRYPTO_CHECK_DEFAULT']) - - dnl Only clear once, so crypto routines can be checked for individually - m4_divert_once([DEFAULTS], [LIB_CRYPTO=]) - - AC_ARG_WITH([openssl], - [AS_HELP_STRING([--with-openssl], - [use libcrypto hash routines. Valid ARGs are: - 'yes', 'no', 'auto' => use if available, - 'optional' => use if available and warn if not available; - default is ']gl_CRYPTO_CHECK_DEFAULT['])], - [], - [with_openssl=$with_openssl_default]) - - if test "x$1" = xMD5; then - ALG_header=md5.h - else - ALG_header=sha.h - fi - - AC_SUBST([LIB_CRYPTO]) - if test "x$with_openssl" != xno; then - AC_CHECK_LIB([crypto], [$1], - [AC_CHECK_HEADERS([openssl/$ALG_header], - [LIB_CRYPTO=-lcrypto - AC_DEFINE([HAVE_OPENSSL_$1], [1], - [Define to 1 if libcrypto is used for $1.])])]) - if test "x$LIB_CRYPTO" = x; then - if test "x$with_openssl" = xyes; then - AC_MSG_ERROR([openssl development library not found for $1]) - elif test "x$with_openssl" = xoptional; then - AC_MSG_WARN([openssl development library not found for $1]) - fi - fi - fi -]) === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-11 00:32:00 +0000 +++ src/ChangeLog 2013-12-11 05:37:30 +0000 @@ -1,3 +1,9 @@ +2013-12-11 Paul Eggert + + Remove the option of using libcrypto. + * Makefile.in (LIB_CRYPTO): Remove. + (LIBES): Don't use it. + 2013-12-11 Juri Linkov * term.c (term_get_fkeys_1): Remove non-standard IBM terminfo === modified file 'src/Makefile.in' --- src/Makefile.in 2013-12-08 08:05:36 +0000 +++ src/Makefile.in 2013-12-11 05:37:30 +0000 @@ -139,7 +139,6 @@ LIB_ACL=@LIB_ACL@ LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@ -LIB_CRYPTO=@LIB_CRYPTO@ LIB_EACCESS=@LIB_EACCESS@ LIB_FDATASYNC=@LIB_FDATASYNC@ LIB_TIMER_TIME=@LIB_TIMER_TIME@ @@ -404,7 +403,6 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ $(LIBX_OTHER) $(LIBSOUND) \ $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \ - $(LIB_CRYPTO) \ $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) \ $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \