* src/minibuf.c (history-length): Increase default from 30 to 100.

* lisp/cus-start.el (history-length): Bump :version.  [Backport]

5 files changed, 20 insertions, 4 deletions

diff --git a/etc/NEWS b/etc/NEWS
index eba9b940585..12c67c84e7b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -14,6 +14,14 @@ and NEWS.1-17 for changes in older Emacs versions.
 You can narrow news to a specific version by calling `view-emacs-news'
 with a prefix argument or by typing C-u C-h C-n.
 
+* Changes in Emacs-24.5
+
+** The default value of `history-length' has increased to 100.
+
+
+* Changes in Specialized Modes and Packages in Emacs 24.5
+
+** cc-compat.el is marked as obsolete.
 
 * Installation Changes in Emacs 24.4
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 398d2ccba72..376e4a3a87d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+        * cus-start.el (history-length): Bump :version.  [Backport]
+
 2014-10-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * obsolete/cc-compat.el: Make obsolete (bug#18561).
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2da67112bd3..ed19f75b5d2 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -317,7 +317,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
              (enable-recursive-minibuffers minibuffer boolean)
              (history-length minibuffer
                              (choice (const :tag "Infinite" t) integer)
-                             "22.1")
+                             "24.5")    ; 30 -> 100
              (history-delete-duplicates minibuffer boolean "22.1")
              (read-buffer-completion-ignore-case minibuffer boolean "23.1")
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 39e94a85a0e..ec904da39bb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+        * minibuf.c (history-length): Increase default from 30 to 100.
+        [Backport]
+
 2014-10-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * xdisp.c (redisplay_window): Re-run pre-redisplay-function after we
@@ -52,8 +57,7 @@
         array of 2 values specifying the coordinates of the frame's
         top-left corner.  Use these values instead of calling x_get_arg,
         which can cons Lisp objects, and therefore cannot be called except
-        from the main thread.  Remove redundant tests for the default
-        values.
+        from the main thread.  Remove redundant tests for the default values.
         (my_create_window): Move the calculation of the coordinates of the
         frame's top-left edge here.  Pass them to the input thread via the
         second parameter of the WM_EMACS_CREATEWINDOW message.
diff --git a/src/minibuf.c b/src/minibuf.c
index c3fcbeb59c7..3042b13b7d6 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1970,7 +1970,7 @@ A value of t means no truncation.
 This variable only affects history lists that don't specify their own
 maximum lengths.  Setting the `history-length' property of a history
 variable overrides this default.  */);
-  XSETFASTINT (Vhistory_length, 30);
+  XSETFASTINT (Vhistory_length, 100);
 
   DEFVAR_BOOL ("history-delete-duplicates", history_delete_duplicates,
                doc: /* Non-nil means to delete duplicates in history.