Merge from emacs-24

diff --cc .gitignore
Simple merge

diff --cc ChangeLog
index 56e7520d421744bd0ccddf056486fbd0783297ab,c70503cf218bc6238b82dd47900b2cda9ec8cb69..166e0e96110ad1335d5865a277161bde1406c00e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,9 +1,19 @@@
 -2014-12-01  Paul Eggert  <eggert@cs.ucla.edu>
++2014-12-05  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * .gitignore: Remove redundant pattern (subsumed by _*).
+       Avoid "**", as it requires Git 1.8.2 or later.
+ 
 -2014-11-21  Paul Eggert  <eggert@cs.ucla.edu>
++2014-12-05  Paul Eggert  <eggert@cs.ucla.edu>
 +2014-12-05  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * .gitignore: Ignore test/biditest.txt.
 +
 +2014-12-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * .gitignore: Ignore loaddefs directly under lisp, and in
 +      sub-sub-directories.
 +
 +2014-11-29  Paul Eggert  <eggert@cs.ucla.edu>
  
        Add more of the old .bzrignore to .gitignore.
        Plus a few more .gitignore improvements.

diff --cc lisp/ChangeLog
index b4e51a6eebb21dfe245acbe432b64f019d1157a3,26b09a68d02fd4d779ffc000316a10ab2490dcbc..79ee9d75906c34609a76e1fe1292bfcc8d346d46
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,5 -1,14 +1,15 @@@
 -2014-12-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 +2014-12-05  Stefan Monnier  <monnier@iro.umontreal.ca>
  
 -2014-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * progmodes/sh-script.el (sh-smie-sh-rules): Go back to the beginning
+       of the whole pipe when indenting an opening keyword after a |.
+       Generalize this treatment to opening keywords like "while" (bug#18031).
+ 
++2014-12-05  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-12-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * simple.el (newline): Place the hook buffer-locally,
+       to make sure it's first.
+ 
        * progmodes/prog-mode.el (prettify-symbols--compose-symbol):
        Fix handling of symbols with different syntax at beginning/end or with
        symbol rather than word syntax.

diff --cc lisp/progmodes/sh-script.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/ChangeLog
index 82aabb389a3dd4660f91a81d08f23c3b56337408,0a8acf935bde6e57d95322e43c16b2587648667d..27202f10bf5457f9c0c3885e87ebd47c40e2509d
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,75 -1,21 +1,93 @@@
 -2014-12-04  Lee Duhem  <lee.duhem@gmail.com>  (tiny change)
++2014-12-05  Lee Duhem  <lee.duhem@gmail.com>  (tiny change)
+ 
+       * eval.c (Fsignal): Remove duplicate test.
+       (Fautoload_do_load): Fix up docstring.
+ 
 -2014-12-02  Jan Djärv  <jan.h.d@swipnet.se>
++2014-12-05  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * nsterm.m (represented_filename, represented_frame): New variables.
+       (ns_set_represented_filename): New function.
+       (sendEvent:): Set represented filename here to avoid flicker,
+       related to Bug#18757.
+ 
+       * nsterm.h: Declare ns_set_represented_filename.
+ 
+       * nsfns.m (ns_set_name_as_filename): Don't set represented filename
+       at once, call ns_set_represented_filename instead.
+ 
 -2014-11-27  Eli Zaretskii  <eliz@gnu.org>
++2014-12-05  Eli Zaretskii  <eliz@gnu.org>
 +2014-12-05  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero.
 +      (struct bidi_stack): Reduce size by using bit fields and by
 +      packing sos, override, and isolate_status into a single 8-bit
 +      byte called 'flags'.
 +
 +      * bidi.c (ISOLATE_STATUS, OVERRIDE): New macros.
 +      (bidi_push_embedding_level): Construct flags from individual
 +      bits.  Adapt to changes in prev_for_neutral and next_for_neutral
 +      members.
 +      (bidi_pop_embedding_level): Use ISOLATE_STATUS.  Extract 'sos'
 +      from flags.  Adapt to changes in prev_for_neutral,
 +      next_for_neutral, and last_strong members.
 +      (bidi_line_init): Initialize flags to zero.
 +      (bidi_resolve_explicit, bidi_resolve_weak, bidi_resolve_brackets)
 +      (bidi_resolve_neutral): Use ISOLATE_STATUS and OVERRIDE.
 +
 +2014-12-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * eval.c (backtrace_eval_unrewind): Rewind also the excursions.
 +      (Fapply): Try and simplify the control flow.
 +
 +2014-12-03  Chris Zheng  <chriszheng99@gmail.com>  (tiny change)
 +
 +      * gnutls.c (init_gnutls_functions, gnutls_certificate_details):
 +      Use gnutls_sign_get_name directly because
 +      gnutls_sign_algorithm_get_name is a macro on MinGW (bug#19231).
 +      (init_gnutls_functions): Load missing gnutls_server_name_set.
 +
 +2014-12-02  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * bidi.c (bidi_find_first_overridden): New function.
 +
 +      * xdisp.c (Fbidi_find_overridden_directionality): New function.
 +      (syms_of_xdisp): Defsubr it.
 +
 +      * dispextern.h (bidi_find_first_overridden): Add prototype.
 +
 +2014-12-02  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +      * nsimage.m (initFromSkipXBM:width:height:flip:length:): Set bmRep
 +      to nil after release (Bug#9133).
 +
 +2014-11-30  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Port better to AddressSanitizer.
 +      These changes suffice for temacs on x86-64 with GCC 4.9.2 and
 +      -fsanitize=address.
 +      * alloc.c (valid_pointer_p) [ADDRESS_SANITIZER]:
 +      Return -1 or 0, as the pipe trick doesn't work.
 +      * alloc.c (relocatable_string_data_p, mark_object, sweep_symbols):
 +      * data.c (Ffset):
 +      * print.c (print_object):
 +      When a pointer-check primitive returns -1, do not assume this
 +      means the pointer is valid or that the underlying system has failed.
 +      It could just be that addresses are being sanitized so Emacs can't
 +      test for pointer validity.
 +      * lisp.h (defined_GC_CHECK_STRING_BYTES): New constant.
 +      (USE_STACK_STRING) [GC_CHECK_STRING_BYTES]: Now false, since the
 +      string validity checker doesn't work on stack-based strings.
 +
 +2014-11-29  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Improve clarity of USE_LSB_TAG definition.
 +      Problem reported by Lee Duhem.  Suggestion by Andreas Schwab in:
 +      http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg02222.html
 +      * lisp.h (USE_LSB_TAG): Define in terms of the (simpler)
 +      VAL_MAX / 2 rather than in terms of the (more complicated)
 +      EMACS_INT_MAX >> GCTYPEBITS, and adjust commentary to match.
 +
 +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.

diff --cc src/eval.c
Simple merge

diff --cc src/nsfns.m
Simple merge

diff --cc src/nsterm.h
index b33e6b2ee0812285ce122fc3a3e0f074b6594eed,115d7ac6779f1716733ea8bf8f2fbfb884ca4a97..c3841a40f59a1d7a69f6e1c3408f4ee892b9b260
--- 1/src/nsterm.h
--- 2/src/nsterm.h
+++ b/src/nsterm.h
@@@ -887,11 -895,8 +887,11 @@@ extern int ns_select (int nfds, fd_set 
  extern unsigned long ns_get_rgb_color (struct frame *f,
                                         float r, float g, float b, float a);
  
- /* From nsterm.m, needed in nsfont.m. */
 +extern void ns_init_events ();
 +extern void ns_finish_events ();
 +
  #ifdef __OBJC__
+ /* From nsterm.m, needed in nsfont.m. */
  extern void
  ns_draw_text_decoration (struct glyph_string *s, struct face *face,
                           NSColor *defaultCol, CGFloat width, CGFloat x);

diff --cc src/nsterm.m
index 8729fa55a9292ce88825c9664736d9a5ee743e18,656d86687171ce324ccfdc77ec2c62b111831ddc..f012528b40dc9f4e9eaebaf945ccca839f1209b8
--- 1/src/nsterm.m
--- 2/src/nsterm.m
+++ b/src/nsterm.m
@@@ -399,18 -399,13 +402,25 @@@ void x_set_frame_alpha (struct frame *f
  
     ========================================================================== */
  
+ void
+ ns_set_represented_filename (NSString* fstr, struct frame *f)
+ {
+   represented_filename = [fstr retain];
+   represented_frame = f;
+ }
+ 
 +void
 +ns_init_events (struct input_event* ev)
 +{
 +  EVENT_INIT (*ev);
 +  emacs_event = ev;
 +}
 +
 +void
 +ns_finish_events ()
 +{
 +  emacs_event = NULL;
 +}
  
  static void
  hold_event (struct input_event *event)