Commit 6e6c82a4 authored by Paul Eggert's avatar Paul Eggert

Merge from trunk.

parents 78df1fb1 cc26d239
2012-02-05 Christoph Scholtes <cschol2112@googlemail.com>
* make-dist (README.W32): Include file in source tarball. (Bug#9750)
* lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform
specific makefiles to support getopt_.h generation with MSVC.
2012-02-04 Glenn Morris <rgm@gnu.org>
* Makefile.in (uninstall):
Handle compressed info files and man pages. (Bug#10718)
2012-02-02 Glenn Morris <rgm@gnu.org>
* configure.in [HAVE_NS]:
Error if use --without-toolkit-scroll-bars. (Bug#10673)
2012-02-01 Paul Eggert <eggert@cs.ucla.edu>
Port to older Solaris 10 versions (Bug#10677).
Bug reported by Chong Yidong for SunOS 5.10 Generic_127111-11 sparc.
I cannot reproduce it on SunOS 5.10 Generic_141444-09 sparc but
possibly this is because Sun fixed the 'stat' bug in my version.
* Makefile.in (GNULIB_TOOL_FLAGS): Do not avoid the pathmax module.
* lib/pathmax.h, m4/pathmax.m4: New files, from gnulib.
* lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
These changes are based on gnulib version
4f11d6bebc3098c64ffde27079ab0d0cecfd0cdc dated 2011-10-07 20:59:10,
because Emacs is in feature freeze and we do not want to merge any
more-recent changes from gnulib.
2012-01-31 Glenn Morris <rgm@gnu.org>
* configure.in: Throw an explicit error if Motif toolkit was
requested but requirements could not be found.
* configure.in: Allow Emacs to actually be built with xaw scroll-bars.
2012-01-30 Eli Zaretskii <eliz@gnu.org>
* lib/makefile.w32-in ($(BLD)/sha1.$(O) $(BLD)/sha256.$(O)
$(BLD)/sha512.$(O)): Depend on stamp_BLD. Fixes a build failure
with "make -j3".
2012-01-16 Juanma Barranquero <lekktu@gmail.com>
* .bzrignore: Ignore etc/__pycache__.
......
......@@ -341,7 +341,7 @@ GNULIB_MODULES = \
mktime pthread_sigmask readlink \
socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
GNULIB_TOOL_FLAGS = \
--avoid=msvc-inval --avoid=msvc-nothrow --avoid=pathmax \
--avoid=msvc-inval --avoid=msvc-nothrow \
--avoid=raise --avoid=threadlib \
--conditional-dependencies --import --no-changelog --no-vc-files \
--makefile-name=gnulib.mk
......@@ -727,11 +727,16 @@ uninstall:
(cd $(DESTDIR)${infodir} && \
for elt in $(INFO_FILES); do \
$(INSTALL_INFO) --remove --info-dir=. $$elt; \
for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
ext=.gz; else ext=; fi; \
for f in `ls $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext 2>/dev/null`; do \
rm -f $$f; \
done; \
done;)
(cd $(DESTDIR)${man1dir} && rm -f $(MAN_PAGES))
(if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
ext=.gz; else ext=; fi; \
cd $(DESTDIR)${man1dir} && for page in ${MAN_PAGES}; do \
rm -f $$page$$ext; done )
(cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS))
(cd $(DESTDIR)${icondir} && rm -f hicolor/*x*/apps/emacs.png hicolor/*x*/apps/emacs22.png hicolor/scalable/apps/emacs.svg hicolor/scalable/mimetypes/emacs-document.svg )
-rm -f $(DESTDIR)${desktopdir}/emacs.desktop
......
......@@ -2,7 +2,7 @@ Copyright (C) 2001-2012 Free Software Foundation, Inc.
See the end of the file for license conditions.
This directory tree holds version 24.0.92 of GNU Emacs, the extensible,
This directory tree holds version 24.0.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
......
2012-01-19 Glenn Morris <rgm@gnu.org>
* bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer to the
"skip?" question, since there can be multiple such for any revision.
2012-01-14 Eli Zaretskii <eliz@gnu.org>
* FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as
......
......@@ -100,10 +100,10 @@ names of the people who have checked it.
SECTION READERS
----------------------------------
TUTORIAL cyd
TUTORIAL.bg
TUTORIAL.bg ogi
TUTORIAL.cn
TUTORIAL.cs
TUTORIAL.de
TUTORIAL.de wl
TUTORIAL.eo
TUTORIAL.es
TUTORIAL.fr
......@@ -111,14 +111,14 @@ TUTORIAL.he eliz
TUTORIAL.it
TUTORIAL.ja
TUTORIAL.ko
TUTORIAL.nl
TUTORIAL.nl Pieter Schoenmakers
TUTORIAL.pl
TUTORIAL.pt_BR
TUTORIAL.ro
TUTORIAL.ru
TUTORIAL.ru Alex Ott
TUTORIAL.sk
TUTORIAL.sl
TUTORIAL.sv
TUTORIAL.sl Primoz PETERLIN
TUTORIAL.sv Mats Lidell
TUTORIAL.th
TUTORIAL.zh
......@@ -126,7 +126,7 @@ TUTORIAL.zh
abbrevs.texi cyd
ack.texi
anti.texi
anti.texi cyd
arevert-xtra.texi cyd
basic.texi cyd
buffers.texi cyd
......@@ -180,60 +180,59 @@ xresources.texi cyd
** Check the Lisp manual.
abbrevs.texi
advice.texi
advice.texi cyd
anti.texi
back.texi
backups.texi
buffers.texi
commands.texi
compile.texi
control.texi
customize.texi
compile.texi cyd
control.texi cyd
customize.texi cyd
debugging.texi
display.texi
edebug.texi
elisp.texi
errors.texi
eval.texi
eval.texi cyd
files.texi
frames.texi
functions.texi
hash.texi
functions.texi cyd
hash.texi cyd
help.texi
hooks.texi
index.texi
internals.texi
intro.texi
intro.texi cyd
keymaps.texi
lists.texi
loading.texi
lists.texi cyd
loading.texi cyd
locals.texi
macros.texi
macros.texi cyd
maps.texi
markers.texi
minibuf.texi
modes.texi
nonascii.texi
numbers.texi
objects.texi
numbers.texi cyd
objects.texi cyd
os.texi
package.texi
positions.texi
processes.texi
searching.texi
sequences.texi
sequences.texi cyd
streams.texi
strings.texi
symbols.texi
strings.texi cyd
symbols.texi cyd
syntax.texi
text.texi
tips.texi
variables.texi
variables.texi cyd
windows.texi
* PLANNED ADDITIONS
** pov-mode (probably not for Emacs-23: waiting for a Free POV-Ray).
* pov-mode (probably not for Emacs-23: waiting for a Free POV-Ray).
** gas-mode ?
......
......@@ -133,9 +133,23 @@ are both lists of revnos, in oldest-first order."
(setq str (substring str (match-end 0))))
(when (string-match "[.!;, ]+\\'" str)
(setq str (substring str 0 (match-beginning 0))))
(if (save-excursion (y-or-n-p (concat str ": Skip? ")))
(setq skip t))))
(if skip
(let ((help-form "\
Type `y' to skip this revision,
`N' to include it and go on to the next revision,
`n' to not skip, but continue to search this log entry for skip regexps,
`q' to quit merging."))
(case (save-excursion
(read-char-choice
(format "%s: Skip (y/n/N/q/%s)? " str
(key-description (vector help-char)))
'(?y ?n ?N ?q)))
(?y (setq skip t))
(?q (keyboard-quit))
;; A single log entry can match skip-regexp multiple
;; times. If you are sure you don't want to skip it,
;; you don't want to be asked multiple times.
(?N (setq skip 'no))))))
(if (eq skip t)
(push revno skipped)
(push revno revnos)))))
(delete-region (point) (point-max)))
......
;;; python.wy -- LALR grammar for Python
;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
;; Copyright (C) 2001-2010 Python Software Foundation
;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
;; 2009, 2010 Python Software Foundation; All Rights Reserved
;; Author: Richard Kim <ryk@dspwiz.com>
;; Maintainer: Richard Kim <ryk@dspwiz.com>
......
......@@ -470,13 +470,13 @@ Menu items are appended to the common grammar menu.")
"srecode/srt-wy")
("wisent-javascript-jv-wy.el"
"semantic/wisent/js-wy"
"Copyright (C) 1998-2011 Ecma International"
"Copyright (C) 1998-2011 Ecma International."
,wisent-make-parsers--ecmascript-license)
("wisent-java-tags-wy.el"
"semantic/wisent/javat-wy")
("wisent-python-wy.el"
"semantic/wisent/python-wy"
"Copyright (C) 2001-2010 Python Software Foundation"
"Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software Foundation; All Rights Reserved."
,wisent-make-parsers--python-license)))
(defun wisent-make-parsers ()
......
......@@ -102,3 +102,6 @@ For each step, check for possible errors.
13. For a pretest, announce it on emacs-devel and BCC the pretesters.
For a release, announce it on info-gnu@gnu.org,
info-gnu-emacs@gnu.org, and emacs-devel.
14. For a release, update the Emacs homepage in the web repository.
Also add the new NEWS file as NEWS.xx.y.
......@@ -640,3 +640,14 @@ I think you also have to add them to 'tags' and 'tags_single_letter'
in /usr/share/perl5/Debbugs/Config.pm.
And update /var/www/Developer.html with a description of what the tag means.
And the "valid tags" list in /var/www/index.html.
** Backups
The FSF sysadmins handle multi-generational backups of the filesystem
on debbugs.gnu.org. But if you really want to have your own backup of
the bug database, you can use rsync (this requires login access to
debbugs.gnu.org):
rsync -azvv -e ssh USER@debbugs.gnu.org:/var/lib/debbugs/ DEST
Note that this occupies well over 1G of disk space.
......@@ -7,6 +7,7 @@ See the end of the file for license conditions.
* Status Key
- -- as yet unknown
n/a -- not applicable (internal, uninteresting, etc)
obsolete -- an obsolete feature, to be removed in future
todo -- not documented but should be
NODE -- documented in or under info node NODE
......@@ -26,7 +27,6 @@ See the end of the file for license conditions.
bytecomp (elisp) Compilation Functions
checkdoc (elisp) Documentation Tips
cl (cl)
cl-19 n/a
cl-compat n/a
cl-specs n/a
copyright -
......@@ -47,13 +47,12 @@ See the end of the file for license conditions.
generic (elisp) Generic Modes
gulp n/a
helper -
levents -
levents obsolete
lisp-float-type -
lisp-mnt -
lisp-mode n/a
lmenu -
lselect -
lucid -
lmenu obsolete
lucid obsolete
macroexp (elisp) Expansion
pp (emacs) Program Indent
re-builder -
......@@ -62,7 +61,7 @@ See the end of the file for license conditions.
ring (elisp) Rings
rx -
shadow -
sregex -
sregex obsolete
syntax (elisp) Position Parse
testcover -
timer (elisp) Timers
......
......@@ -36,7 +36,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=pathmax --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
......@@ -72,7 +72,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/longlong.m4 \
$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/md5.m4 \
$(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/multiarch.m4 \
$(top_srcdir)/m4/nocrash.m4 \
$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/pathmax.m4 \
$(top_srcdir)/m4/pthread_sigmask.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/sha1.m4 \
$(top_srcdir)/m4/sha256.m4 $(top_srcdir)/m4/sha512.m4 \
......@@ -795,8 +795,8 @@ EXTRA_DIST = alloca.in.h allocator.h careadlinkat.h md5.h sha1.h \
sha256.h sha512.h dosname.h ftoastr.c ftoastr.h dup2.c \
filemode.h getloadavg.c getopt.c getopt.in.h getopt1.c \
getopt_int.h ignore-value.h intprops.h inttypes.in.h lstat.c \
mktime-internal.h mktime.c pthread_sigmask.c readlink.c \
signal.in.h sigprocmask.c \
mktime-internal.h mktime.c pathmax.h pthread_sigmask.c \
readlink.c signal.in.h sigprocmask.c \
$(top_srcdir)/build-aux/snippet/_Noreturn.h \
$(top_srcdir)/build-aux/snippet/arg-nonnull.h \
$(top_srcdir)/build-aux/snippet/c++defs.h \
......
......@@ -1003,6 +1003,7 @@ m4_include([m4/md5.m4])
m4_include([m4/mktime.m4])
m4_include([m4/multiarch.m4])
m4_include([m4/nocrash.m4])
m4_include([m4/pathmax.m4])
m4_include([m4/pthread_sigmask.m4])
m4_include([m4/readlink.m4])
m4_include([m4/sha1.m4])
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for emacs 24.0.92.
# Generated by GNU Autoconf 2.65 for emacs 24.0.93.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -549,8 +549,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='emacs'
PACKAGE_TARNAME='emacs'
PACKAGE_VERSION='24.0.92'
PACKAGE_STRING='emacs 24.0.92'
PACKAGE_VERSION='24.0.93'
PACKAGE_STRING='emacs 24.0.93'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -620,6 +620,8 @@ gl_GNULIB_ENABLED_stat_FALSE
gl_GNULIB_ENABLED_stat_TRUE
gl_GNULIB_ENABLED_sigprocmask_FALSE
gl_GNULIB_ENABLED_sigprocmask_TRUE
gl_GNULIB_ENABLED_pathmax_FALSE
gl_GNULIB_ENABLED_pathmax_TRUE
gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_FALSE
gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE
gl_GNULIB_ENABLED_dosname_FALSE
......@@ -1885,7 +1887,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.0.92 to adapt to many kinds of systems.
\`configure' configures emacs 24.0.93 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1959,7 +1961,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of emacs 24.0.92:";;
short | recursive ) echo "Configuration of emacs 24.0.93:";;
esac
cat <<\_ACEOF
......@@ -2122,7 +2124,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
emacs configure 24.0.92
emacs configure 24.0.93
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
......@@ -2844,7 +2846,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.0.92, which was
It was created by emacs $as_me 24.0.93, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
......@@ -3677,7 +3679,7 @@ fi
# Define the identity of the package.
PACKAGE='emacs'
VERSION='24.0.92'
VERSION='24.0.93'
cat >>confdefs.h <<_ACEOF
......@@ -6959,6 +6961,7 @@ esac
# Code from module mktime:
# Code from module multiarch:
# Code from module nocrash:
# Code from module pathmax:
# Code from module pthread_sigmask:
# Code from module readlink:
# Code from module signal-h:
......@@ -9835,6 +9838,10 @@ ns_frag=/dev/null
NS_OBJ=
NS_OBJC_OBJ=
if test "${HAVE_NS}" = yes; then
if test "$with_toolkit_scroll_bars" = "no"; then
as_fn_error "Non-toolkit scroll bars are not implemented for Nextstep." "$LINENO" 5
fi
window_system=nextstep
with_xft=no
# set up packaging dirs
......@@ -12190,6 +12197,14 @@ $as_echo "$emacs_cv_lesstif" >&6; }
CPPFLAGS=$OLD_CPPFLAGS
fi
fi
ac_fn_c_check_header_mongrel "$LINENO" "Xm/BulletinB.h" "ac_cv_header_Xm_BulletinB_h" "$ac_includes_default"
if test "x$ac_cv_header_Xm_BulletinB_h" = x""yes; then :
else
as_fn_error "Motif toolkit requested but requirements not found." "$LINENO" 5
fi
fi
......@@ -12201,7 +12216,7 @@ if test "${with_toolkit_scroll_bars}" != "no"; then
HAVE_XAW3D=no
USE_TOOLKIT_SCROLL_BARS=yes
elif test "${HAVE_XAW3D}" = "yes"; then
elif test "${HAVE_XAW3D}" = "yes" || test "${USE_X_TOOLKIT}" = "LUCID"; then
$as_echo "#define USE_TOOLKIT_SCROLL_BARS 1" >>confdefs.h
USE_TOOLKIT_SCROLL_BARS=yes
......@@ -21802,6 +21817,7 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
gl_gnulib_enabled_dosname=false
gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false
gl_gnulib_enabled_pathmax=false
gl_gnulib_enabled_sigprocmask=false
gl_gnulib_enabled_stat=false
gl_gnulib_enabled_strtoll=false
......@@ -21821,6 +21837,15 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=true
fi
}
func_gl_gnulib_m4code_pathmax ()
{
if ! $gl_gnulib_enabled_pathmax; then
gl_gnulib_enabled_pathmax=true
fi
}
func_gl_gnulib_m4code_sigprocmask ()
{
if ! $gl_gnulib_enabled_sigprocmask; then
......@@ -21999,6 +22024,9 @@ fi
if test $REPLACE_STAT = 1; then
func_gl_gnulib_m4code_dosname
fi
if test $REPLACE_STAT = 1; then
func_gl_gnulib_m4code_pathmax
fi
if test $REPLACE_STAT = 1; then
func_gl_gnulib_m4code_verify
fi
......@@ -22158,6 +22186,14 @@ else
gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_FALSE=
fi
if $gl_gnulib_enabled_pathmax; then
gl_GNULIB_ENABLED_pathmax_TRUE=
gl_GNULIB_ENABLED_pathmax_FALSE='#'
else
gl_GNULIB_ENABLED_pathmax_TRUE='#'
gl_GNULIB_ENABLED_pathmax_FALSE=
fi
if $gl_gnulib_enabled_sigprocmask; then
gl_GNULIB_ENABLED_sigprocmask_TRUE=
gl_GNULIB_ENABLED_sigprocmask_FALSE='#'
......@@ -22656,6 +22692,10 @@ if test -z "${gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE}" && test
as_fn_error "conditional \"gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${gl_GNULIB_ENABLED_pathmax_TRUE}" && test -z "${gl_GNULIB_ENABLED_pathmax_FALSE}"; then
as_fn_error "conditional \"gl_GNULIB_ENABLED_pathmax\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${gl_GNULIB_ENABLED_sigprocmask_TRUE}" && test -z "${gl_GNULIB_ENABLED_sigprocmask_FALSE}"; then
as_fn_error "conditional \"gl_GNULIB_ENABLED_sigprocmask\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
......@@ -23116,7 +23156,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.0.92, which was
This file was extended by emacs $as_me 24.0.93, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -23182,7 +23222,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.0.92
emacs config.status 24.0.93
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
......
......@@ -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.0.92)
AC_INIT(emacs, 24.0.93)
AC_CONFIG_HEADER(src/config.h:src/config.in)
AC_CONFIG_SRCDIR(src/lisp.h)
AC_CONFIG_AUX_DIR(build-aux)
......@@ -1568,6 +1568,10 @@ ns_frag=/dev/null
NS_OBJ=
NS_OBJC_OBJ=
if test "${HAVE_NS}" = yes; then
if test "$with_toolkit_scroll_bars" = "no"; then
AC_MSG_ERROR([Non-toolkit scroll bars are not implemented for Nextstep.])
fi
window_system=nextstep
with_xft=no
# set up packaging dirs
......@@ -2234,6 +2238,8 @@ Motif version prior to 2.1.
CPPFLAGS=$OLD_CPPFLAGS
fi
fi
AC_CHECK_HEADER([Xm/BulletinB.h], [],
[AC_MSG_ERROR([Motif toolkit requested but requirements not found.])])
fi
dnl Use toolkit scroll bars if configured for GTK or X toolkit and either
......@@ -2249,7 +2255,7 @@ if test "${with_toolkit_scroll_bars}" != "no"; then
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
HAVE_XAW3D=no
USE_TOOLKIT_SCROLL_BARS=yes
elif test "${HAVE_XAW3D}" = "yes"; then
elif test "${HAVE_XAW3D}" = "yes" || test "${USE_X_TOOLKIT}" = "LUCID"; then
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
USE_TOOLKIT_SCROLL_BARS=yes
fi
......
2012-02-10 Glenn Morris <rgm@gnu.org>
* mini.texi (Minibuffer Edit): Mention minibuffer-inactive-mode.
* programs.texi (Misc for Programs): Mention electric-layout-mode.
2012-02-09 Glenn Morris <rgm@gnu.org>
* buffers.texi (Misc Buffer): M-x info does not seem to require a
buffer switch after M-x rename-uniquely.
* trouble.texi (Checklist): Mention C-c m in report-emacs-bug.