Skip to content

Commit

Permalink
Emacs 24.2.93 with emacs-24.2.92-mac-3.93
Browse files Browse the repository at this point in the history
  • Loading branch information
railwaycat committed Feb 9, 2013
1 parent 395f34c commit bf6c535
Show file tree
Hide file tree
Showing 1,520 changed files with 3,199 additions and 2,378 deletions.
9 changes: 9 additions & 0 deletions ChangeLog
@@ -1,3 +1,12 @@
2013-01-16 Glenn Morris <rgm@gnu.org>

* Makefile.in (install-arch-indep): Put back a chmod that was
removed 2012-05-19. (Bug#13430)

2013-01-10 Glenn Morris <rgm@gnu.org>

* make-dist: Add options for xz compression and no compression.

2013-01-04 Glenn Morris <rgm@gnu.org>

* info/dir: Add htmlfontify.
Expand Down
5 changes: 4 additions & 1 deletion Makefile.in
Expand Up @@ -543,6 +543,7 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
tar -xvf - && cat > /dev/null) || exit 1; \
[ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \
for subdir in `find $${dest} -type d -print` ; do \
chmod a+rx $${subdir} ; \
rm -f $${subdir}/.gitignore ; \
rm -f $${subdir}/.arch-inventory ; \
rm -f $${subdir}/.DS_Store ; \
Expand Down Expand Up @@ -577,7 +578,9 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
done )
-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}

# The last chmod isn't needed at present.
## The above chmods are needed because "umask 022; tar ..." is not
## guaranteed to do the right thing; eg if we are root and tar is
## preserving source permissions.

## We install only the relevant DOC file if possible
## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*.
Expand Down
1 change: 1 addition & 0 deletions README
@@ -1,5 +1,6 @@
0. current

+ update 02/09/2013: Emacs 24.2.93 with emacs-24.2.93-mac-3.93
+ update 01/12/2013: Emacs 24.2.92 with emacs-24.2.92-mac-3.92
+ update 12/19/2012: Emacs 24.2.91 with emacs-24.2.91-mac-3.91
+ update 11/25/2012: Emacs 24.2.90 with emacs-24.2.90-mac-3.90
Expand Down
2 changes: 1 addition & 1 deletion README-emacs
Expand Up @@ -2,7 +2,7 @@ Copyright (C) 2001-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.


This directory tree holds version 24.2.92 of GNU Emacs, the extensible,
This directory tree holds version 24.2.93 of GNU Emacs, the extensible,
customizable, self-documenting real-time display editor.

The file INSTALL in this directory says how to build and install GNU
Expand Down
2 changes: 1 addition & 1 deletion build-emacs.app.sh
Expand Up @@ -10,7 +10,7 @@ app_dir=$installprefix/Emacs.app/Contents/Resources
# this may not works since emacs 24*
# version=`grep 'defconst[ ]*emacs-version' ./lisp/version.el \
# | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
version=24.2.92
version=24.2.93
compver=x86_64-apple-darwin`uname -r`

# make an emacs bundle
Expand Down
32 changes: 19 additions & 13 deletions configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for emacs 24.2.92.
# Generated by GNU Autoconf 2.69 for emacs 24.2.93.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='emacs'
PACKAGE_TARNAME='emacs'
PACKAGE_VERSION='24.2.92'
PACKAGE_STRING='emacs 24.2.92'
PACKAGE_VERSION='24.2.93'
PACKAGE_STRING='emacs 24.2.93'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -1979,7 +1979,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures emacs 24.2.92 to adapt to many kinds of systems.
\`configure' configures emacs 24.2.93 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -2053,7 +2053,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of emacs 24.2.92:";;
short | recursive ) echo "Configuration of emacs 24.2.93:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -2090,9 +2090,10 @@ Optional Features:
--disable-dependency-tracking
speeds up one-time build
--disable-largefile omit support for large files
--enable-gcc-warnings turn on lots of GCC warnings. This is intended for
developers, and may generate false alarms when used
with older or non-GNU development tools.
--enable-gcc-warnings turn on lots of GCC warnings/errors. This is
intended for developers, and may generate false
alarms when used with older or non-GNU development
tools.
--enable-link-time-optimization
build emacs with link-time optimization. This is
supported only for GCC since 4.5.0.
Expand Down Expand Up @@ -2229,7 +2230,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
emacs configure 24.2.92
emacs configure 24.2.93
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2963,7 +2964,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by emacs $as_me 24.2.92, which was
It was created by emacs $as_me 24.2.93, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -3879,7 +3880,7 @@ fi

# Define the identity of the package.
PACKAGE='emacs'
VERSION='24.2.92'
VERSION='24.2.93'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -25020,6 +25021,11 @@ if test "$HAVE_MACGUI" = "yes"; then
It is not recommended for casual use
or as a basis of (binary) distributions."
echo
if test "$with_wide_int" = yes; then
echo "Warning: \`--with-wide-int' is not eagerly tested on the Mac port.
Use it at your own risk."
echo
fi
fi

if test "$HAVE_NS" = "yes"; then
Expand Down Expand Up @@ -25726,7 +25732,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by emacs $as_me 24.2.92, which was
This file was extended by emacs $as_me 24.2.93, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -25792,7 +25798,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
emacs config.status 24.2.92
emacs config.status 24.2.93
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

Expand Down
9 changes: 7 additions & 2 deletions configure.ac
Expand Up @@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.

AC_PREREQ(2.65)
AC_INIT(emacs, 24.2.92)
AC_INIT(emacs, 24.2.93)
AC_CONFIG_HEADER(src/config.h:src/config.in)
AC_CONFIG_SRCDIR(src/lisp.h)
AC_CONFIG_AUX_DIR(build-aux)
Expand Down Expand Up @@ -621,7 +621,7 @@ fi

AC_ARG_ENABLE([gcc-warnings],
[AS_HELP_STRING([--enable-gcc-warnings],
[turn on lots of GCC warnings. This is intended for
[turn on lots of GCC warnings/errors. This is intended for
developers, and may generate false alarms when used
with older or non-GNU development tools.])],
[case $enableval in
Expand Down Expand Up @@ -4633,6 +4633,11 @@ if test "$HAVE_MACGUI" = "yes"; then
It is not recommended for casual use
or as a basis of (binary) distributions."
echo
if test "$with_wide_int" = yes; then
echo "Warning: \`--with-wide-int' is not eagerly tested on the Mac port.
Use it at your own risk."
echo
fi
fi

if test "$HAVE_NS" = "yes"; then
Expand Down
10 changes: 10 additions & 0 deletions doc/emacs/ChangeLog
@@ -1,3 +1,13 @@
2013-01-18 Glenn Morris <rgm@gnu.org>

* custom.texi (Directory Variables): Fix paren typo.

2013-01-16 Glenn Morris <rgm@gnu.org>

* trouble.texi (Crashing): Not all addr2line have -p. (Bug#13445)

* custom.texi (Custom Themes): Fix typo.

2013-01-05 Glenn Morris <rgm@gnu.org>

* text.texi (HTML Mode): Remove deleted nxml C-RET binding.
Expand Down
4 changes: 2 additions & 2 deletions doc/emacs/custom.texi
Expand Up @@ -555,7 +555,7 @@ or disabled as a unit. You can use Custom themes to switch easily
between various collections of settings, and to transfer such
collections from one computer to another.

A Custom theme is stored an Emacs Lisp source file. If the name of
A Custom theme is stored as an Emacs Lisp source file. If the name of
the Custom theme is @var{name}, the theme file is named
@file{@var{name}-theme.el}. @xref{Creating Custom Themes}, for the
format of a theme file and how to make one.
Expand Down Expand Up @@ -1305,7 +1305,7 @@ files in that subdirectory.
@example
((nil . ((indent-tabs-mode . t)
(fill-column . 80)))
(c-mode . ((c-file-style . "BSD")))
(c-mode . ((c-file-style . "BSD")
(subdirs . nil)))
("src/imported"
. ((nil . ((change-log-default-name
Expand Down
2 changes: 1 addition & 1 deletion doc/emacs/emacsver.texi
@@ -1,4 +1,4 @@
@c It would be nicer to generate this using configure and @version@.
@c However, that would mean emacsver.texi would always be newer
@c then the info files in release tarfiles.
@set EMACSVER 24.2.92
@set EMACSVER 24.2.93
5 changes: 3 additions & 2 deletions doc/emacs/trouble.texi
Expand Up @@ -320,13 +320,14 @@ backtrace with source-code line numbers:

@example
sed -n 's/.*\[\(.*\)]$/\1/p' @var{backtrace} |
addr2line -Cfip -e @var{bindir}/emacs
addr2line -C -f -i -e @var{bindir}/emacs
@end example

@noindent
Here, @var{backtrace} is the name of a text file containing a copy of
the backtrace, and @var{bindir} is the name of the directory that
contains the Emacs executable.
contains the Emacs executable.@footnote{You may wish to add the
@option{-p} option, if your version of @command{addr2line} supports it.}

@cindex core dump
Optionally, Emacs can generate a @dfn{core dump} when it crashes. A
Expand Down
5 changes: 5 additions & 0 deletions doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
2013-01-16 Glenn Morris <rgm@gnu.org>

* macros.texi (Indenting Macros): Fix order of an indent
symbol's arguments. (Bug#13450)

2013-01-09 Glenn Morris <rgm@gnu.org>

* commands.texi (Interactive Codes):
Expand Down
4 changes: 2 additions & 2 deletions doc/lispref/macros.texi
Expand Up @@ -606,12 +606,12 @@ calculate the indentation of a line within this expression. The
function receives two arguments:

@table @asis
@item @var{pos}
The position at which the line being indented begins.
@item @var{state}
The value returned by @code{parse-partial-sexp} (a Lisp primitive for
indentation and nesting computation) when it parses up to the
beginning of this line.
@item @var{pos}
The position at which the line being indented begins.
@end table

@noindent
Expand Down
2 changes: 1 addition & 1 deletion doc/man/emacs.1
@@ -1,5 +1,5 @@
.\" See section COPYING for copyright and redistribution information.
.TH EMACS 1 "2007 April 13" "GNU Emacs 24.2.92"
.TH EMACS 1 "2007 April 13" "GNU Emacs 24.2.93"
.
.
.SH NAME
Expand Down
38 changes: 38 additions & 0 deletions doc/misc/ChangeLog
@@ -1,3 +1,41 @@
2013-02-07 Bastien Guerry <bzg@gnu.org>

* org.texi (References): Clarify an example.
(Installation): Fix instructions.
(Org-Plot): Fix link.
(Checkboxes, Radio lists): Fix typos.

2013-02-06 Glenn Morris <rgm@gnu.org>

* cl.texi (Equality Predicates): Mention memql.

2013-02-03 Eric Ludlam <zappo@gnu.org>

* doc/misc/ede.texi (Creating a project): Make ede-new doc less
specific, and only about items it supports, indicating that there
might be more. Remove refs to simple project and direct automake
from ede new.
(Simple projects): Re-write to not talk about ede-simple-project
which is deprecated, and instead use the term to mean projects
that don't do much management, just project wrapping. Add
ede-generic-project link.
(ede-generic-project): New node (bug#11441).

2013-02-03 Glenn Morris <rgm@gnu.org>

* cl.texi (Equality Predicates): Fix eq/eql pedantry.

2013-01-13 Bastien Guerry <bzg@gnu.org>

* org.texi (Installation): Simplify.

2013-01-13 François Allisson <francois@allisson.co> (tiny change)

* org.texi (Handling links): Update the mention to the obsolete
variable `org-link-to-org-use-id' with a mention to the newer
variable `org-id-link-to-org-use-id'. Mention the need to load
the org-id library.

2013-01-08 Bastien Guerry <bzg@gnu.org>

* org.texi (Pushing to MobileOrg): Add footnote about using
Expand Down
5 changes: 3 additions & 2 deletions doc/misc/cl.texi
Expand Up @@ -817,8 +817,9 @@ not compare strings against vectors of integers.
Also note that the Common Lisp functions @code{member} and @code{assoc}
use @code{eql} to compare elements, whereas Emacs Lisp follows the
MacLisp tradition and uses @code{equal} for these two functions.
In Emacs, use @code{memq} (or @code{cl-member}) and @code{assq} (or
@code{cl-assoc}) to get functions which use @code{eql} for comparisons.
The functions @code{cl-member} and @code{cl-assoc} use @code{eql},
as in Common Lisp. The standard Emacs Lisp functions @code{memq} and
@code{assq} use @code{eq}, and the standard @code{memql} uses @code{eql}.

@node Control Structure
@chapter Control Structure
Expand Down

0 comments on commit bf6c535

Please sign in to comment.