upstream

14 files changed, 177 insertions, 45 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index e032ef87a40..9fc7ce3e33d 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -95,7 +95,6 @@ EMACS_CONFIGURATION
 EMACS_CONFIG_OPTIONS
 EMACS_INT
 EMACS_UINT
-FILE_SYSTEM_CASE
 FLOAT_CHECK_DOMAIN
 GC_LISP_OBJECT_ALIGNMENT
 GC_MARK_SECONDARY_STACK
@@ -131,17 +130,13 @@ HAVE_LOGB
 HAVE_LONG_FILE_NAMES
 HAVE_LRAND48
 HAVE_MENUS
-HAVE_MKDIR
 HAVE_MKTIME
 HAVE_MOUSE
-HAVE_PERROR
 HAVE_PSTAT_GETDYNAMIC
 HAVE_PWD_H
 HAVE_RANDOM
-HAVE_RENAME
 HAVE_RES_INIT
 HAVE_RINT
-HAVE_RMDIR
 HAVE_SELECT
 HAVE_SETLOCALE
 HAVE_SETPGID
@@ -151,7 +146,6 @@ HAVE_SHUTDOWN
 HAVE_SOCKETS
 HAVE_SOUND
 HAVE_STDLIB_H
-HAVE_STRERROR
 HAVE_STRFTIME
 HAVE_STRING_H
 HAVE_STRUCT_UTIMBUF
@@ -160,11 +154,9 @@ HAVE_SYS_SYSTEMINFO_H
 HAVE_SYS_TIMEB_H
 HAVE_SYS_TIME_H
 HAVE_TCATTR
-HAVE_TIMEVAL
 HAVE_TM_ZONE
 HAVE_TZSET
 HAVE_UNISTD_H
-HAVE_UTIMES
 HAVE_UTIME_H
 HAVE_WINDOW_SYSTEM
 HAVE_WORKING_VFORK
@@ -175,7 +167,6 @@ IS_ANY_SEP
 IS_DIRECTORY_SEP
 LINKER
 LINUX_VERSION_CODE
-LISP_FLOAT_TYPE
 LNOFLSH
 LOCALTIME_CACHE
 MAIL_USE_FLOCK
@@ -200,7 +191,6 @@ O_RDONLY
 O_RDWR
 PAGESIZE
 PENDING_OUTPUT_COUNT
-POSIX
 PREFER_VSUSP
 PTY_ITERATION
 PTY_NAME_SPRINTF
@@ -314,7 +304,6 @@ sleep
 spawnve
 srandom
 strdup
-strerror
 stricmp
 strnicmp
 strupr
diff --git a/admin/ChangeLog b/admin/ChangeLog
index e3b35906ace..b4c88c20ed1 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,8 +1,88 @@
+2012-07-20  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/unibyte_string.cocci: Semantic patch to convert from
+        make_unibyte_string to build_unibyte_string where appropriate.
+
+2012-07-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * CPP-DEFINES: Remove FILE_SYSTEM_CASE.
+
+2012-07-17  Chong Yidong  <cyd@gnu.org>
+
+        * Version 24.1 released.
+
+2012-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume mkdir, perror, rename, rmdir, strerror.
+        * CPP-DEFINES (HAVE_MKDIR, HAVE_PERROR, HAVE_RENAME, HAVE_RMDIR)
+        (HAVE_STRERROR, strerror):
+        Remove.
+
+2012-07-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/list_loop.cocci: Semantic patch to convert from Fcdr
+        to XCDR and consistently use CONSP in the list iteration loops.
+        * coccinelle/vector_contents.cocci: Fix indentation.
+
+2012-07-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * bzrmerge.el: Use cl-lib.
+
+2012-07-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Rename configure.in to configure.ac (Bug#11603).
+        * admin.el (set-version):
+        * quick-install-emacs (VERSION):
+        Get version number from configure.ac, not configure.in.
+
+2012-07-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use c_strcasecmp for ASCII case-insensitive comparison (Bug#11786).
+        * merge-gnulib (GNULIB_MODULES): Add c-strcase.
+
+2012-07-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/xzalloc.cocci: Semantic patch to convert
+        calls to xmalloc with following memset to xzalloc.
+
+2012-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * CPP-DEFINES (LISP_FLOAT_TYPE): Remove, obsolete.
+
+2012-06-26  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/build_string.cocci: Semantic patch
+        to convert from make_string to build_string.
+
+2012-06-24  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        First Coccinelle semantic patch.
+        * coccinelle: New subdirectory
+        * coccinelle/README: Documentation stub.
+        * coccinelle/vector_contents.cocci: Semantic patch to replace direct
+        access to `contents' member of Lisp_Vector objects with AREF and ASET
+        where appropriate.
+
+2012-06-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Support higher-resolution time stamps (Bug#9000).
+        * merge-gnulib (GNULIB_MODULES): Add dtotimespec, gettime,
+        gettimeofday, pselect, stat-time, sys_time, time, timespec-add,
+        timespec-sub, utimens.
+        (GNULIB_TOOL_FLAGS): Add --avoid=select --avoid=sigprocmask.
+        This trims down the gnulib import, from the very latest gnulib.
+        Emacs does its own implementation of 'select' and 'sigprocmask'
+        on Windows, and it assumes 'select' and 'sigprocmask' on non-Windows
+        hosts, so it doesn't need these modules.
+        Similarly, avoid errno, fcntl, fcntl-h, fstat, and sys_types, as
+        these gnulib modules are only for Windows porting and Emacs ports
+        to Windows in a different way.
+
 2012-06-13  Andreas Schwab  <schwab@linux-m68k.org>
 
-        * make-emacs: Rename --union-type to --check-lisp-type.  Define
-        CHECK_LISP_OBJECT_TYPE insted of USE_LISP_UNION_TYPE.
-        * CPP-DEFINES (DEBUG_LISP_OBJECT_TYPE): Renamed from
+        * make-emacs: Rename --union-type to --check-lisp-type.
+        Define CHECK_LISP_OBJECT_TYPE insted of USE_LISP_UNION_TYPE.
+        * CPP-DEFINES (DEBUG_LISP_OBJECT_TYPE): Rename from
         USE_LISP_UNION_TYPE.
 
 2012-06-03  Glenn Morris  <rgm@gnu.org>
@@ -173,11 +253,11 @@
 
         * unidata/makefile.w32-in (all): Remove src/biditype.h and
         src/bidimirror.h.
-        (../../src/biditype.h, ../../src/bidimirror.h): Deleted.
+        (../../src/biditype.h, ../../src/bidimirror.h): Delete.
 
         * unidata/Makefile.in (all): Remove src/biditype.h and
         src/bidimirror.h.
-        (../../src/biditype.h, ../../src/bidimirror.h): Deleted.
+        (../../src/biditype.h, ../../src/bidimirror.h): Delete.
 
 2011-07-07  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -188,8 +268,8 @@
 
         * unidata/unidata-gen.el (unidata-dir): New variable.
         (unidata-setup-list): Expand unidata-text-file in unidata-dir.
-        (unidata-prop-alist): INDEX element may be a function.  New
-        optional element VAL-LIST (for general-category and bidi-class).
+        (unidata-prop-alist): INDEX element may be a function.
+        New optional element VAL-LIST (for general-category and bidi-class).
         New entry `mirroring'.
         (unidata-prop-default, unidata-prop-val-list): New subst.
         (unidata-get-character, unidata-put-character): Delete them.
@@ -545,13 +625,13 @@
 
 2009-04-17  Kenichi Handa  <handa@m17n.org>
 
-        * unidata/unidata-gen.el (unidata-get-decomposition): Adjust
-        Hangle decomposition rule to Unicode.
+        * unidata/unidata-gen.el (unidata-get-decomposition):
+        Adjust Hangle decomposition rule to Unicode.
 
 2009-04-09  Kenichi Handa  <handa@m17n.org>
 
-        * unidata/unidata-gen.el (unidata-describe-decomposition): Return
-        a string with a composition property to disable combining
+        * unidata/unidata-gen.el (unidata-describe-decomposition):
+        Return a string with a composition property to disable combining
         characters being composed.
 
 2009-03-11  Miles Bader  <miles@gnu.org>
@@ -564,7 +644,7 @@
 
 2009-02-23  Jason Rumney  <jasonr@gnu.org>
 
-        * nt/README-ftp-server: Update for 23.0.91
+        * nt/README-ftp-server: Update for 23.0.91.
 
         * nt/README.W32: Remove ever expanding versions of Windows.
         Shorten FAQ URL.  Remove mention of obsolete lock directory.
@@ -1046,7 +1126,7 @@
 
 2005-10-17  Bill Wohler  <wohler@newt.com>
 
-        * FOR-RELEASE (DOCUMENTATION): Removed lisp/toolbar from list
+        * FOR-RELEASE (DOCUMENTATION): Remove lisp/toolbar from list
         since it's gone.  Also marked mh-e as done.
 
 2005-10-11  Juanma Barranquero  <lekktu@gmail.com>
@@ -1093,7 +1173,7 @@
 
 2005-03-30  Marcelo Toledo  <marcelo@marcelotoledo.org>
 
-        * FOR-RELEASE (Documentation): Added check the Emacs Tutorial.
+        * FOR-RELEASE (Documentation): Add check the Emacs Tutorial.
         The first line of every tutorial must begin with a sentence saying
         "Emacs Tutorial" in the respective language.  This should be
         followed by "See end for copying conditions", likewise in the
diff --git a/admin/admin.el b/admin/admin.el
index 9fcc5795d21..6d729214bd0 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -62,7 +62,7 @@ Root must be the root of an Emacs source tree."
   (set-version-in-file root "README" version
                        (rx (and "version" (1+ space)
                                 (submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "configure.in" version
+  (set-version-in-file root "configure.ac" version
                        (rx (and "AC_INIT" (1+ (not (in ?,)))
                                 ?, (0+ space)
                                 (submatch (1+ (in "0-9."))))))
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 15238f44d9d..977e95860e2 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -24,8 +24,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))                        ; assert
+(eval-when-compile (require 'cl-lib))
 
 (defvar bzrmerge-skip-regexp
   "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk\\|\
@@ -139,17 +138,17 @@ 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
+                    (pcase (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))
+                      (`?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))))))
+                      (`?N (setq skip 'no))))))
               (if (eq skip t)
                   (push revno skipped)
                 (push revno revnos)))))
@@ -256,17 +255,17 @@ Does not make other difference."
           ;; Do a "skip" (i.e. merge the meta-data only).
           (setq beg (1- (car skip)))
           (while (and skip (or (null merge) (< (car skip) (car merge))))
-            (assert (> (car skip) (or end beg)))
+            (cl-assert (> (car skip) (or end beg)))
             (setq end (pop skip)))
           (message "Skipping %s..%s" beg end)
           (bzrmerge-add-metadata from end))
 
          (t
           ;; Do a "normal" merge.
-          (assert (or (null skip) (< (car merge) (car skip))))
+          (cl-assert (or (null skip) (< (car merge) (car skip))))
           (setq beg (1- (car merge)))
           (while (and merge (or (null skip) (< (car merge) (car skip))))
-            (assert (> (car merge) (or end beg)))
+            (cl-assert (> (car merge) (or end beg)))
             (setq end (pop merge)))
           (message "Merging %s..%s" beg end)
           (if (with-temp-buffer
diff --git a/admin/coccinelle/README b/admin/coccinelle/README
new file mode 100644
index 00000000000..48a88dbc8d8
--- /dev/null
+++ b/admin/coccinelle/README
@@ -0,0 +1,3 @@
+This directory contains semantic patches for Coccinelle, a program matching
+and transformation tool for programs written in C.  For more details, see
+http://coccinelle.lip6.fr.
diff --git a/admin/coccinelle/build_string.cocci b/admin/coccinelle/build_string.cocci
new file mode 100644
index 00000000000..d47727018dd
--- /dev/null
+++ b/admin/coccinelle/build_string.cocci
@@ -0,0 +1,6 @@
+// Convert simple cases to build_string.
+@@
+identifier I;
+@@
+- make_string (I, strlen (I))
++ build_string (I)
diff --git a/admin/coccinelle/list_loop.cocci b/admin/coccinelle/list_loop.cocci
new file mode 100644
index 00000000000..89f0bfff7b3
--- /dev/null
+++ b/admin/coccinelle/list_loop.cocci
@@ -0,0 +1,19 @@
+// Omit redundant type check, consistently use CONSP.
+@@
+identifier A;
+expression X;
+statement S;
+@@
+(
+for (A = X; 
+- !NILP (A); 
++ CONSP (A);
+- A = Fcdr (A))
++ A = XCDR (A))
+S
+|
+for (A = X; CONSP (A);
+- A = Fcdr (A))
++ A = XCDR (A))
+S
+)
diff --git a/admin/coccinelle/unibyte_string.cocci b/admin/coccinelle/unibyte_string.cocci
new file mode 100644
index 00000000000..0ff8cafa15d
--- /dev/null
+++ b/admin/coccinelle/unibyte_string.cocci
@@ -0,0 +1,6 @@
+// make_unibyte_string (str, strlen (str)) -> build_unibyte_string (str)
+@@
+identifier I;
+@@
+- make_unibyte_string (I, strlen (I))
++ build_unibyte_string (I)
diff --git a/admin/coccinelle/vector_contents.cocci b/admin/coccinelle/vector_contents.cocci
new file mode 100644
index 00000000000..3c696ffd237
--- /dev/null
+++ b/admin/coccinelle/vector_contents.cocci
@@ -0,0 +1,16 @@
+// Avoid direct access to `contents' member of
+// Lisp_Vector, use AREF and ASET where possible.
+@expression@
+identifier I1, I2;
+expression E1, E2;
+@@
+(
+- XVECTOR (I1)->contents[I2++] = E1
++ ASET (I1, I2, E1), I2++
+|
+- XVECTOR (I1)->contents[E1] = E2
++ ASET (I1, E1, E2)
+|
+- XVECTOR (I1)->contents[E1]
++ AREF (I1, E1)
+)
diff --git a/admin/coccinelle/xzalloc.cocci b/admin/coccinelle/xzalloc.cocci
new file mode 100644
index 00000000000..5d3ba990266
--- /dev/null
+++ b/admin/coccinelle/xzalloc.cocci
@@ -0,0 +1,10 @@
+@@
+expression x;
+expression E;
+@@
+ x = 
+- xmalloc 
++ xzalloc
+  (E)
+  ... 
+- memset (x, 0, E);
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 7f91b788f40..727b701cfe0 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -26,18 +26,22 @@
 GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
 
 GNULIB_MODULES='
-  alloca-opt
+  alloca-opt c-strcase
   careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
-  dtoastr dup2
-  filemode getloadavg getopt-gnu ignore-value intprops largefile lstat
-  manywarnings mktime pthread_sigmask readlink
-  socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
+  dtoastr dtotimespec dup2
+  filemode getloadavg getopt-gnu gettime gettimeofday
+  ignore-value intprops largefile lstat
+  manywarnings mktime pselect pthread_sigmask readlink
+  socklen stat-time stdarg stdio strftime strtoimax strtoumax symlink sys_stat
+  sys_time time timespec-add timespec-sub utimens
   warnings
 '
 
 GNULIB_TOOL_FLAGS='
+  --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat
   --avoid=msvc-inval --avoid=msvc-nothrow
-  --avoid=raise --avoid=threadlib
+  --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types
+  --avoid=threadlib
   --conditional-dependencies --import --no-changelog --no-vc-files
   --makefile-name=gnulib.mk
 '
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 3c24212ea10..7d5e85a3ae0 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -125,7 +125,7 @@ Resent-CC:   maintainer email address, plus any X-Debbugs-CC: entries
 
 The "maintainer email address" is "bug-gnu-emacs@gnu.org" in most cases.
 
-** To not get acknowledgement mail from the tracker,
+** To not get acknowledgment mail from the tracker,
 add an "X-Debbugs-No-Ack:" header (with any value).  If you use Gnus,
 you can add an element to gnus-posting-styles to do this automatically, eg:
 
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index 4146c8ffa58..5408b9a3d00 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -906,7 +906,7 @@ DIARY OF CHANGES
    read_avail_input.
 
    (Fixed.  This was caused by unconditionally including stdin in
-   input_wait_mask in init_process.  The select call in
+   input_wait_mask in init_process_emacs.  The select call in
    wait_reading_process_input always returned immediately, indicating
    that there is pending input from stdin, which nobody read.
 
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 7004e8f1b27..4abef102dc4 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -171,9 +171,9 @@ test x"$prefix" = x && { prefix="`get_config_var prefix`" || exit 4 ; }
 test x"$ARCH" = x && { ARCH="`get_config_var host`" || exit 4 ; }
 
 VERSION=`
-  sed -n 's/^AC_INIT(emacs,[     ]*\([^  )]*\).*/\1/p' <$SRC/configure.in
+  sed -n 's/^AC_INIT(emacs,[     ]*\([^  )]*\).*/\1/p' <$SRC/configure.ac
 ` || exit 4
-test -n "$VERSION" || { echo >&2 "$me: no version in configure.in"; exit 4; }
+test -n "$VERSION" || { echo >&2 "$me: no version in configure.ac"; exit 4; }
 
 DST_SHARE="$prefix/share/emacs/$VERSION"
 DST_BIN="$prefix/bin"