auto upstream

1 files changed, 19 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e5d663b746e..7342f7c6add 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2013-01-02  Glenn Morris  <rgm@gnu.org>
+
+        * keymap.c (Fkey_description): Doc fix.  (Bug#13323)
+
+2013-01-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify via eabs.
+        * dired.c (file_name_completion):
+        * doc.c (get_doc_string):
+        * floatfns.c (round2):
+        * font.c (font_score, font_delete_unmatched):
+        * fringe.c (compute_fringe_widths):
+        * lread.c (read_list):
+        * minibuf.c (Ftry_completion):
+        * term.c (tty_ins_del_lines):
+        * xterm.c (x_draw_image_foreground, x_draw_image_foreground_1):
+        Use eabs (x) rather than open-coding it as (x < 0 ? -x : x).
+
 2012-12-31  Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (unsetenv): Set up the string passed to _putenv
@@ -21291,7 +21309,7 @@ See ChangeLog.11 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2011-2012 Free Software Foundation, Inc.
+  Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.