Merge branch 'emacs-24'.

9 files changed, 136 insertions, 103 deletions

diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 0942abfb44e..00000000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-buildobj.h
-config.h
-emacs-[1-9]*
-epaths.h
-stamp_BLD
-stamp-h.in
-
-oo/
-oo-spd/
diff --git a/src/ChangeLog b/src/ChangeLog
index dcb4666e106..ed111bf3814 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2014-11-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (handle_single_display_spec): When ignoring a fringe
+        bitmap display, reset the ignore_overlay_strings_at_pos_p flag.
+        (next_element_from_buffer): When done with overlays, reset the
+        ignore_overlay_strings_at_pos_p flag.  (Bug#19201)
+
+2014-11-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (Fw32_shell_execute): Convert forward slashes in
+        DOCUMENT to backslashes, if DOCUMENT is a file.  (Bug#19141)
+
+2014-11-29  Ulrich Müller  <ulm@gentoo.org>
+
+        * Makefile.in (temacs$(EXEEXT)): Use consistent flag settings
+        for paxctl and setfattr. Fixes temacs startup failure with
+        grsecurity/PaX enabled Linux kernel (bug#19067).
+
+2014-11-29  Ulf Jasper  <ulf.jasper@web.de>
+
+        * nsterm.m (ns_send_appdefined): Check for application defined
+        event on Cocoa (Bug#18993).  Backport from trunk.
+
 2014-11-27  Oscar Fuentes  <ofv@wanadoo.es>
 
         * src/w32.c: Use MINGW_W64 instead of _W64.
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index fc6ff1fda6a..100b0cbe710 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -4200,7 +4200,7 @@
         (record_property_change, Fprimitive_undo): Adjust prototypes.
 
 2010-09-22  Juanma Barranquero  <lekktu@gmail.com>
-            Eli Zaretskii  <eliz@gnu.org>
+            Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (get_emacs_configuration_options): Fix buffer overrun.
 
@@ -6753,7 +6753,7 @@
         to standard C.
 
 2010-07-04  Tetsurou Okazaki  <okazaki@be.to>  (tiny change)
-            Stefan Monnier  <monnier@iro.umontreal.ca>
+            Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * lread.c (read1): Fix up last change to not mess up `c'.
 
@@ -8069,7 +8069,7 @@
         can specify the frame to use, when applicable.  Adjust callers.
 
 2010-05-07  Vincent Belaïche  <vincent.belaiche@gmail.com>
-            Stefan Monnier  <monnier@iro.umontreal.ca>
+            Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * floatfns.c (Fisnan, Fcopysign, Ffrexp, Fldexp): New functions.
 
@@ -8697,7 +8697,7 @@
         (Frename_file): Preserve selinux context when renaming by copy-file.
 
 2010-04-21  Juanma Barranquero  <lekktu@gmail.com>
-            Eli Zaretskii  <eliz@gnu.org>
+            Eli Zaretskii  <eliz@gnu.org>
 
         Don't depend on cm.c or termcap.c on Windows, use stubs.
         * makefile.w32-in (OBJ1): Remove cm.$(O) and termcap.$(O).
@@ -16878,7 +16878,7 @@
         <after-change-functions>: Reflow docstrings.
 
 2008-08-04  Adrian Robert  <Adrian.B.Robert@gmail.com>
-            Ken Raeburn  <raeburn@gnu.org>
+            Ken Raeburn  <raeburn@gnu.org>
 
         Dock menu customization, based on a patch by Ken Raeburn, plus some
         other fixes.
@@ -17943,7 +17943,7 @@
         batch-compiling for bootstrap).
 
 2008-07-15  Chris Hall  <chris@web.workinglinux.com>  (tiny change)
-            YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+            YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * frame.c (make_initial_frame): Call init_frame_faces(f) in
         CANNOT_DUMP case -- fix crash due to different init order.
@@ -18561,7 +18561,7 @@
         (USG_SHARED_LIBRARIES): Remove duplicate definition.
 
 2008-06-26  Juanma Barranquero  <lekktu@gmail.com>
-            Eli Zaretskii  <eliz@gnu.org>
+            Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (LOCAL_FLAGS):
         Don't include WINDOWSNT, DOS_NT and _UCHAR_T.
@@ -18809,7 +18809,7 @@
         the property of LFACE_FONT of LFACE (if any).
 
 2008-06-21  Seiji Zenitani  <zenitani@mac.com>
-            Ryo Yoshitake  <ryo@shiftmode.net>
+            Ryo Yoshitake  <ryo@shiftmode.net>
 
         * xterm.c (x_set_frame_alpha): Add x_catch_errors for bug#437.
 
@@ -19905,7 +19905,7 @@
         * xterm.c (x_set_frame_alpha): Move declarations before statements.
 
 2008-05-21  Seiji Zenitani  <zenitani@mac.com>
-            Ryo Yoshitake  <ryo@shiftmode.net>
+            Ryo Yoshitake  <ryo@shiftmode.net>
 
         * frame.c (Qalpha): Add a new frame parameter `alpha'.
         (Vframe_alpha_lower_limit): New variable.
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index c852328d61a..f8fc9b1c813 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -2508,7 +2508,7 @@
         If `suspend-emacs-hook' returns t don't suspend
         -- assume the hook did the equivalent of `suspending' for us
         (including calling suspend-resume-hook if necessary.)
-        Otherwise, call sys_suspend and so forth normally.
+        Otherwise, call sys_suspend and so forth normally.
 
 1986-12-20  Richard M. Stallman  (rms@prep)
 
@@ -4050,7 +4050,7 @@
 
 1986-08-21  Richard Mlynarik  (mly@prep)
 
-        * process.c (handle_process_output):
+        * process.c (handle_process_output):
         do a set-buffer back to original buffer
         after calling a process' filter function so that
         all filter functions needn't save-excursion.
@@ -4221,7 +4221,7 @@
 
         * unexec.c (write_segment):
         Kludgy coercions ("(int)") to get this line to compile:
-         nwrite = (((int) ptr + 128) & ~127) - (int) ptr;
+         nwrite = (((int) ptr + 128) & ~127) - (int) ptr;
         Also changed incorrect ~128 to ~127.
 
         * process.c:
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index dcb7f668b1e..1de7775c465 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -473,10 +473,10 @@
 
 1995-05-28  Morten Welinder  <terra+@cs.cmu.edu>
 
-        * s/osf1.h (COFF): Define.
-        * m/alpha.h (LD_SWITCH_MACHINE) [!__GNUC__]: Don't define.
-        (r_alloc, r_re_alloc, r_alloc_free) [REL_ALLOC,
-        !_MALLOC_INTERNAL, !NOT_C_CODE]: Prototype.
+        * s/osf1.h (COFF): Define.
+        * m/alpha.h (LD_SWITCH_MACHINE) [!__GNUC__]: Don't define.
+        (r_alloc, r_re_alloc, r_alloc_free) [REL_ALLOC,
+        !_MALLOC_INTERNAL, !NOT_C_CODE]: Prototype.
 
 1995-05-28  Richard Stallman  <rms@gnu.ai.mit.edu>
 
@@ -1281,18 +1281,18 @@
 
         * ntinevt.c (nt_kdb_patch_event): Created.
 
-        * callproc.c (child_setup) [WINDOWSNT]: Removed syntax errors.
+        * callproc.c (child_setup) [WINDOWSNT]: Removed syntax errors.
 
         * dired.c (Ffile_attributes) [WINDOWSNT]: Removed syntax errors.
 
         * fileio.c (Fexpand_file_name) [DOS_NT]: Preserve drive letter case.
         Fix syntax errors.
-        Check drive letter when expanding ~\.
+        Check drive letter when expanding ~\.
 
         * sysdep.c (sys_subshell) [WINDOWSNT]: Don't invoke restore_console.
 
         * ntproc.c (win32_wait): Reap synchronous subprocesses, and place
-        return code in synch_process_retcode.
+        return code in synch_process_retcode.
 
         * s/windowsnt.h (ctime): Defined to be nt_ctime.
         (NULL): Defined when missing from included system files.
@@ -1351,7 +1351,7 @@
         (get_inode_and_device_vals): Handle directories.
 
         * fileio.c (Fexpand_file_name) [DOS_NT]: Don't strip slash from
-        default dirs like "C:\\"
+        default dirs like "C:\\"
 
         * makefile.nt (all): Use COMPAT_LIB in library list.
         Use DEL_TREE instead of delnode.
@@ -1503,9 +1503,9 @@
 
 1995-04-08  Noah Friedman  <friedman@prep.ai.mit.edu>
 
-        * window.c (Fnext_window, Fprevious_window): If all_frames is a
-        frame and window is not on that frame, return the first window on
-        that frame.
+        * window.c (Fnext_window, Fprevious_window): If all_frames is a
+        frame and window is not on that frame, return the first window on
+        that frame.
 
 1995-04-07  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -2899,7 +2899,7 @@
 1995-01-10  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
         * emacs.c (main): Handle SIGABRT, SIGHWE, SIGPRE, SIGORE, SIGDLK,
-        SIGCPULIM, if they are defined.
+        SIGCPULIM, if they are defined.
 
         * alloc.c (DONT_COPY_FLAG): New bit flag.
         (mark_object, gc_sweep, compact_strings): Use it.
@@ -3547,7 +3547,7 @@
 1994-11-16  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
         * xdisp.c (try_window): Don't pass window to Fget_char_property;
-        pass its buffer.
+        pass its buffer.
         (display_text_line): Likewise.
 
 1994-11-16  Francesco Potortì  (pot@cnuce.cnr.it)
@@ -3770,7 +3770,7 @@
 1994-11-07  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
         * keyboard.c: Move decl of input_fd outside of #ifdef
-        HAVE_X_WINDOWS.
+        HAVE_X_WINDOWS.
 
 1994-11-03  Karl Heuer  <kwzh@hal.gnu.ai.mit.edu>
 
@@ -3788,7 +3788,7 @@
         (HAVE_MOUSE): Defined.
 
         * ntheap.c (sbrk): Allow request sizes to be different than the
-        page size.
+        page size.
 
         * makefile.nt: Changed references of m\m-windowsnt.h to
         m\intel386.h and of s\s-windowsnt.h to s\windowsnt.h.
@@ -4087,7 +4087,7 @@
 
 1994-10-25  Karl Fogel  (kfogel@phylo.life.uiuc.edu)
 
-        * window.c (Vtemp_buffer_show_function): Doc fix.
+        * window.c (Vtemp_buffer_show_function): Doc fix.
 
 1994-10-25  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -4780,7 +4780,7 @@
         * xmenu.c: Delete HAVE_X11 conditionals.
 
         * xfaces.c (compute_base_face): Use FRAME_FOREGROUND_PIXEL,
-        FRAME_BACKGROUND_PIXEL, FRAME_FONT.
+        FRAME_BACKGROUND_PIXEL, FRAME_FONT.
 
         * xterm.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL)
         (FRAME_FONT): New macros.
@@ -4973,59 +4973,59 @@
 
 1994-10-09  Jim Blandy  <jimb@geech.gnu.ai.mit.edu>
 
-        Cache the results of some scans, to improve performance in buffers
-        containing very long lines.
-        * region-cache.c, region-cache.h: New files.
-        * Makefile.in.in (obj) Add region-cache.o to the list of files.
-        (region-cache.o): New target.
-        (buffer.o, indent.o, search.o): Depend on region-cache.h.
-        * buffer.h (struct buffer): New members: newline_cache,
-        width_run_cache, width_table, and cache_long_line_scans.
-        * buffer.c: #include region-cache.h.
-        (Fget_buffer_create): Initialize new members of struct buffer.
-        (Fkill_buffer): Free memory occupied by caches.
-        (init_buffer_once): Set default value for cache_long_line_scans in
-        buffer_defaults, and give it a bit in buffer_local_flags.
-        (syms_of_buffer): Add DEFVAR_PER_BUFFER for cache_long_line_scans.
-        * insdel.c (prepare_to_modify_buffer): Invalidate width run and
-        newline caches, if they exist.
-        * search.c: #include "region-cache.h".
-        (max, min): Make these functions, not macros; we'd like to pass
-        them arguments that would be bad to evaluate more than once.
-        (newline_cache_on_off): New function.
-        (scan_buffer): New argument END.  Call newline_cache_on_off.  If
-        this buffer's newline cache is enabled, consult it to see if we
-        need to scan a region for newlines, and store information in the
-        cache after doing so.
-        (find_next_newline): Pass new arg to scan_buffer.
-        (find_before_next_newline): New function.
-        * cmds.c (Fforward_line): Call scan_buffer with new args.
-        (Fend_of_line): Replace call to Fforward_line and search loop with
-        call to find_before_next_newline.
-        * syntax.c (find_defun_start): Call scan_buffer with new args.
-        * indent.c: #include "region-cache.h".
-        (character_width, disptab_matches_widthtab, recompute_width_table,
-        width_run_cache_on_off): New functions.
-        (compute_motion): Call width_run_cache_on_off.  If this buffer's
-        width run cache is enabled, consult it to see if we need to
-        traverse a region character-by-character; store information in the
-        cache after doing so.  Call find_before_next_newline instead of
-        writing out an equivalent loop explicitly, to take advantage of
-        the newline cache.
-        Doc fixes.
-        * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
-        buffer's display table doesn't match the width table the cache was
-        built for.
-        (display_text_line): Use compute_motion to skip forward to the
-        left edge of the window when the window is hscrolled; this is
-        faster than rendering all the characters into the bit bucket when
-        the hscroll is large.
-        Doc fixes.
-        (display_count_lines): Call scan_buffer with new args.
-        * disptab.h (window_display_table): Doc fix.
-        (buffer_display_table): New declaration.
-        * indent.h (disptab_matches_widthtab, recompute_width_table): New
-        declarations.
+        Cache the results of some scans, to improve performance in buffers
+        containing very long lines.
+        * region-cache.c, region-cache.h: New files.
+        * Makefile.in.in (obj) Add region-cache.o to the list of files.
+        (region-cache.o): New target.
+        (buffer.o, indent.o, search.o): Depend on region-cache.h.
+        * buffer.h (struct buffer): New members: newline_cache,
+        width_run_cache, width_table, and cache_long_line_scans.
+        * buffer.c: #include region-cache.h.
+        (Fget_buffer_create): Initialize new members of struct buffer.
+        (Fkill_buffer): Free memory occupied by caches.
+        (init_buffer_once): Set default value for cache_long_line_scans in
+        buffer_defaults, and give it a bit in buffer_local_flags.
+        (syms_of_buffer): Add DEFVAR_PER_BUFFER for cache_long_line_scans.
+        * insdel.c (prepare_to_modify_buffer): Invalidate width run and
+        newline caches, if they exist.
+        * search.c: #include "region-cache.h".
+        (max, min): Make these functions, not macros; we'd like to pass
+        them arguments that would be bad to evaluate more than once.
+        (newline_cache_on_off): New function.
+        (scan_buffer): New argument END.  Call newline_cache_on_off.  If
+        this buffer's newline cache is enabled, consult it to see if we
+        need to scan a region for newlines, and store information in the
+        cache after doing so.
+        (find_next_newline): Pass new arg to scan_buffer.
+        (find_before_next_newline): New function.
+        * cmds.c (Fforward_line): Call scan_buffer with new args.
+        (Fend_of_line): Replace call to Fforward_line and search loop with
+        call to find_before_next_newline.
+        * syntax.c (find_defun_start): Call scan_buffer with new args.
+        * indent.c: #include "region-cache.h".
+        (character_width, disptab_matches_widthtab, recompute_width_table,
+        width_run_cache_on_off): New functions.
+        (compute_motion): Call width_run_cache_on_off.  If this buffer's
+        width run cache is enabled, consult it to see if we need to
+        traverse a region character-by-character; store information in the
+        cache after doing so.  Call find_before_next_newline instead of
+        writing out an equivalent loop explicitly, to take advantage of
+        the newline cache.
+        Doc fixes.
+        * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
+        buffer's display table doesn't match the width table the cache was
+        built for.
+        (display_text_line): Use compute_motion to skip forward to the
+        left edge of the window when the window is hscrolled; this is
+        faster than rendering all the characters into the bit bucket when
+        the hscroll is large.
+        Doc fixes.
+        (display_count_lines): Call scan_buffer with new args.
+        * disptab.h (window_display_table): Doc fix.
+        (buffer_display_table): New declaration.
+        * indent.h (disptab_matches_widthtab, recompute_width_table): New
+        declarations.
 
 1994-10-08  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -5194,13 +5194,13 @@
         independence.  Enable using editres for X11R5.
 
         * widget.c (EmacsFrameSetCharSize): Use lw_refigure_widget for
-        widget set independence.
+        widget set independence.
 
         * widget.h: Declare resources showGrip, allowResize, and
-        resizeToPreferred.
+        resizeToPreferred.
 
         * keyboard.c (make_lispy_event): Do not set item.  Now handled in
-        xmenu.c by popup_get_selection.
+        xmenu.c by popup_get_selection.
 
 1994-10-01  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -5375,7 +5375,7 @@
 
         * process.c (Fprocess_send_eof): Delete DID_REMOTE conditional.
 
-        * buffer.c (get-file-buffer): Doc fix.
+        * buffer.c (get-file-buffer): Doc fix.
 
 1994-09-23  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -5580,7 +5580,7 @@
 
 1994-09-19  Jim Blandy  <jimb@geech.gnu.ai.mit.edu>
 
-        Add a new element to display tables controlling side-by-side
+        Add a new element to display tables controlling side-by-side
         window borders.
         * buffer.c (syms_of_buffer): Update doc string for
         `buffer-display-table'.
@@ -6207,7 +6207,7 @@
         * Makefile.in.in (FRAME_SUPPORT): Add faces.elc.
 
         * search.c (Freplace_match): Treat caseless initial like a
-        lowercase initial.
+        lowercase initial.
 
         * keymap.c (Fdefine_key): Fix error message.
         (Fsingle_key_description): Likewise.
@@ -6418,8 +6418,8 @@
 
 1994-07-23  Jim Blandy  (jimb@totoro.bio.indiana.edu)
 
-        * .gdbinit: Set the breakpoint in x_error_quitter instead of
-        _XPrintDefaultError.
+        * .gdbinit: Set the breakpoint in x_error_quitter instead of
+        _XPrintDefaultError.
 
 1994-07-20  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
 
@@ -6910,7 +6910,7 @@
 1994-06-16  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
 
         * unexec.c: Include <sys/file.h> and [USG5] <fcntl.h> to define
-        O_* macros.
+        O_* macros.
         (O_RDONLY, O_RDWR): Define if undefined.
         [emacs] (report_error): Use report_file_error so the user can tell
         what the errno code was.
diff --git a/src/Makefile.in b/src/Makefile.in
index 61cb938aeff..00ac04aa836 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -520,7 +520,7 @@ temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \
         test "$(CANNOT_DUMP)" = "yes" || \
           test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)
         test "$(CANNOT_DUMP)" = "yes" || test -z "$(SETFATTR)" || \
-          $(SETFATTR) -n user.pax.flags -v r $@
+          $(SETFATTR) -n user.pax.flags -v er $@
 
 ## The following oldxmenu-related rules are only (possibly) used if
 ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them.
diff --git a/src/keyboard.c b/src/keyboard.c
index 908eb59ff9c..6dc0b820eb9 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11868,7 +11868,7 @@ keys_of_keyboard (void)
      - we enter the second prompt.
        current-prefix-arg is non-nil, prefix-arg is nil.
      - before running the first real event, we run the special iconify-frame
-       event, but we pass the `special' arg to execute-command so
+       event, but we pass the `special' arg to command-execute so
        current-prefix-arg and prefix-arg are left untouched.
      - here we foolishly copy the non-nil current-prefix-arg to prefix-arg.
      - the next key event will have a spuriously non-nil current-prefix-arg.  */
diff --git a/src/w32fns.c b/src/w32fns.c
index e5149704335..fc10e74cdff 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7011,7 +7011,14 @@ a ShowWindow flag:
       Lisp_Object absdoc_encoded = ENCODE_FILE (absdoc);
 
       if (faccessat (AT_FDCWD, SSDATA (absdoc_encoded), F_OK, AT_EACCESS) == 0)
-        document = absdoc_encoded;
+        {
+          /* ShellExecute fails if DOCUMENT is a UNC with forward
+             slashes (expand-file-name above converts all backslashes
+             to forward slashes).  Now that we know DOCUMENT is a
+             file, we can mirror all forward slashes into backslashes.  */
+          unixtodos_filename (SSDATA (absdoc_encoded));
+          document = absdoc_encoded;
+        }
       else
         document = ENCODE_FILE (document);
     }
diff --git a/src/xdisp.c b/src/xdisp.c
index 1b015e70709..989cbd10d81 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5106,6 +5106,11 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
                   iterate_out_of_display_property (it);
                   *position = it->position;
                 }
+              /* If we were to display this fringe bitmap,
+                 next_element_from_image would have reset this flag.
+                 Do the same, to avoid affecting overlays that
+                 follow.  */
+              it->ignore_overlay_strings_at_pos_p = 0;
               return 1;
             }
         }
@@ -5125,6 +5130,9 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
               iterate_out_of_display_property (it);
               *position = it->position;
             }
+          if (it)
+            /* Reset this flag like next_element_from_image would.  */
+            it->ignore_overlay_strings_at_pos_p = 0;
           return 1;
         }
 
@@ -8329,6 +8337,10 @@ next_element_from_buffer (struct it *it)
       unsigned char *p;
       ptrdiff_t stop;
 
+      /* We moved to the next buffer position, so any info about
+         previously seen overlays is no longer valid.  */
+      it->ignore_overlay_strings_at_pos_p = 0;
+
       /* Maybe run the redisplay end trigger hook.  Performance note:
          This doesn't seem to cost measurable time.  */
       if (it->redisplay_end_trigger_charpos