1 files changed, 119 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f10e2955164..925bb8299ba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,110 @@
+2012-01-21  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * process.c (read_process_output): Use p instead of XPROCESS (proc).
+        (send_process): Likewise.
+
+2012-01-19  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (save_window_save, Fcurrent_window_configuration)
+        (Vwindow_persistent_parameters): Do not use Qstate.  Rewrite
+        doc-strings.
+
+2012-01-19  Kenichi Handa  <handa@m17n.org>
+
+        * character.c (char_width): New function.
+        (Fchar_width, c_string_width, lisp_string_width):
+        Use char_width (Bug#9496).
+
+2012-01-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Vwindow_persistent_parameters): New variable.
+        (Fset_window_configuration, save_window_save): Handle persistent
+        window parameters.
+
+2012-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (signal_user_input): Don't do a QUIT, to avoid
+        thrashing the stack of the thread.  (Bug#9087)
+
+2012-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses.
+
+2012-01-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (rows_from_pos_range): Handle the case where the
+        highlight ends on a newline.  (Bug#10464)
+        (mouse_face_from_buffer_pos): Fix off-by-one error in calculating
+        he end column for display of highlight that ends on a newline
+        before a R2L line.
+
+2012-01-11  Glenn Morris  <rgm@gnu.org>
+
+        * lread.c (init_lread): If no-site-lisp, remove site-lisp dirs
+        from load-path also when installation-directory is nil.  (Bug#10208)
+
+2012-01-10  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.c (syms_of_emacs) <installation-directory>: Doc fix.
+
+        * epaths.in (PATH_LOADSEARCH, PATH_EXEC, PATH_DATA, PATH_DOC):
+        Update template values to be closer to their typical values these days.
+
+2012-01-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (rows_from_pos_range): Accept additional argument
+        DISP_STRING, and accept any glyph in a row whose object is that
+        string as eligible for mouse highlight.  Fixes mouse highlight of
+        display strings from overlays.  (Bug#10464)
+
+2012-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        emacs: fix an auto-save permissions race condition (Bug#10400)
+        * fileio.c (auto_saving_dir_umask): New static var.
+        (Fmake_directory_internal): Use it.
+        (do_auto_save_make_dir): Set it, instead of invoking chmod after
+        creating the directory.  The old code temporarily assigns
+        too-generous permissions to the directory.
+        (do_auto_save_eh): Clear it.
+        (Fdo_auto_save): Catch all errors, not just file errors, so
+        that the var is always cleared.
+
+2012-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * search.c (scan_buffer): Pass character positions to
+        know_region_cache, not byte positions.  (Bug#6540)
+
+2012-01-07  LynX  <_LynX@bk.ru>  (tiny change)
+
+        * w32.c (sys_rename): Report EXDEV when rename of a directory
+        fails because the target is on another logical disk.  (Bug#10284)
+
+2012-01-07  David Benjamin  <davidben@mit.edu>  (tiny change)
+
+        * xterm.c (x_embed_request_focus): New function.
+
+        * xterm.h: Add prototype.
+
+        * xfns.c (Fx_focus_frame): Use it for embedded frames (Bug#9977).
+
+2012-01-05  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.c (emacs_copyright): Update short copyright year to 2012.
+
+2012-01-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * gnutls.c (init_gnutls_functions): Load gnutls_check_version.
+        Load gnutls_transport_set_lowat only if GnuTLS version is below
+        2.11.1.
+        (emacs_gnutls_handshake): Call gnutls_transport_set_lowat only for
+        GnuTLS versions below 2.11.1.
+
+2011-12-31  Antoine Levitt  <antoine.levitt@gmail.com>
+
+        * xdisp.c (syms_of_xdisp) <window-scroll-functions>: Add warning
+        to the doc string advising against its use for altering the way
+        windows are scrolled.
+
 2011-12-28  Kenichi Handa  <handa@m17n.org>
 
         * coding.c (Fdefine_coding_system_internal): Make an utf-8 base
@@ -27,8 +134,8 @@
 
 2011-12-21  Jan Djärv  <jan.h.d@swipnet.se>
 
-        * nsterm.m (x_free_frame_resources): Release
-        f->output_data.ns->miniimage
+        * nsterm.m (x_free_frame_resources):
+        Release f->output_data.ns->miniimage.
         (ns_index_color): Fix indentation.  Do not retain
         color_table->colors[i].
 
@@ -58,7 +165,7 @@
         (trackingNotification): Surround with ifdef NS_IMPL_COCOA.
         (syms_of_nsmenu): Set trackingMenu to 1 if not NS_IMPL_COCOA.
 
-2011-12-18 David Reitter <reitter@cmu.edu>
+2011-12-18  David Reitter  <reitter@cmu.edu>
 
         * nsterm.m (ns_term_init): Subscribe for notifications
         NSMenuDidBeginTrackingNotification and NSMenuDidEndTrackingNotification
@@ -80,10 +187,10 @@
         Fns_store_cut_buffer_internal.
         (ns_get_foreign_selection, Fx_own_selection_internal)
         (Fx_disown_selection_internal, Fx_selection_exists_p)
-        (Fns_get_selection_internal, Fns_store_selection_internal): Use
-        ns_symbol_to_pb and check if return value is nil.
-        (syms_of_nsselect): Remove ifdef CUT_BUFFER_SUPPORT.  Remove
-        defsubr Sns_rotate_cut_buffers_internal.  Sns_get_cut_buffer_internal
+        (Fns_get_selection_internal, Fns_store_selection_internal):
+        Use ns_symbol_to_pb and check if return value is nil.
+        (syms_of_nsselect): Remove ifdef CUT_BUFFER_SUPPORT.  Remove defsubr
+        Sns_rotate_cut_buffers_internal.  Sns_get_cut_buffer_internal
         renamed to Sns_get_selection_internal, Sns_store_cut_buffer_internal
         renamed to Sns_store_selection_internal.
         (ns_handle_selection_request): Move code to Fx_own_selection_internal
@@ -4427,7 +4534,7 @@
 
 2011-06-15  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Integer overflow and signedness fixes (Bug#8873).
+        Integer overflow and signedness fixes (Bug#8873, Bug#8828).
 
         * ccl.c (ASCENDING_ORDER): New macro, to work around GCC bug 43772.
         (GET_CCL_RANGE, IN_INT_RANGE): Use it.
@@ -5707,7 +5814,7 @@
         where the include path doesn't have X11/X.h by default.  See
         <http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>.
 
-2011-05-20 Kenichi Handa  <handa@m17n.org>
+2011-05-20  Kenichi Handa  <handa@m17n.org>
 
         * composite.c (find_automatic_composition): Fix previous change.
 
@@ -6049,7 +6156,7 @@
         * lread.c (lisp_file_lexically_bound_p): Stop scanning at end
         marker.  (Bug#8610)
 
-2011-05-05 Eli Zaretskii  <eliz@gnu.org>
+2011-05-05  Eli Zaretskii  <eliz@gnu.org>
 
         * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:
         New version that can reserve upto 2GB of heap space.
@@ -8253,7 +8360,7 @@
         are now in src/globals.h.
         (syms_of_minibuf): Remove spurious & from previous change.
 
-2011-03-20  Leo  <sdl.web@gmail.com>
+2011-03-20  Leo Liu  <sdl.web@gmail.com>
 
         * minibuf.c (completing-read-function): New variable.
         (completing-read-default): Rename from completing-read.
@@ -9022,7 +9129,7 @@ See ChangeLog.11 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2011  Free Software Foundation, Inc.
+  Copyright (C) 2011-2012  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.