Paul Eggert [Mon, 21 May 2012 19:04:11 +0000 (12:04 -0700)]
Use full name for m4/gnulib-comp.m4. (Bug#11529)
Previously the file was named m4/gl-comp.m4 due to DOS 8+3 restrictions,
even though the file's name in gnulib is m4/gnulib-comp.m4.
This had a problem when merging from gnulib, as the code temporarily
renamed it to the full name, causing problems when interrupted.
Now the file has its full name, with the idea that we will find
a solution for MS-DOS that does not affect the rest of Emacs.
* m4/gnulib-comp.m4: Rename from m4/gl-comp.m4.
* admin/merge-gnulib: Leave m4/gnulib-comp.m4's name alone.
Paul Eggert [Mon, 21 May 2012 02:33:13 +0000 (19:33 -0700)]
Make merging from gnulib a script, not a makefile action.
Putting it in a makefile has some problems with reflection, as
merging from gnulib updates 'configure', which can update the makefile.
Putting it in a standalone script breaks this loop.
* Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4)
(GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib):
Remove, moving the actions to the script admin/merge-gnulib.
* admin/merge-gnulib: New script, with actions moved here from
../Makefile.in.
Paul Eggert [Sat, 19 May 2012 08:49:08 +0000 (01:49 -0700)]
Remove no-longer-used macro HAVE_FTIME.
* configure.in (machine): Do not set to 'vax', since src/m/vax.h
is being removed.
(AC_CHECK_FUNCS): Remove ftime.
* admin/CPP-DEFINES (HAVE_FTIME): Remove.
* nt/config.nt (HAVE_FTIME): Remove undef; not needed.
* src/m/vax.h: Remove; no longer needed since HAVE_FTIME is being removed.
* src/s/ms-w32.h (HAVE_FTIME): Remove; not needed.
Glenn Morris [Sat, 19 May 2012 06:34:59 +0000 (23:34 -0700)]
* Makefile.in (leim): No need to set PARALLEL.
This predates the use of changed.misc etc to serialize the leim build.
The leim Makefile used to set .NO_PARALLEL/.NOTPARALLEL for the same
reason, but has not done so for many years.
Jay Belanger [Sat, 19 May 2012 03:00:48 +0000 (22:00 -0500)]
* calc/calc.el (calc-ensure-consistent-units): New variable.
* calc/calc-units.el (math-consistent-units-p, math-check-unit-consistency):
New functions.
(calc-quick-units, calc-convert-units): Use `math-check-unit-consistency' when
`calc-ensure-consistent-units' is non-nil.
(calc-extract-units): Fix typo.
* doc/misc/calc.texi
(Basic Operations on Units, Customizing Calc):
Mention `calc-ensure-consistent-units'.
Stefan Monnier [Fri, 18 May 2012 19:04:07 +0000 (15:04 -0400)]
* lisp/textmodes/flyspell.el: Commenting style, plus code simplifications.
(flyspell-default-deplacement-commands): Don't spell check after
repeated window/frame switches (e.g. triggered by mouse-movement).
(flyspell-delay-commands, flyspell-deplacement-commands): Use mapc.
(flyspell-debug-signal-word-checked): Simplify and fit in 80 cols.
(flyspell-casechars-cache, flyspell-ispell-casechars-cache)
(flyspell-not-casechars-cache, flyspell-ispell-not-casechars-cache):
Remove unused vars.
(flyspell-get-casechars, flyspell-get-not-casechars):
Simplify; Don't bother removing a ] just to add it back.
* lisp/textmodes/ispell.el (ispell-program-name): Use executable-find.
Eli Zaretskii [Fri, 18 May 2012 08:36:50 +0000 (11:36 +0300)]
Fix compilation with -DGLYPH_DEBUG=1 on MS-Windows.
src/w32term.c [GLYPH_DEBUG]: Add prototype for x_check_font.
(x_check_font) [GLYPH_DEBUG]: New function, copied from xterm.c
src/w32fns.c (unwind_create_frame) [GLYPH_DEBUG]: Fix broken
reference to image_cache->refcount.
(x_create_tip_frame): Fix broken use of FRAME_IMAGE_CACHE.
Glenn Morris [Fri, 18 May 2012 07:41:13 +0000 (00:41 -0700)]
Avoid installation followed by immediate deletion for self-contained ns
* configure.in (INSTALL_ARCH_INDEP_EXTRA): New output variable.
* Makefile.in (INSTALL_ARCH_INDEP_EXTRA): New, set by configure.
(install-arch-indep): Don't install-etc for self-contained ns builds.
Glenn Morris [Fri, 18 May 2012 06:46:05 +0000 (23:46 -0700)]
Makefile simplifications related to creating installation directories
A separate mkdir rule is not needed, since MKDIR_P is thread-safe.
* Makefile.in (install-arch-dep): Ensure bindir exists.
Drop mkdir dependency.
(install-arch-indep): Ensure docdir, infodir, mandir exist.
(install-leim): Drop mkdir dependency.
(mkdir): Remove most directories, now made in relevant rules.
Stefan Monnier [Thu, 17 May 2012 20:04:56 +0000 (16:04 -0400)]
Minor renaming of internal CL functions and variables.
* lisp/emacs-lisp/cl-seq.el (cl--adjoin): Rename from cl-adjoin.
(cl--position): Rename from cl-position.
(cl--delete-duplicates): Rename from cl-delete-duplicates.
* lisp/emacs-lisp/cl.el (cl--gensym-counter): Rename from *gensym-counter*.
(cl--random-state): Rename from *random-state*.
Glenn Morris [Thu, 17 May 2012 19:30:42 +0000 (15:30 -0400)]
* Makefile.in (install-etc): Fix previous change.
Remember to always call MKDIR_P and INSTALL_DATA from the top-level
directory, for the case in which we are falling back to build-aux/install-sh.
It would make life much easier if autoconf would use an absolute path
in this case.
Glenn Morris [Thu, 17 May 2012 06:07:26 +0000 (23:07 -0700)]
Minor optimization for install of self-contained NS info files
* configure.in (etcdir): For a self-contained ns build,
set it to the appropriate values.
* Makefile.in (install-arch-dep): No need to move info/ any more.
Glenn Morris [Thu, 17 May 2012 05:32:37 +0000 (22:32 -0700)]
Fix previous change, for NS builds that are not self-contained
* configure.in (ns_self_contained): New output variable.
* Makefile.in (ns_self_contained): New, set by configure.
(install-arch-dep): Use $ns_self_contained.
Glenn Morris [Thu, 17 May 2012 01:23:03 +0000 (21:23 -0400)]
Install a self-contained NS build's libexec directly into the right place
This is rather than installing it in one place then moving it.
* configure.in (archlibdir): Set it for self-contained ns builds.
(libexecdir): Don't expand it now (this is mainly cosmetic).
* Makefile.in (ns_appbindir, ns_appresdir):
Move them before things that may refer to them.
(install-arch-dep): No need to relocate self-contained ns libexec.
* lib-src/Makefile.in (ns_appbindir): New, set by configure.
Paul Eggert [Wed, 16 May 2012 09:01:55 +0000 (02:01 -0700)]
* configure.in: Simplify by removing CPP etc.
(CPP_TEST_OPTIONS, NON_GNU_CPP, cc_specified, SPECIFIED_CFLAGS)
(SPECIFED_CPP, CPP, NON_GNU_CC, AC_PROG_CPP): Remove; not needed.
In particular we no longer need to fiddle with CPP, since we don't
use CPP specially any more.
(gl_EARLY): Invoke this after adjusting CC, so that it uses the
adjusted compiler.
(AC_PROG_INSTALL, AC_PROG_MKDIR_P, AC_PROG_RANLIB): Comment out,
since gl_EARLY and/or Autoconf already does these.
Use for otherchars the same delay used for other word components, so word
is not inmediately checked unless we are in a char that is neither a normal
word component nor an otherchar.
Glenn Morris [Wed, 16 May 2012 06:15:52 +0000 (23:15 -0700)]
Try to fix building with gcc >= 4.6 on Darwin.
Eg, hydra builds have been failing for some time because (?) of this.
In gcc < 4.6, unrecognized -no-fo options just cause a warning.
In 4.6 and later, they cause an error.
* configure.in: (CPP): Do not unconditionally set it on Darwin.
Instead, try to test if -no-cpp-precomp is accepted.
(CPP_TEST_OPTIONS, SPECIFIED_CPP): New.
Stefan Monnier [Wed, 16 May 2012 01:57:20 +0000 (21:57 -0400)]
* lisp/minibuffer.el (completion--sifn-requote): Fix last change.
(minibuffer-local-must-match-filename-map):
Move define-obsolete-variable-alias before its var.
Stefan Monnier [Tue, 15 May 2012 18:07:36 +0000 (14:07 -0400)]
* lisp/minibuffer.el (completion--sifn-requote): Handle sifn's truncation
behavior.
(completion--string-equal-p): New function.
(completion--twq-all): Use it to get better assertion failure data.
Ted Zlatanov [Tue, 15 May 2012 08:47:38 +0000 (04:47 -0400)]
add url-build-query-string and improve url-parse-query-string as per bug#8706
* url/url-util.el (url-build-query-string): New function.
(url-parse-query-string): Allow that '=' is not required and split
URL parameters on ';', not just '&'.
Julien Danjou [Mon, 14 May 2012 15:42:23 +0000 (17:42 +0200)]
Fix a regression in erc-dcc
* erc-dcc.el (erc-dcc-handle-ctcp-send): Fix a regression
introduced on 2011-11-28 when fixing quoted filenames matching,
the regex group was not corrected.